Merge pull request #116 from tSQLt-org/undoTestDoubles

Undo test doubles pr before we tackle "the rest" of transaction free tSQLt

Author: mbt1

Build/LocalBuild.bat

@@ -16,12 +16,15 @@ ECHO SQLInstanceName: "%SQLInstanceName%"
 SET DBName=%~5
 ECHO DBName: "%DBName%"
 SET DBLogin=-E
+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
 SET VerboseOutput=ON
-IF NOT "%~6"=="-v" IF NOT "%~7"=="-v" IF NOT "%~8"=="-v" SET VerboseOutput=OFF
+IF NOT "%~6"=="-v" IF NOT "%~7"=="-v" IF NOT "%~8"=="-v" IF NOT "%~9"=="-v" SET VerboseOutput=OFF
 ECHO DBLogin: "%DBLogin%"
 ECHO SQLPackagePath: "%SQLPackagePath%"
+ECHO AntTarget: "%AntTarget%"
 ECHO VerboseOutput: "%VerboseOutput%"
 
 REM CALL "%AntHome%\bin\ant" -buildfile Build\tSQLt.experiments.build.xml -Dmsbuild.path="%NET4Home%" -verbose || goto :error
@@ -75,7 +78,7 @@ ECHO LogTableName: %LogTableName%
 
 IF "%VerboseOutput%"=="ON" @ECHO ON
 @REM -----------------------------------------------------------------------------This space character is utterly important! ----v
-CALL "%AntHome%\bin\ant" -buildfile Build\tSQLt.validatebuild.xml -Ddb.server="%SQLInstanceName%" -Ddb.name=%DBName% -Ddb.login=" %DBLogin%" -Dsqlcmd.path="%SQLCMDPath%" -Dsqlpackage.path="%SQLPackagePath%" -Dlogtable.name="%LogTableName%" || goto :error
+CALL "%AntHome%\bin\ant" "%AntTarget%" -buildfile Build\tSQLt.validatebuild.xml -Ddb.server="%SQLInstanceName%" -Ddb.name=%DBName% -Ddb.login=" %DBLogin%" -Dsqlcmd.path="%SQLCMDPath%" -Dsqlpackage.path="%SQLPackagePath%" -Dlogtable.name="%LogTableName%" || goto :error
 @ECHO OFF
 
 ECHO +-------------------------+

Experiments/NameResolutionResearch.sql

@@ -180,7 +180,7 @@ tSQLt.FakeTable
    EXEC (@cmd);
 
    EXEC sys.sp_addextendedproperty 
-   @name = N'tSQLt.FakeTable_OrgTableName', 
+   @name = N'tSQLt.Private_TestDouble_OrgObjectName', 
    @value = @newName, 
    @level0type = N'SCHEMA', @level0name = @schemaName, -- <use tSQLt.private_getCleanSchemaName>
    @level1type = N'TABLE',  @level1name = @tableName; -- <use tSQLt.[private_getCleanObjectName]>
@@ -210,7 +210,7 @@ tSQLt.ApplyConstraint
    WHERE class_desc = 'OBJECT_OR_COLUMN'
      AND major_id = OBJECT_ID(@schemaName + '.' + @tableName) -- <use tSQLt.private_GetQuotedFullName>
      AND minor_id = 0
-     AND name = 'tSQLt.FakeTable_OrgTableName';
+     AND name = 'tSQLt.Private_TestDouble_OrgObjectName';
 
   SELECT @cmd = 'CONSTRAINT ' + name + ' CHECK' + definition 
     FROM sys.check_constraints

Source/ApplyConstraint_Methods.sql

@@ -23,7 +23,7 @@ RETURN
         ON newtbl.object_id = p.major_id
        AND p.minor_id = 0
        AND p.class_desc = 'OBJECT_OR_COLUMN'
-       AND p.name = 'tSQLt.FakeTable_OrgTableName'
+       AND p.name = 'tSQLt.Private_TestDouble_OrgObjectName'
         ON OBJECT_NAME(constraints.parent_object_id) = CAST(p.value AS NVARCHAR(4000))
        AND constraints.schema_id = newtbl.schema_id
        AND constraints.object_id = @ConstraintObjectId;
