Skip to content

Added "COLLATE DATABASE_DEFAULT" in all the places that block moving to partial containment #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/Run_Methods.sql
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ BEGIN
SELECT TC.Name
FROM tSQLt.TestClasses AS TC
JOIN tSQLt.Private_NewTestClassList AS PNTCL
ON PNTCL.ClassName = TC.Name;
ON PNTCL.ClassName = TC.Name COLLATE DATABASE_DEFAULT;
END;
GO

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RETURN SELECT
AS V(UserTypeId, MaxLength, Precision, Scale, CollationName, ObjectId, ColumnId, ReturnDetails)
CROSS APPLY tSQLt.Private_GetFullTypeName(V.UserTypeId, V.MaxLength, V.Precision, V.Scale, V.CollationName) AS GFTN
LEFT JOIN (SELECT 1 AS IsComputedColumn,
' AS '+ cci.definition + CASE WHEN cci.is_persisted = 1 THEN ' PERSISTED' ELSE '' END AS ComputedColumnDefinition,
' AS '+ cci.definition + CASE WHEN cci.is_persisted = 1 THEN ' PERSISTED' ELSE '' END COLLATE DATABASE_DEFAULT AS ComputedColumnDefinition,
cci.object_id,
cci.column_id
FROM sys.computed_columns cci
Expand All @@ -20,4 +20,4 @@ RETURN SELECT
AND cc.column_id = V.ColumnId
AND V.ReturnDetails = 1;
---Build-
GO
GO
14 changes: 7 additions & 7 deletions Source/tSQLt.Private_GetForeignKeyDefinition.sfn.sql
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ AS
RETURN SELECT 'CONSTRAINT ' + name + ' FOREIGN KEY (' +
parCols + ') REFERENCES ' + refName + '(' + refCols + ')'+
CASE WHEN @NoCascade = 1 THEN ''
ELSE delete_referential_action_cmd + ' ' + update_referential_action_cmd
END AS cmd,
CASE
ELSE delete_referential_action_cmd + ' ' + update_referential_action_cmd
END COLLATE DATABASE_DEFAULT AS cmd,
CASE
WHEN RefTableIsFakedInd = 1
THEN 'CREATE UNIQUE INDEX ' + tSQLt.Private::CreateUniqueObjectName() + ' ON ' + refName + '(' + refCols + ');'
ELSE ''
END CreIdxCmd
THEN 'CREATE UNIQUE INDEX ' + tSQLt.Private::CreateUniqueObjectName() + ' ON ' + refName + '(' + refCols + ');'
ELSE ''
END COLLATE DATABASE_DEFAULT AS CreIdxCmd
FROM (SELECT QUOTENAME(SCHEMA_NAME(k.schema_id)) AS SchemaName,
QUOTENAME(k.name) AS name,
QUOTENAME(OBJECT_NAME(k.parent_object_id)) AS parName,
Expand Down Expand Up @@ -87,4 +87,4 @@ RETURN SELECT 'CONSTRAINT ' + name + ' FOREIGN KEY (' +
AND k.object_id = OBJECT_ID(@SchemaName + '.' + @ForeignKeyName)
)x;
GO
---Build-
---Build-
2 changes: 1 addition & 1 deletion Source/tSQLt.Private_NoTransactionHandleTable.ssp.sql
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ BEGIN
END;
ELSE IF (@TableAction = 'Hide')
BEGIN
IF (NOT EXISTS (SELECT 1 FROM tSQLt.Private_RenamedObjectLog ROL WHERE QUOTENAME(OBJECT_SCHEMA_NAME(ROL.ObjectId))+'.'+OriginalName = @FullTableName))
IF (NOT EXISTS (SELECT 1 FROM tSQLt.Private_RenamedObjectLog ROL WHERE QUOTENAME(OBJECT_SCHEMA_NAME(ROL.ObjectId))+'.'+OriginalName COLLATE DATABASE_DEFAULT = @FullTableName))
BEGIN
IF(OBJECT_ID(@FullTableName) IS NULL)
BEGIN
Expand Down
4 changes: 2 additions & 2 deletions Source/tSQLt.Private_ScriptIndex.sfn.sql
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RETURN
THEN 'WITH(STATISTICS_ONLY = -1)'
ELSE ''
END +
';' AS create_cmd
';' COLLATE DATABASE_DEFAULT AS create_cmd
FROM tSQLt.Private_SysIndexes AS I
CROSS APPLY
(
Expand Down Expand Up @@ -78,4 +78,4 @@ RETURN
AND I.index_id = ISNULL(@index_id,I.index_id);
GO
---Build-
GO
GO