Removed extra quotes from AntTarget default value (all); updated tSQLt.Private_MarktSQLtTempObject.ssp.sql to allow only BIT type for IsTempObject value; Finished UndoTestDoubles code and test.

Author: lizbaron

Build/LocalBuild.bat

@@ -16,7 +16,7 @@ ECHO SQLInstanceName: "%SQLInstanceName%"
 SET DBName=%~5
 ECHO DBName: "%DBName%"
 SET DBLogin=-E
-SET AntTarget="all"
+SET AntTarget=all
 IF NOT "%~6"=="-v" IF NOT "%~6"=="" SET DBLogin=%~6
 IF NOT "%~7"=="-v" IF NOT "%~7"=="" SET SQLPackagePath=%~7
 IF NOT "%~8"=="-v" IF NOT "%~8"=="" SET AntTarget=%~8

Source/tSQLt.Private_MarktSQLtTempObject.ssp.sql

@@ -10,6 +10,7 @@ BEGIN
   DECLARE @UnquotedSchemaName NVARCHAR(MAX);
   DECLARE @UnquotedObjectName NVARCHAR(MAX);
   DECLARE @UnquotedParentName NVARCHAR(MAX);
+  DECLARE @TempObjectFlagOn BIT = 1;
   SELECT 
       @UnquotedSchemaName = SCHEMA_NAME(O.schema_id),
       @UnquotedObjectName = O.name,
@@ -21,7 +22,7 @@ BEGIN
   BEGIN
     EXEC sys.sp_addextendedproperty 
        @name = N'tSQLt.IsTempObject',
-       @value = 1, 
+       @value = @TempObjectFlagOn, 
        @level0type = N'SCHEMA', @level0name = @UnquotedSchemaName, 
        @level1type = @ObjectType,  @level1name = @UnquotedObjectName;   
 
@@ -35,7 +36,7 @@ BEGIN
   BEGIN
     EXEC sys.sp_addextendedproperty 
        @name = N'tSQLt.IsTempObject',
-       @value = 1, 
+       @value = @TempObjectFlagOn, 
        @level0type = N'SCHEMA', @level0name = @UnquotedSchemaName, 
        @level1type = N'TABLE',  @level1name = @UnquotedParentName,
        @level2type = @ObjectType,  @level2name = @UnquotedObjectName;

Source/tSQLt.UndoTestDoubles.ssp.sql

@@ -3,24 +3,41 @@ GO
 ---Build+
 GO
 CREATE PROCEDURE tSQLt.UndoTestDoubles
+  @Force BIT = 0
 AS
 BEGIN
   DECLARE @cmd NVARCHAR(MAX);
 
-  SELECT @cmd = 'RAISERROR(''Cannot drop '+Collisions.List+' as it is not marked as temporary. Use @Force = 1 to override.'',16,10)'
+  IF (@Force = 1) 
+  BEGIN
+    SET @cmd = 'EXEC tSQLt.Private_Print @Message = ''WARNING: @Force has been set to 1. Dropping the following objects that are not marked as temporary. (%s)'';';
+  END;
+  ELSE
+  BEGIN
+    SET @cmd = 'RAISERROR(''Cannot drop these objects as they are not marked as temporary. Use @Force = 1 to override. (%s)'',16,10)';
+  END;
+
+  SELECT @cmd = REPLACE(@cmd,'%s',Collisions.List)
     FROM
     (
       SELECT
-          QUOTENAME(OBJECT_SCHEMA_NAME(TestDouble.object_id))+'.'+QUOTENAME(TestDouble.name)
-        FROM tSQLt.Private_RenamedObjectLog AS ROL
-        JOIN sys.objects AS TestDouble
-          ON TestDouble.object_id = OBJECT_ID(QUOTENAME(OBJECT_SCHEMA_NAME(ROL.ObjectId))+'.'+QUOTENAME(PARSENAME(ROL.OriginalName,1)))
-        LEFT JOIN sys.extended_properties AS EP
-          ON EP.class_desc = 'OBJECT_OR_COLUMN'
-         AND EP.major_id = TestDouble.object_id
-         AND EP.name = 'tSQLt.IsTempObject'
-         AND EP.value = 1
-       WHERE EP.value IS NULL
+        STUFF (
+        (
+          SELECT
+              ', ' + QUOTENAME(OBJECT_SCHEMA_NAME(TestDouble.object_id))+'.'+QUOTENAME(TestDouble.name)
+            FROM tSQLt.Private_RenamedObjectLog AS ROL
+            JOIN sys.objects AS TestDouble
+              ON TestDouble.object_id = OBJECT_ID(QUOTENAME(OBJECT_SCHEMA_NAME(ROL.ObjectId))+'.'+QUOTENAME(PARSENAME(ROL.OriginalName,1)))
+            LEFT JOIN sys.extended_properties AS EP
+              ON EP.class_desc = 'OBJECT_OR_COLUMN'
+             AND EP.major_id = TestDouble.object_id
+             AND EP.name = 'tSQLt.IsTempObject'
+             AND EP.value = 1
+           WHERE EP.value IS NULL
+           ORDER BY 1
+             FOR XML PATH (''), TYPE
+         ).value('.','NVARCHAR(MAX)'),
+         1,2,'')
     ) Collisions(List)
   EXEC(@cmd);
 
