Removed a TODO on the FakeTable ssp

Author: lizbaron

Source/tSQLt.FakeTable.ssp.sql

@@ -14,6 +14,8 @@ BEGIN
    DECLARE @OrigObjectNewName NVARCHAR(4000);
    DECLARE @OrigObjectFullName NVARCHAR(MAX) = NULL;
    DECLARE @TargetObjectFullName NVARCHAR(MAX) = NULL;
+   DECLARE @OriginalObjectObjectId INT;
+   DECLARE @TargetObjectObjectId INT;
 
    IF(@TableName NOT IN (PARSENAME(@TableName,1),QUOTENAME(PARSENAME(@TableName,1)))
       AND @SchemaName IS NOT NULL)
@@ -31,23 +33,26 @@ BEGIN
 
    EXEC tSQLt.Private_RenameObjectToUniqueName @OrigObjectCleanQuotedSchemaName, @OrigObjectCleanQuotedName, @OrigObjectNewName OUTPUT;
 
+   SET @OriginalObjectObjectId = OBJECT_ID(@OrigObjectCleanQuotedSchemaName + '.' + QUOTENAME(@OrigObjectNewName));
+
    SELECT @TargetObjectFullName = S.base_object_name
      FROM sys.synonyms AS S 
-    WHERE S.object_id = OBJECT_ID(@OrigObjectCleanQuotedSchemaName + '.' + @OrigObjectNewName);
+    WHERE S.object_id = @OriginalObjectObjectId;
 
    IF(@TargetObjectFullName IS NOT NULL)
    BEGIN
      IF(COALESCE(OBJECT_ID(@TargetObjectFullName,'U'),OBJECT_ID(@TargetObjectFullName,'V')) IS NULL)
      BEGIN
        RAISERROR('Cannot fake synonym %s as it is pointing to %s, which is not a table or view!',16,10,@OrigObjectFullName,@TargetObjectFullName);
      END;
+     SET @TargetObjectObjectId = OBJECT_ID(@TargetObjectFullName);
    END;
    ELSE
    BEGIN
-     SET @TargetObjectFullName = @OrigObjectCleanQuotedSchemaName + '.' + QUOTENAME(@OrigObjectNewName); --TODO:Test for QUOTENAME
+     SET @TargetObjectObjectId = @OriginalObjectObjectId;
    END;
 
-   EXEC tSQLt.Private_CreateFakeOfTable @OrigObjectCleanQuotedSchemaName, @OrigObjectCleanQuotedName, @TargetObjectFullName, @Identity, @ComputedColumns, @Defaults;
+   EXEC tSQLt.Private_CreateFakeOfTable @OrigObjectCleanQuotedSchemaName, @OrigObjectCleanQuotedName, @TargetObjectObjectId, @Identity, @ComputedColumns, @Defaults;
 
    EXEC tSQLt.Private_MarktSQLtTempObject @OrigObjectFullName, N'TABLE', @OrigObjectNewName;
 END

Source/tSQLt.Private_CreateFakeOfTable.ssp.sql

@@ -4,15 +4,15 @@ GO
 CREATE PROCEDURE tSQLt.Private_CreateFakeOfTable
   @SchemaName NVARCHAR(MAX),
   @TableName NVARCHAR(MAX),
-  @OrigTableFullName NVARCHAR(MAX),
+  @OrigTableObjectId INT,
   @Identity BIT,
   @ComputedColumns BIT,
   @Defaults BIT
 AS
 BEGIN
    DECLARE @cmd NVARCHAR(MAX) =
      (SELECT CreateTableStatement 
-        FROM tSQLt.Private_CreateFakeTableStatement(OBJECT_ID(@OrigTableFullName), @SchemaName+'.'+@TableName,@Identity,@ComputedColumns,@Defaults,0));
+        FROM tSQLt.Private_CreateFakeTableStatement(@OrigTableObjectId, @SchemaName+'.'+@TableName,@Identity,@ComputedColumns,@Defaults,0));
    EXEC (@cmd);
 END;
 ---Build-

Source/tSQLt.Private_RenameObject.ssp.sql

@@ -10,7 +10,7 @@ BEGIN
    DECLARE @RenameCmd NVARCHAR(MAX);
    SET @RenameCmd = 'EXEC sp_rename ''' + 
                     REPLACE(@SchemaName + '.' + @ObjectName, '''', '''''') + ''', ''' + 
-                    @NewName + ''',''OBJECT'';';
+                    REPLACE(@NewName, '''', '''''') + ''',''OBJECT'';';
 
    EXEC tSQLt.SuppressOutput @RenameCmd;
 END;

Tests/FakeTableTests.class.sql

@@ -377,7 +377,7 @@ BEGIN
 END;
 GO
 
-CREATE PROC FakeTableTests.[test FakeTable works with ugly column and table names]
+CREATE PROC FakeTableTests.[test FakeTable works with special characters in column and table names]
 AS
 BEGIN
   IF OBJECT_ID('dbo.[tst!@#$%^&*()_+ 1]') IS NOT NULL DROP TABLE dbo.[tst!@#$%^&*()_+ 1];
@@ -1032,3 +1032,14 @@ BEGIN
 
 END;
 GO
+CREATE PROC FakeTableTests.[test FakeTable works if new name of original table requires quoting]
+AS
+BEGIN
+  CREATE TABLE FakeTableTests.TempTable1(i INT NULL);
+  EXEC tSQLt.SpyProcedure @ProcedureName = 'tSQLt.Private_RenameObjectToUniqueName', @CommandToExecute = 'SET @NewName = ''A Name.Needs''''Quoting'';',@CallOriginal = 1;
+
+  EXEC tSQLt.FakeTable @TableName = 'FakeTableTests.TempTable1';
+
+  EXEC tSQLt.AssertEqualsTableSchema @Expected = 'FakeTableTests.[A Name.Needs''Quoting]', @Actual = 'FakeTableTests.TempTable1';
+END;
+GO

Tests/_ExploratoryTests.class.sql

@@ -333,6 +333,23 @@ BEGIN
   BEGIN TRY DEALLOCATE ACursor; END TRY BEGIN CATCH END CATCH;
   EXEC tSQLt.AssertEqualsTable '#Expected','#Actual';
 
+END;
+GO
+/*-----------------------------------------------------------------------------------------------*/
+GO
+CREATE PROCEDURE [_ExploratoryTests].[test sp_addextendedproperty can handle odd values]
+AS
+BEGIN
+  CREATE TABLE [_ExploratoryTests].ATable(I INT);
+
+  EXEC sys.sp_addextendedproperty 
+     @name = N'ATestProperty', 
+     @value = 'a string.with''special chars', 
+     @level0type = N'SCHEMA', @level0name = '_ExploratoryTests', 
+     @level1type = 'TABLE',  @level1name = 'ATable';
+
+  SELECT * FROM sys.extended_properties AS EP WHERE EP.major_id = OBJECT_ID('[_ExploratoryTests].ATable');
+
 END;
 GO
 /*-----------------------------------------------------------------------------------------------*/

Tests/tSQLtclr_test.class.sql

@@ -184,4 +184,14 @@ BEGIN
   END;
 END;
 GO
+
+CREATE PROC tSQLtclr_test.[test name returned by tSQLt.Private::CreateUniqueObjectName() should not require quoting]
+AS
+BEGIN
+  DECLARE @NewName NVARCHAR(MAX) = tSQLt.Private::CreateUniqueObjectName();
+
+  EXEC tSQLt.ExpectNoException;  
+  EXEC('CREATE TABLE tSQLtclr_test.'+@NewName+'(I INT);');
+END;
+GO
 --ROLLBACK