@@ -70,6 +70,8 @@ CREATE PROCEDURE tSQLt.Private_ApplyCheckConstraint
 AS
 BEGIN
   DECLARE @Cmd NVARCHAR(MAX);
+  DECLARE @NewNameOfOriginalConstraint NVARCHAR(MAX);
+  DECLARE @QuotedFullConstraintName NVARCHAR(MAX);
   SELECT @Cmd = 'CONSTRAINT ' + QUOTENAME(name) + ' CHECK' + definition 
     FROM sys.check_constraints
    WHERE object_id = @ConstraintObjectId;
@@ -78,13 +80,16 @@ BEGIN
 
   SELECT @QuotedTableName = QuotedTableName FROM tSQLt.Private_GetQuotedTableNameForConstraint(@ConstraintObjectId);
 
-  EXEC tSQLt.Private_RenameObjectToUniqueNameUsingObjectId @ConstraintObjectId;
-  SELECT @Cmd = 'ALTER TABLE ' + @QuotedTableName + ' ADD ' + @Cmd
+  SELECT @Cmd = 'ALTER TABLE ' + @QuotedTableName + ' ADD ' + @Cmd,
+         @QuotedFullConstraintName = QUOTENAME(SCHEMA_NAME(schema_id))+'.'+QUOTENAME(name)
     FROM sys.objects 
    WHERE object_id = @ConstraintObjectId;
 
+  EXEC tSQLt.Private_RenameObjectToUniqueNameUsingObjectId @ConstraintObjectId, @NewName = @NewNameOfOriginalConstraint OUT;
+
   EXEC (@Cmd);
 
+  EXEC tSQLt.Private_MarktSQLtTempObject @ObjectName = @QuotedFullConstraintName, @ObjectType = 'CONSTRAINT', @NewNameOfOriginalObject = @NewNameOfOriginalConstraint;
 END; 
 GO
 
@@ -101,11 +106,15 @@ BEGIN
   DECLARE @AlterTableCmd NVARCHAR(MAX);
   DECLARE @CreateIndexCmd NVARCHAR(MAX);
   DECLARE @FinalCmd NVARCHAR(MAX);
+  DECLARE @NewNameOfOriginalConstraint NVARCHAR(MAX);
+  DECLARE @QuotedFullConstraintName NVARCHAR(MAX);
+
 
   SELECT @SchemaName = SchemaName,
          @OrgTableName = OrgTableName,
          @TableName = TableName,
-         @ConstraintName = OBJECT_NAME(@ConstraintObjectId)
+         @ConstraintName = OBJECT_NAME(@ConstraintObjectId),
+         @QuotedFullConstraintName = QUOTENAME(SchemaName)+'.'+QUOTENAME(OBJECT_NAME(@ConstraintObjectId))
     FROM tSQLt.Private_GetQuotedTableNameForConstraint(@ConstraintObjectId);
 
   SELECT @CreateFkCmd = cmd, @CreateIndexCmd = CreIdxCmd
@@ -114,8 +123,11 @@ BEGIN
                           ' ADD ' + @CreateFkCmd;
   SELECT @FinalCmd = @CreateIndexCmd + @AlterTableCmd;
 
-  EXEC tSQLt.Private_RenameObjectToUniqueName @SchemaName, @ConstraintName;
+  EXEC tSQLt.Private_RenameObjectToUniqueName @SchemaName, @ConstraintName, @NewName = @NewNameOfOriginalConstraint OUTPUT;
   EXEC (@FinalCmd);
+
+  EXEC tSQLt.Private_MarktSQLtTempObject @ObjectName = @QuotedFullConstraintName, @ObjectType = 'CONSTRAINT', @NewNameOfOriginalObject = @NewNameOfOriginalConstraint;
+
 END;
 GO
 
@@ -124,25 +136,28 @@ CREATE PROCEDURE tSQLt.Private_ApplyUniqueConstraint
 AS
 BEGIN
   DECLARE @SchemaName NVARCHAR(MAX);
-  DECLARE @OrgTableName NVARCHAR(MAX);
   DECLARE @TableName NVARCHAR(MAX);
   DECLARE @ConstraintName NVARCHAR(MAX);
   DECLARE @CreateConstraintCmd NVARCHAR(MAX);
   DECLARE @AlterColumnsCmd NVARCHAR(MAX);