@@ -83,8 +100,31 @@ BEGIN
        FOR XML PATH(''),TYPE
   ).value('.','NVARCHAR(MAX)')
   EXEC(@cmd);
+
+  WITH L AS
+  (
+    SELECT 
+        TempO.Name,
+        SCHEMA_NAME(TempO.schema_id) SchemaName,
+        TempO.type ObjectType
+      FROM sys.objects TempO
+      JOIN sys.extended_properties AS EP
+        ON EP.class_desc = 'OBJECT_OR_COLUMN'
+       AND EP.major_id = TempO.object_id
+       AND EP.name = 'tSQLt.IsTempObject'
+       AND EP.value = 1
+  )
+  SELECT @cmd = 
+  (
+    SELECT 
+        DC.cmd+';'  
+      FROM L
+     CROSS APPLY tSQLt.Private_GetDropItemCmd(QUOTENAME(L.SchemaName)+'.'+QUOTENAME(L.Name),L.ObjectType) DC
+       FOR XML PATH(''),TYPE
+  ).value('.','NVARCHAR(MAX)')
+  EXEC(@cmd);
+
   COMMIT;
 END;
 GO
 
-

Tests/Private_MarktSQLtTempObjectTests.class.sql

@@ -88,6 +88,28 @@ BEGIN
 
   EXEC Private_MarktSQLtTempObjectTests.[assert creates two extended properties on object]
     @ObjectName = 'Private_MarktSQLtTempObjectTests.TempTrigger',
-    @ObjectType = N'TRIGGERX';
+    @ObjectType = N'TRIGGER';
 END;
 GO
+CREATE PROCEDURE Private_MarktSQLtTempObjectTests.[test tSQLt.IsTempObject Data Type is BIT]
+AS
+BEGIN
+  CREATE TABLE Private_MarktSQLtTempObjectTests.TempTable1(i INT NOT NULL);
+  EXEC Private_MarktSQLtTempObjectTests.[assert creates two extended properties on object]
+    @ObjectName = 'Private_MarktSQLtTempObjectTests.TempTable1',
+    @ObjectType = N'TABLE';
+  
+  SELECT UPPER(CAST(SQL_VARIANT_PROPERTY(EP.value,'BaseType') AS NVARCHAR(MAX))) IsTempObject_DataType
+    INTO #Actual
+    FROM sys.extended_properties AS EP
+   WHERE EP.class_desc = 'OBJECT_OR_COLUMN'
+     AND EP.major_id = OBJECT_ID('Private_MarktSQLtTempObjectTests.TempTable1')
+     AND EP.name = 'tSQLt.IsTempObject';
+
+  SELECT TOP(0) A.* INTO #Expected FROM #Actual A RIGHT JOIN #Actual X ON 1=0;
+  INSERT INTO #Expected VALUES('BIT');
+  
+  EXEC tSQLt.AssertEqualsTable '#Expected','#Actual';
+  
+END;
+GO

Tests/UndoTestDoublesTests.class.sql

@@ -387,39 +387,193 @@ BEGIN
   EXEC tSQLt.AssertEmptyTable @TableName = '#ShouldBeEmpty';
 END;
 GO
-CREATE PROCEDURE UndoTestDoublesTests.[test if FakeFunctionWithSnapshot exists we need to write tests]
+CREATE PROCEDURE UndoTestDoublesTests.[test drops only objects that are marked as temporary (IsTempObject = 1)]
 AS
 BEGIN
