Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/special/webdoorcreator into develop

WebDoorCreator.Data/SqlScripts/Stored/stp_ListVal_Import.sql

@@ -4,13 +4,15 @@ GO
 SET QUOTED_IDENTIFIER ON
 GO
 
+DROP PROCEDURE IF EXISTS [dbo].[stp_ListVal_Import]
+GO
 
 -- =============================================
 -- Author:		Z.M.
 -- Create date: 2023.04.03
 -- Description:	Esecuzione upsert ListValues
 -- =============================================
-ALTER PROCEDURE [dbo].[stp_ListVal_Import]
+CREATE PROCEDURE [dbo].[stp_ListVal_Import]
 AS
 BEGIN
 	SET NOCOUNT ON;
@@ -19,8 +21,8 @@ BEGIN
 		
 		-- effettua merge dati listValues
 		MERGE ListValues as tgt
-			USING (SELECT TableName, FieldName, [Value], Label, Ordinal, InputType, DefaultVal, isSerializable FROM ListValuesTemp) as src
-			ON tgt.TableName = src.TableName AND tgt.FieldName = src.FieldName AND tgt.[value] = src.[value]
+			USING (SELECT TableName, FieldName, [Value], [Label], Ordinal, DefaultVal, InputType, isSerializable FROM ListValuesTemp) as src
+			ON tgt.TableName = src.TableName AND tgt.FieldName = src.FieldName AND tgt.[Value] = src.[Value]
 		WHEN MATCHED THEN
 			UPDATE SET [Label]				= src.[Label]
 					,  Ordinal				= src.Ordinal
@@ -33,4 +35,5 @@ BEGIN
 
 	COMMIT tran
 
-END
+END
+GO