Skip to content

Commit ab413ba

Browse files
committed
Broke the build catastrophically.
1 parent 06a6f5d commit ab413ba

File tree

4 files changed

+43
-10
lines changed

4 files changed

+43
-10
lines changed

Source/tSQLt.FakeTable.ssp.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ BEGIN
4949

5050
EXEC tSQLt.Private_CreateFakeOfTable @SchemaName, @TableName, @OrigTableFullName, @Identity, @ComputedColumns, @Defaults;
5151

52-
EXEC tSQLt.Private_MarktSQLtTempObject @SchemaName, @TableName, @NewNameOfOriginalTable;
52+
EXEC tSQLt.Private_MarktSQLtTempObject @OrigTableFullName, N'TABLE', @NewNameOfOriginalTable;
5353
END
5454
---Build-
5555
GO

Source/tSQLt.Private_MarktSQLtTempObject.ssp.sql

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,32 @@ IF OBJECT_ID('tSQLt.Private_MarktSQLtTempObject') IS NOT NULL DROP PROCEDURE tSQ
22
GO
33
---Build+
44
CREATE PROCEDURE tSQLt.Private_MarktSQLtTempObject
5-
@SchemaName NVARCHAR(MAX),
6-
@TableName NVARCHAR(MAX),
7-
@NewNameOfOriginalTable NVARCHAR(4000)
5+
@ObjectName NVARCHAR(MAX),
6+
@ObjectType NVARCHAR(MAX),
7+
--@ParentObjectName NVARCHAR(MAX) = NULL,
8+
--@ParentObjectType NVARCHAR(MAX) = NULL,
9+
@NewNameOfOriginalObject NVARCHAR(4000)
810
AS
911
BEGIN
10-
DECLARE @UnquotedSchemaName NVARCHAR(MAX);SET @UnquotedSchemaName = OBJECT_SCHEMA_NAME(OBJECT_ID(@SchemaName+'.'+@TableName));
11-
DECLARE @UnquotedTableName NVARCHAR(MAX);SET @UnquotedTableName = OBJECT_NAME(OBJECT_ID(@SchemaName+'.'+@TableName));
12+
DECLARE @UnquotedSchemaName NVARCHAR(MAX);
13+
DECLARE @UnquotedObjectName NVARCHAR(MAX);
14+
SELECT
15+
@UnquotedSchemaName = SCHEMA_NAME(O.schema_id),
16+
@UnquotedObjectName = O.name
17+
FROM sys.objects O
18+
WHERE O.object_id = OBJECT_ID(@ObjectName);
1219

1320
EXEC sys.sp_addextendedproperty
1421
@name = N'tSQLt.IsTempObject',
1522
@value = 1,
1623
@level0type = N'SCHEMA', @level0name = @UnquotedSchemaName,
17-
@level1type = N'TABLE', @level1name = @UnquotedTableName;
24+
@level1type = @ObjectType, @level1name = @UnquotedObjectName;
1825

1926
EXEC sys.sp_addextendedproperty
2027
@name = N'tSQLt.Private_TestDouble_OrgObjectName',
21-
@value = @NewNameOfOriginalTable,
28+
@value = @NewNameOfOriginalObject,
2229
@level0type = N'SCHEMA', @level0name = @UnquotedSchemaName,
23-
@level1type = N'TABLE', @level1name = @UnquotedTableName;
30+
@level1type = @ObjectType, @level1name = @UnquotedObjectName;
2431
END;
2532
---Build-
2633
GO

Source/tSQLt.SpyProcedure.ssp.sql

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,16 @@ BEGIN
2525
@CreateProcedureStatement = @CreateProcedureStatement OUT,
2626
@CreateLogTableStatement = @CreateLogTableStatement OUT;
2727

28+
DECLARE @NewNameOfOriginalObject NVARCHAR(MAX);
2829

29-
EXEC tSQLt.Private_RenameObjectToUniqueNameUsingObjectId @ProcedureObjectId;
30+
EXEC tSQLt.Private_RenameObjectToUniqueNameUsingObjectId @ProcedureObjectId, @NewName = @NewNameOfOriginalObject OUTPUT;
3031

3132
EXEC(@CreateLogTableStatement);
3233

3334
EXEC(@CreateProcedureStatement);
3435

36+
EXEC tSQLt.Private_MarktSQLtTempObject @ProcedureName, 'PROCEDURE', @NewNameOfOriginalObject;
37+
3538
RETURN 0;
3639
END;
3740
---Build-

Tests/SpyProcedureTests.class.sql

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,3 +734,26 @@ BEGIN
734734

735735
END;
736736
GO
737+
CREATE PROC SpyProcedureTests.[test new Procedure Spy is marked as tSQLt.IsTempObject]
738+
AS
739+
BEGIN
740+
EXEC('CREATE PROCEDURE SpyProcedureTests.TempProcedure1 AS RETURN;');
741+
742+
EXEC tSQLt.SpyProcedure @ProcedureName = 'SpyProcedureTests.TempProcedure1';
743+
744+
SELECT name, value
745+
INTO #Actual
746+
FROM sys.extended_properties
747+
WHERE class_desc = 'OBJECT_OR_COLUMN'
748+
AND major_id = OBJECT_ID('SpyProcedureTests.TempProcedure1')
749+
AND name = 'tSQLt.IsTempObject';
750+
751+
SELECT TOP(0) A.* INTO #Expected FROM #Actual A RIGHT JOIN #Actual X ON 1=0;
752+
753+
INSERT INTO #Expected VALUES('tSQLt.IsTempObject', 1);
754+
755+
EXEC tSQLt.AssertEqualsTable '#Expected','#Actual';
756+
END;
757+
GO
758+
759+

0 commit comments

Comments
 (0)