-  IF EXISTS (SELECT * FROM sys.objects WHERE UPPER(name) LIKE 'FAKEFUNCTION_%')
-  BEGIN
-    EXEC tSQLt.Fail 'More tests to be written!'
-    -- Also remove tSQLt_TempObject_s
-  END;
+  CREATE TABLE UndoTestDoublesTests.SimpleTable1 (i INT);
+
+  EXEC tSQLt.RemoveObject @ObjectName = 'UndoTestDoublesTests.SimpleTable1';
+  CREATE TABLE UndoTestDoublesTests.SimpleTable1 (i INT);
+
+  EXEC tSQLt.ExpectException @ExpectedMessage = 'Cannot drop these objects as they are not marked as temporary. Use @Force = 1 to override. ([UndoTestDoublesTests].[SimpleTable1])', @ExpectedSeverity = 16, @ExpectedState = 10;
+
+  EXEC tSQLt.UndoTestDoubles;
 END;
 GO
-CREATE PROCEDURE UndoTestDoublesTests.[test drops only objects that are marked as temporary (IsTempObject = 1)]
+CREATE PROCEDURE UndoTestDoublesTests.[test does not drop multiple unmarked objects (IsTempObject is not set or is not 1)]
 AS
 BEGIN
   CREATE TABLE UndoTestDoublesTests.SimpleTable1 (i INT);
+  CREATE TABLE UndoTestDoublesTests.SimpleTable2 (i INT);
+  CREATE TABLE UndoTestDoublesTests.SimpleTable3 (i INT);
 
   EXEC tSQLt.RemoveObject @ObjectName = 'UndoTestDoublesTests.SimpleTable1';
+  EXEC tSQLt.RemoveObject @ObjectName = 'UndoTestDoublesTests.SimpleTable2';
+  EXEC tSQLt.RemoveObject @ObjectName = 'UndoTestDoublesTests.SimpleTable3';
+
   CREATE TABLE UndoTestDoublesTests.SimpleTable1 (i INT);
+  CREATE TABLE UndoTestDoublesTests.SimpleTable2 (i INT);
+  CREATE TABLE UndoTestDoublesTests.SimpleTable3 (i INT);
 
-  EXEC tSQLt.ExpectException @ExpectedMessage = 'Cannot drop [UndoTestDoublesTests].[SimpleTable1] as it is not marked as temporary. Use @Force = 1 to override.', @ExpectedSeverity = 16, @ExpectedState = 10;
+  EXEC tSQLt.ExpectException @ExpectedMessage = 'Cannot drop these objects as they are not marked as temporary. Use @Force = 1 to override. ([UndoTestDoublesTests].[SimpleTable1], [UndoTestDoublesTests].[SimpleTable2], [UndoTestDoublesTests].[SimpleTable3])', @ExpectedSeverity = 16, @ExpectedState = 10;
 
   EXEC tSQLt.UndoTestDoubles;
+END;
+GO
+CREATE PROCEDURE UndoTestDoublesTests.[test does not drop marked object where IsTempObject is not 1]
+AS
+BEGIN
+  CREATE TABLE UndoTestDoublesTests.SimpleTable1 (i INT);
 
+  EXEC tSQLt.RemoveObject @ObjectName = 'UndoTestDoublesTests.SimpleTable1';
+  CREATE TABLE UndoTestDoublesTests.SimpleTable1 (i INT);
+  EXEC sys.sp_addextendedproperty 
+       @name = N'tSQLt.IsTempObject',
+       @value = 42, 
+       @level0type = N'SCHEMA', @level0name = 'UndoTestDoublesTests', 
+       @level1type = N'TABLE',  @level1name = 'SimpleTable1';
+
+  EXEC tSQLt.ExpectException @ExpectedMessage = 'Cannot drop these objects as they are not marked as temporary. Use @Force = 1 to override. ([UndoTestDoublesTests].[SimpleTable1])', @ExpectedSeverity = 16, @ExpectedState = 10;
+
+  EXEC tSQLt.UndoTestDoubles;
 END;
 GO
-CREATE PROCEDURE UndoTestDoublesTests.[test can handle multiple unmarked objects (IsTempObject is not set or is not 1)]
+CREATE PROCEDURE UndoTestDoublesTests.[test objects renamed by RemoveObject are restored and conflicting objects without IsTempObject property are deleted if @Force=1]
 AS
 BEGIN
