FIX: @ids param works on either side of join

Author: mikebeaton

SqlDataComparison.proj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>MightyOrm.SqlDataComparison</PackageId>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <OutputPath>build\</OutputPath>
     <OutputInstall>Install.sql</OutputInstall>
     <OutputInstallMaster>InstallMaster.sql</OutputInstallMaster>

src/core/SqlDataComparison.sql

@@ -229,7 +229,8 @@ BEGIN
 	EXEC @retval = internals.ProcessIdsParam
 		@ids = @ids,
 		@idsWhere = @idsWhere OUTPUT,
-		@key_columns = @key_columns
+		@key_columns = @key_columns,
+		@mapped_columns = @mapped_columns
 
 	IF @retval <> 0 OR @@ERROR <> 0 GOTO error
 

src/internals/ProcessIdsParam.sql

@@ -6,7 +6,8 @@ GO
 CREATE PROCEDURE [internals].[ProcessIdsParam]
 	@ids NVARCHAR(MAX),
 	@idsWhere NVARCHAR(MAX) OUTPUT,
-	@key_columns internals.ColumnsTable READONLY
+	@key_columns internals.ColumnsTable READONLY,
+	@mapped_columns internals.ColumnsTable READONLY
 AS
 BEGIN
 	SET NOCOUNT ON;
@@ -47,13 +48,25 @@ BEGIN
 				GOTO error
 			END
 
-			SELECT @i = 0, @idsWhere = ''
+			SELECT @i = 0, @idsWhere = '('
+
+			SELECT @idsWhere = @idsWhere + CASE WHEN @i = 0 THEN '' ELSE ' AND ' END + '[ours].' + QUOTENAME(kc.name) + CASE WHEN @i = 0 THEN ' >= ' ELSE ' <= ' END + CAST(i.id AS NVARCHAR(MAX)), @i = @i + 1
+			FROM #ids i
+			FULL OUTER JOIN @key_columns kc
+			ON 1 = 1
+			ORDER BY i.orderBy
 
-			SELECT @idsWhere = @idsWhere + CASE WHEN @i = 0 THEN '' ELSE ' AND ' END + '[ours].' + kc.name + CASE WHEN @i = 0 THEN ' >= ' ELSE ' <= ' END + CAST(i.id AS NVARCHAR(MAX)), @i = @i + 1
+			SELECT @i = 0, @idsWhere = @idsWhere + ') OR ('
+
+			SELECT @idsWhere = @idsWhere + CASE WHEN @i = 0 THEN '' ELSE ' AND ' END + '[theirs].' + QUOTENAME(m.name) + CASE WHEN @i = 0 THEN ' >= ' ELSE ' <= ' END + CAST(i.id AS NVARCHAR(MAX)), @i = @i + 1
 			FROM #ids i
 			FULL OUTER JOIN @key_columns kc
 			ON 1 = 1
+			INNER JOIN @mapped_columns m
+			ON kc.column_id = m.column_id
 			ORDER BY i.orderBy
+
+			SELECT @i = 0, @idsWhere = @idsWhere + ')'
 		END
 		ELSE
 		BEGIN
@@ -76,10 +89,18 @@ BEGIN
 
 			SELECT @i = 0, @idsWhere = ''
 
-			SELECT @idsWhere = @idsWhere + CASE WHEN @i = 0 THEN '' ELSE ' OR ' END + '[ours].' + kc.name + ' = ' + CAST(i.id AS NVARCHAR(MAX)), @i = @i + 1
+			SELECT @idsWhere =
+				@idsWhere +
+				CASE WHEN @i = 0 THEN '' ELSE ' OR ' END +
+				'[ours].' + QUOTENAME(kc.name) + ' = ' + CAST(i.id AS NVARCHAR(MAX)) +
+				' OR ' +
+				'[theirs].' + QUOTENAME(m.name) + ' = ' + CAST(i.id AS NVARCHAR(MAX)),
+				@i = @i + 1
 			FROM #ids i
 			FULL OUTER JOIN @key_columns kc
 			ON 1 = 1
+			INNER JOIN @mapped_columns m
+			ON kc.column_id = m.column_id
 			ORDER BY i.orderBy
 		END
 	END

tests/testIds.sql

@@ -4,7 +4,7 @@ GO
 EXEC tSQLt.NewTestClass 'testIds';
 GO
 
-CREATE PROCEDURE testIds.[test basic ids set param works]
+CREATE PROCEDURE testIds.[test ids set param works when right side is NULL]
 AS
 BEGIN
 	DECLARE @CRLF CHAR(2) = CHAR(13) + CHAR(10)
@@ -16,12 +16,27 @@ BEGIN
 
 	EXEC tSQLt.ExpectException @Message, 16, 1
 
-	-- TO DO: This needs to work whichever side @ids matches on, but currently only checks ours side
 	EXEC CompareData 'SqlUtilsTests_B..AddressTypes', 'SqlUtilsTests_A..AddressTypes', @ids = '2'
 END
 GO
 