+  DECLARE @NewNameOfOriginalConstraint NVARCHAR(MAX);
+  DECLARE @QuotedFullConstraintName NVARCHAR(MAX);
 
   SELECT @SchemaName = SchemaName,
-         @OrgTableName = OrgTableName,
          @TableName = TableName,
-         @ConstraintName = OBJECT_NAME(@ConstraintObjectId)
+         @ConstraintName = OBJECT_NAME(@ConstraintObjectId),
+         @QuotedFullConstraintName = QUOTENAME(SchemaName)+'.'+QUOTENAME(OBJECT_NAME(@ConstraintObjectId))
     FROM tSQLt.Private_GetQuotedTableNameForConstraint(@ConstraintObjectId);
 
   SELECT @AlterColumnsCmd = NotNullColumnCmd,
          @CreateConstraintCmd = CreateConstraintCmd
     FROM tSQLt.Private_GetUniqueConstraintDefinition(@ConstraintObjectId, QUOTENAME(@SchemaName) + '.' + QUOTENAME(@TableName));
 
-  EXEC tSQLt.Private_RenameObjectToUniqueName @SchemaName, @ConstraintName;
+  EXEC tSQLt.Private_RenameObjectToUniqueName @SchemaName, @ConstraintName, @NewName = @NewNameOfOriginalConstraint OUTPUT;
   EXEC (@AlterColumnsCmd);
   EXEC (@CreateConstraintCmd);
+
+  EXEC tSQLt.Private_MarktSQLtTempObject @ObjectName = @QuotedFullConstraintName, @ObjectType = 'CONSTRAINT', @NewNameOfOriginalObject = @NewNameOfOriginalConstraint;
 END;
 GO
 

Source/BuildOrder.txt

@@ -68,7 +68,7 @@ tSQLt.Private_GetDefaultConstraintDefinition.sfn.sql
 tSQLt.Private_GetUniqueConstraintDefinition.sfn.sql
 tSQLt.Private_CreateFakeTableStatement.sfn.sql
 tSQLt.Private_CreateFakeOfTable.ssp.sql
-tSQLt.Private_MarkFakeTable.ssp.sql
+tSQLt.Private_MarktSQLtTempObject.ssp.sql
 tSQLt.FakeTable.ssp.sql
 tSQLt.Private_GenerateCreateProcedureSpyStatement.ssp.sql
 tSQLt.Private_CreateProcedureSpy.ssp.sql

Source/Source.ssmssqlproj

@@ -2,7 +2,6 @@
 <SqlWorkbenchSqlProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="Source">
   <Items>
     <LogicalFolder Name="Connections" Type="2" Sorted="true">
-      <Items />
     </LogicalFolder>
     <LogicalFolder Name="Queries" Type="0" Sorted="true">
       <Items>
@@ -390,11 +389,11 @@
           <AssociatedConnUserName />
           <FullPath>tSQLt.Private_ListTestAnnotations.sfn.sql</FullPath>
         </FileNode>
-        <FileNode Name="tSQLt.Private_MarkFakeTable.ssp.sql">
+        <FileNode Name="tSQLt.Private_MarktSQLtTempObject.ssp.sql">
           <AssociatedConnectionMoniker />
           <AssociatedConnSrvName />
           <AssociatedConnUserName />
-          <FullPath>tSQLt.Private_MarkFakeTable.ssp.sql</FullPath>
+          <FullPath>tSQLt.Private_MarktSQLtTempObject.ssp.sql</FullPath>
         </FileNode>
         <FileNode Name="tSQLt.Private_MarkObjectBeforeRename.ssp.sql">
           <AssociatedConnectionMoniker />

Source/tSQLt.ApplyTrigger.ssp.sql

@@ -7,6 +7,8 @@ CREATE PROCEDURE tSQLt.ApplyTrigger
 AS
 BEGIN
   DECLARE @OrgTableObjectId INT;