-  EXEC tSQLt.Fail 'write me.';
+  EXEC ('CREATE TABLE UndoTestDoublesTests.aSimpleTable(i INT);');
+
+  SELECT O.object_id,SCHEMA_NAME(O.schema_id) schema_name, O.name object_name, O.type_desc 
+    INTO #OriginalObjectIds
+    FROM sys.objects O;
+
+  EXEC tSQLt.RemoveObject @ObjectName='UndoTestDoublesTests.aSimpleTable';
+  EXEC ('CREATE PROCEDURE UndoTestDoublesTests.aSimpleTable AS PRINT ''Who came up with that name?'';');
+
+  EXEC tSQLt.UndoTestDoubles @Force=1;
+
+  SELECT O.object_id,SCHEMA_NAME(O.schema_id) schema_name, O.name object_name, O.type_desc 
+    INTO #RestoredObjectIds
+    FROM sys.objects O;
+
+  SELECT * INTO #ShouldBeEmpty
+  FROM
+  (
+    SELECT 'Expected' T,* FROM (SELECT * FROM #OriginalObjectIds EXCEPT SELECT * FROM #RestoredObjectIds) E
+    UNION ALL
+    SELECT 'Actual' T,* FROM (SELECT * FROM #RestoredObjectIds EXCEPT SELECT * FROM #OriginalObjectIds) A
+  ) T;
+  EXEC tSQLt.AssertEmptyTable @TableName = '#ShouldBeEmpty';
 END;
 GO
-CREATE PROCEDURE UndoTestDoublesTests.[test can handle marked object where IsTempObject is not 1]
+CREATE PROCEDURE UndoTestDoublesTests.[test warning message is printed for objects without IsTempObject property that are deleted if @Force=1]
 AS
 BEGIN
-  EXEC tSQLt.Fail 'write me.';
+  EXEC ('CREATE TABLE UndoTestDoublesTests.aSimpleTable(i INT);');
+
+  EXEC tSQLt.RemoveObject @ObjectName='UndoTestDoublesTests.aSimpleTable';
+  EXEC ('CREATE PROCEDURE UndoTestDoublesTests.aSimpleTable AS PRINT ''Who came up with that name?'';');
+  EXEC tSQLt.SpyProcedure @ProcedureName = 'tSQLt.Private_Print';
+
+  EXEC tSQLt.UndoTestDoubles @Force=1;
+  
+  SELECT Message INTO #Actual FROM tSQLt.Private_Print_SpyProcedureLog;
+
+  SELECT TOP(0) A.* INTO #Expected FROM #Actual A RIGHT JOIN #Actual X ON 1=0;
+  INSERT INTO #Expected
+  VALUES('WARNING: @Force has been set to 1. Dropping the following objects that are not marked as temporary. ([UndoTestDoublesTests].[aSimpleTable])');
+
+  EXEC tSQLt.AssertEqualsTable '#Expected','#Actual';
+  
 END;
-GO
+GO
+CREATE PROCEDURE UndoTestDoublesTests.[test objects that are replaced multiple times by objects not marked as IsTempObject are restored if @Force=1]
+AS
+BEGIN
+  EXEC ('CREATE TABLE UndoTestDoublesTests.aSimpleTable(i INT);');
+
+  SELECT O.object_id,SCHEMA_NAME(O.schema_id) schema_name, O.name object_name, O.type_desc 
+    INTO #OriginalObjectIds
+    FROM sys.objects O;
+
+  EXEC tSQLt.RemoveObject @ObjectName='UndoTestDoublesTests.aSimpleTable';
+  EXEC ('CREATE PROCEDURE UndoTestDoublesTests.aSimpleTable AS PRINT ''Replacement 1'';');
+  EXEC tSQLt.RemoveObject @ObjectName='UndoTestDoublesTests.aSimpleTable';
+  EXEC ('CREATE PROCEDURE UndoTestDoublesTests.aSimpleTable AS PRINT ''Replacement 2'';');
+  EXEC tSQLt.RemoveObject @ObjectName='UndoTestDoublesTests.aSimpleTable';
+  EXEC ('CREATE PROCEDURE UndoTestDoublesTests.aSimpleTable AS PRINT ''Replacement 3'';');
+
+  EXEC tSQLt.UndoTestDoubles @Force=1;
+
+  SELECT O.object_id,SCHEMA_NAME(O.schema_id) schema_name, O.name object_name, O.type_desc 
+    INTO #RestoredObjectIds
+    FROM sys.objects O;
+
+  SELECT * INTO #ShouldBeEmpty
+  FROM
+  (
+    SELECT 'Expected' T,* FROM (SELECT * FROM #OriginalObjectIds EXCEPT SELECT * FROM #RestoredObjectIds) E
+    UNION ALL
+    SELECT 'Actual' T,* FROM (SELECT * FROM #RestoredObjectIds EXCEPT SELECT * FROM #OriginalObjectIds) A
+  ) T;
+  EXEC tSQLt.AssertEmptyTable @TableName = '#ShouldBeEmpty';
+END;
+GO
+CREATE PROCEDURE UndoTestDoublesTests.[test drops a marked object even if it is not conflicting with an original object]
+AS
+BEGIN
+  SELECT O.object_id,SCHEMA_NAME(O.schema_id) schema_name, O.name object_name, O.type_desc 
+    INTO #OriginalObjectIds
+    FROM sys.objects O;
+
+  CREATE TABLE UndoTestDoublesTests.SimpleTable1 (i INT);
+
+  EXEC tSQLt.Private_MarktSQLtTempObject @ObjectName = 'UndoTestDoublesTests.SimpleTable1', @ObjectType = 'TABLE', @NewNameOfOriginalObject = NULL;
+
+  EXEC tSQLt.UndoTestDoubles;
+
+  SELECT O.object_id,SCHEMA_NAME(O.schema_id) schema_name, O.name object_name, O.type_desc 
+    INTO #RestoredObjectIds
+    FROM sys.objects O;
+
+  SELECT * INTO #ShouldBeEmpty
+  FROM
+  (
+    SELECT 'Expected' T,* FROM (SELECT * FROM #OriginalObjectIds EXCEPT SELECT * FROM #RestoredObjectIds) E
+    UNION ALL
+    SELECT 'Actual' T,* FROM (SELECT * FROM #RestoredObjectIds EXCEPT SELECT * FROM #OriginalObjectIds) A
+  ) T;
+  EXEC tSQLt.AssertEmptyTable @TableName = '#ShouldBeEmpty';
+END;
+GO
+CREATE PROCEDURE UndoTestDoublesTests.[test drops multiple marked objects even if they do not conflict with an original object]
+AS
+BEGIN
+  SELECT O.object_id,SCHEMA_NAME(O.schema_id) schema_name, O.name object_name, O.type_desc 
+    INTO #OriginalObjectIds
+    FROM sys.objects O;
+
+  CREATE TABLE UndoTestDoublesTests.SimpleTable1 (i INT);
+  CREATE TABLE UndoTestDoublesTests.SimpleTable2 (i INT);
+  CREATE TABLE UndoTestDoublesTests.SimpleTable3 (i INT);
+
+  EXEC tSQLt.Private_MarktSQLtTempObject @ObjectName = 'UndoTestDoublesTests.SimpleTable1', @ObjectType = 'TABLE', @NewNameOfOriginalObject = NULL;
+  EXEC tSQLt.Private_MarktSQLtTempObject @ObjectName = 'UndoTestDoublesTests.SimpleTable2', @ObjectType = 'TABLE', @NewNameOfOriginalObject = NULL;
+  EXEC tSQLt.Private_MarktSQLtTempObject @ObjectName = 'UndoTestDoublesTests.SimpleTable3', @ObjectType = 'TABLE', @NewNameOfOriginalObject = NULL;
+
+  EXEC tSQLt.UndoTestDoubles;
+
+  SELECT O.object_id,SCHEMA_NAME(O.schema_id) schema_name, O.name object_name, O.type_desc 
+    INTO #RestoredObjectIds
+    FROM sys.objects O;
+
+  SELECT * INTO #ShouldBeEmpty
+  FROM
+  (
+    SELECT 'Expected' T,* FROM (SELECT * FROM #OriginalObjectIds EXCEPT SELECT * FROM #RestoredObjectIds) E
+    UNION ALL
+    SELECT 'Actual' T,* FROM (SELECT * FROM #RestoredObjectIds EXCEPT SELECT * FROM #OriginalObjectIds) A
+  ) T;
+  EXEC tSQLt.AssertEmptyTable @TableName = '#ShouldBeEmpty';
+END;
+GO