-CREATE PROCEDURE testIds.[test basic ids range param works]
+CREATE PROCEDURE testIds.[test ids set param works when left side is NULL]
+AS
+BEGIN
+	DECLARE @CRLF CHAR(2) = CHAR(13) + CHAR(10)
+
+	DECLARE @Message NVARCHAR(MAX) =
+		'Data differences found between OURS <<< [SqlUtilsTests_A].[dbo].[AddressTypes] and THEIRS >>> [SqlUtilsTests_B].[dbo].[AddressTypes].' + @CRLF +
+		' - Switch to results window to view differences.' + @CRLF +
+		' - Call [Import|Export][Added|Deleted|Changed|All] (e.g. ImportAdded) with the same arguments to transfer changes.' + @CRLF
+
+	EXEC tSQLt.ExpectException @Message, 16, 1
+
+	EXEC CompareData 'SqlUtilsTests_A..AddressTypes', 'SqlUtilsTests_B..AddressTypes', @ids = '2'
+END
+GO
+
+CREATE PROCEDURE testIds.[test ids range param works when right side is null]
 AS
 BEGIN
 	DECLARE @CRLF CHAR(2) = CHAR(13) + CHAR(10)
@@ -33,11 +48,26 @@ BEGIN
 
 	EXEC tSQLt.ExpectException @Message, 16, 1
 
-	-- TO DO: This needs to work whichever side @ids matches on, but currently only checks ours side
 	EXEC CompareData 'SqlUtilsTests_B..AddressTypes', 'SqlUtilsTests_A..AddressTypes', @ids = '1-2'
 END
 GO
 
+CREATE PROCEDURE testIds.[test ids range param works when left side is null]
+AS
+BEGIN
+	DECLARE @CRLF CHAR(2) = CHAR(13) + CHAR(10)
+
+	DECLARE @Message NVARCHAR(MAX) =
+		'Data differences found between OURS <<< [SqlUtilsTests_A].[dbo].[AddressTypes] and THEIRS >>> [SqlUtilsTests_B].[dbo].[AddressTypes].' + @CRLF +
+		' - Switch to results window to view differences.' + @CRLF +
+		' - Call [Import|Export][Added|Deleted|Changed|All] (e.g. ImportAdded) with the same arguments to transfer changes.' + @CRLF
+
+	EXEC tSQLt.ExpectException @Message, 16, 1
+
+	EXEC CompareData 'SqlUtilsTests_A..AddressTypes', 'SqlUtilsTests_B..AddressTypes', @ids = '1-2'
+END
+GO
+
 CREATE PROCEDURE testIds.[test empty ids param reported correctly]
 AS
 BEGIN

tests/testMapping.sql

@@ -17,7 +17,39 @@ BEGIN
 	EXEC tSQLt.ExpectException @Message, 16, 1
 
 	EXEC CompareData 'SqlUtilsTests_A..AddressTypes', 'SqlUtilsTests_C..AddressMatch', @map = 'AddressTypeID,ID;AddressType,Type'
+END
+GO
+
+CREATE PROCEDURE testMapping.[test map plus ids param works]
+AS
+BEGIN
+	DECLARE @CRLF CHAR(2) = CHAR(13) + CHAR(10)
 
+	-- make mismatches on both sides
+	SET IDENTITY_INSERT SqlUtilsTests_A.dbo.AddressTypes ON;
+	INSERT INTO SqlUtilsTests_A.dbo.AddressTypes (AddressTypeID, AddressType)
+	VALUES (3, 'Work')
+	SET IDENTITY_INSERT SqlUtilsTests_A.dbo.AddressTypes OFF;
+	DELETE FROM SqlUtilsTests_C..AddressMatch WHERE ID = 3
+	UPDATE SqlUtilsTests_A.dbo.AddressTypes SET AddressType = 'Test' WHERE AddressTypeID = 1
+
+	EXEC tSQLt.CaptureOutput 'EXEC ImportAll ''SqlUtilsTests_A..AddressTypes'', ''SqlUtilsTests_C..AddressMatch'', @map = ''AddressTypeID,ID;AddressType,Type'', @ids = ''1-3'''
+	SELECT CAST (
+		@CRLF +
+		'Importing added rows...' + @CRLF +
+		'Requested import completed with no errors. Transferred 1 rows from [theirs] into [ours].' + @CRLF +
+		'' + @CRLF +
+		'Importing deleted rows...' + @CRLF +
+		'Requested import completed with no errors. Deleted 1 rows from [ours].' + @CRLF +
+		'' + @CRLF +
+		'Importing changed rows...' + @CRLF +
+		'Requested import completed with no errors. Updated 1 rows in [ours] with data from [theirs].' + @CRLF +
+		'' + @CRLF +
+		'No data differences found between OURS <<< [SqlUtilsTests_A].[dbo].[AddressTypes] and THEIRS >>> [SqlUtilsTests_C].[dbo].[AddressMatch].' + @CRLF
+		AS NVARCHAR(MAX)) AS OutputText
+	INTO #TestOutput
+
+	EXEC tSQLt.AssertEqualsTable '#TestOutput', 'SqlUtils.tSQLt.CaptureOutputLog'
 END
 GO