+  DECLARE @NewNameOfOriginalTrigger NVARCHAR(MAX);
+
   SELECT @OrgTableObjectId = OrgTableObjectId FROM tSQLt.Private_GetOriginalTableInfo(OBJECT_ID(@TableName)) orgTbl
   IF(@OrgTableObjectId IS NULL)
   BEGIN
@@ -28,9 +30,11 @@ BEGIN
     RAISERROR('%s is not a trigger on %s', 16, 10, @TriggerName, @TableName);
   END;
 
-  EXEC tSQLt.RemoveObject @FullTriggerName;
+  EXEC tSQLt.RemoveObject @ObjectName = @FullTriggerName, @NewName = @NewNameOfOriginalTrigger OUTPUT;
 
   EXEC(@TriggerCode);
+
+  EXEC tSQLt.Private_MarktSQLtTempObject @ObjectName = @FullTriggerName, @ObjectType = N'TRIGGER', @NewNameOfOriginalObject = @NewNameOfOriginalTrigger;
 END;
 ---Build-
 GO

Source/tSQLt.FakeFunction.ssp.sql

@@ -12,6 +12,7 @@ BEGIN
   DECLARE @FunctionObjectId INT;
   DECLARE @FakeFunctionObjectId INT;
   DECLARE @IsScalarFunction BIT;
+  DECLARE @NewNameOfOriginalFunction NVARCHAR(MAX);
 
   EXEC tSQLt.Private_ValidateObjectsCompatibleWithFakeFunction 
                @FunctionName = @FunctionName,
@@ -21,7 +22,9 @@ BEGIN
                @FakeFunctionObjectId = @FakeFunctionObjectId OUT,
                @IsScalarFunction = @IsScalarFunction OUT;
 
-  EXEC tSQLt.RemoveObject @ObjectName = @FunctionName;
+  EXEC tSQLt.RemoveObject
+               @ObjectName = @FunctionName,
+               @NewName = @NewNameOfOriginalFunction OUTPUT;
 
   EXEC tSQLt.Private_CreateFakeFunction 
                @FunctionName = @FunctionName,
@@ -31,5 +34,10 @@ BEGIN
                @FakeFunctionObjectId = @FakeFunctionObjectId,
                @IsScalarFunction = @IsScalarFunction;
 
+  EXEC tSQLt.Private_MarktSQLtTempObject
+               @ObjectName = @FunctionName,
+               @ObjectType = N'FUNCTION',
+               @NewNameOfOriginalObject = @NewNameOfOriginalFunction;
+
 END;
 GO

Source/tSQLt.FakeTable.ssp.sql

@@ -9,47 +9,47 @@ CREATE PROCEDURE tSQLt.FakeTable
     @Defaults BIT = NULL
 AS
 BEGIN
-   DECLARE @OrigSchemaName NVARCHAR(MAX);
-   DECLARE @OrigTableName NVARCHAR(MAX);
-   DECLARE @NewNameOfOriginalTable NVARCHAR(4000);
-   DECLARE @OrigTableFullName NVARCHAR(MAX); SET @OrigTableFullName = NULL;
-   
-   SELECT @OrigSchemaName = @SchemaName,
-          @OrigTableName = @TableName
-   
-   IF(@OrigTableName NOT IN (PARSENAME(@OrigTableName,1),QUOTENAME(PARSENAME(@OrigTableName,1)))
-      AND @OrigSchemaName IS NOT NULL)
+   DECLARE @OrigObjectCleanQuotedSchemaName NVARCHAR(MAX);
+   DECLARE @OrigObjectCleanQuotedName NVARCHAR(MAX);
+   DECLARE @OrigObjectNewName NVARCHAR(4000);
+   DECLARE @OrigObjectFullName NVARCHAR(MAX) = NULL;
+   DECLARE @TargetObjectFullName NVARCHAR(MAX) = NULL;
+      
+   IF(@TableName NOT IN (PARSENAME(@TableName,1),QUOTENAME(PARSENAME(@TableName,1)))
+      AND @SchemaName IS NOT NULL)
    BEGIN
      RAISERROR('When @TableName is a multi-part identifier, @SchemaName must be NULL!',16,10);
    END
 
-   SELECT @SchemaName = CleanSchemaName,
-          @TableName = CleanTableName
+   SELECT @OrigObjectCleanQuotedSchemaName = CleanSchemaName,
+          @OrigObjectCleanQuotedName = CleanTableName
      FROM tSQLt.Private_ResolveFakeTableNamesForBackwardCompatibility(@TableName, @SchemaName);
 
-   EXEC tSQLt.Private_ValidateFakeTableParameters @SchemaName,@OrigTableName,@OrigSchemaName;
+   EXEC tSQLt.Private_ValidateFakeTableParameters @OrigObjectCleanQuotedSchemaName,@TableName,@SchemaName;
+
+   SET @OrigObjectFullName = @OrigObjectCleanQuotedSchemaName + '.' + @OrigObjectCleanQuotedName;
 
-   EXEC tSQLt.Private_RenameObjectToUniqueName @SchemaName, @TableName, @NewNameOfOriginalTable OUTPUT;
+   EXEC tSQLt.Private_RenameObjectToUniqueName @OrigObjectCleanQuotedSchemaName, @OrigObjectCleanQuotedName, @OrigObjectNewName OUTPUT;
 
-   SELECT @OrigTableFullName = S.base_object_name
+   SELECT @TargetObjectFullName = S.base_object_name
      FROM sys.synonyms AS S 
-    WHERE S.object_id = OBJECT_ID(@SchemaName + '.' + @NewNameOfOriginalTable);
+    WHERE S.object_id = OBJECT_ID(@OrigObjectCleanQuotedSchemaName + '.' + @OrigObjectNewName);
 
-   IF(@OrigTableFullName IS NOT NULL)
+   IF(@TargetObjectFullName IS NOT NULL)
    BEGIN
-     IF(COALESCE(OBJECT_ID(@OrigTableFullName,'U'),OBJECT_ID(@OrigTableFullName,'V')) IS NULL)
+     IF(COALESCE(OBJECT_ID(@TargetObjectFullName,'U'),OBJECT_ID(@TargetObjectFullName,'V')) IS NULL)
      BEGIN
-       RAISERROR('Cannot fake synonym %s.%s as it is pointing to %s, which is not a table or view!',16,10,@SchemaName,@TableName,@OrigTableFullName);
+       RAISERROR('Cannot fake synonym %s as it is pointing to %s, which is not a table or view!',16,10,@OrigObjectFullName,@TargetObjectFullName);
      END;
    END;
    ELSE
    BEGIN
-     SET @OrigTableFullName = @SchemaName + '.' + @NewNameOfOriginalTable;
+     SET @TargetObjectFullName = @OrigObjectCleanQuotedSchemaName + '.' + QUOTENAME(@OrigObjectNewName); --TODO:Test for QUOTENAME
    END;
 
-   EXEC tSQLt.Private_CreateFakeOfTable @SchemaName, @TableName, @OrigTableFullName, @Identity, @ComputedColumns, @Defaults;
+   EXEC tSQLt.Private_CreateFakeOfTable @OrigObjectCleanQuotedSchemaName, @OrigObjectCleanQuotedName, @TargetObjectFullName, @Identity, @ComputedColumns, @Defaults;
 
-   EXEC tSQLt.Private_MarkFakeTable @SchemaName, @TableName, @NewNameOfOriginalTable;
+   EXEC tSQLt.Private_MarktSQLtTempObject @OrigObjectFullName, N'TABLE', @OrigObjectNewName;
 END
 ---Build-
 GO

Source/tSQLt.Private_GetForeignKeyDefinition.sfn.sql

@@ -79,7 +79,7 @@ RETURN SELECT 'CONSTRAINT ' + name + ' FOREIGN KEY (' +
                  CROSS APPLY tSQLt.Private_GetForeignKeyParColumns(k.object_id) AS parCol
                  CROSS APPLY tSQLt.Private_GetForeignKeyRefColumns(k.object_id) AS refCol
                  LEFT JOIN sys.extended_properties e
-                   ON e.name = 'tSQLt.FakeTable_OrgTableName'
+                   ON e.name = 'tSQLt.Private_TestDouble_OrgObjectName'
                   AND e.value = OBJECT_NAME(k.referenced_object_id)
                  JOIN sys.tables refTab
                    ON COALESCE(e.major_id,k.referenced_object_id) = refTab.object_id