Skip to content

Proposed fix to #7172 - Consider non-default column collation in table variable #29518

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.

Sign up for GitHub

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

Closed
david-wimmer wants to merge 3 commits into from
+15 −12
Closed

Proposed fix to #7172 - Consider non-default column collation in table variable #29518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
818447e
Consider non-default column collation in table variable
Nov 9, 2022
e25b3e4
Avoid double negation
david-wimmer Nov 11, 2022
bcb9e42
Add collation annotation for SQL Server only
Nov 14, 2022
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
9 changes: 1 addition & 8 deletions src/EFCore.Relational/Extensions/RelationalPropertyExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,9 +1250,7 @@ public static void SetComment(this IMutableProperty property, string? comment)
/// <param name="property">The property.</param>
/// <returns>The collation for the column this property is mapped to.</returns>
public static string? GetCollation(this IReadOnlyProperty property)
=> (property is RuntimeProperty)
? throw new InvalidOperationException(CoreStrings.RuntimeModelMissingData)
: (string?)property.FindAnnotation(RelationalAnnotationNames.Collation)?.Value;
=> (string?)property.FindAnnotation(RelationalAnnotationNames.Collation)?.Value;

/// <summary>
/// Returns the collation to be used for the column.
Expand All @@ -1262,11 +1260,6 @@ public static void SetComment(this IMutableProperty property, string? comment)
/// <returns>The collation for the column this property is mapped to.</returns>
public static string? GetCollation(this IReadOnlyProperty property, in StoreObjectIdentifier storeObject)
{
if (property is RuntimeProperty)
{
throw new InvalidOperationException(CoreStrings.RuntimeModelMissingData);
}

var annotation = property.FindAnnotation(RelationalAnnotationNames.Collation);
return annotation != null
? (string?)annotation.Value
Expand Down
5 changes: 5 additions & 0 deletions src/EFCore.SqlServer/Design/Internal/SqlServerCSharpRuntimeAnnotationCodeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ public override void Generate(IProperty property, CSharpRuntimeAnnotationCodeGen
{
annotations[SqlServerAnnotationNames.ValueGenerationStrategy] = property.GetValueGenerationStrategy();
}

if (!annotations.ContainsKey(RelationalAnnotationNames.Collation))
{
annotations[RelationalAnnotationNames.Collation] = property.GetCollation();
}
}

base.Generate(property, parameters);
Expand Down
5 changes: 5 additions & 0 deletions src/EFCore.SqlServer/Metadata/Conventions/SqlServerRuntimeModelConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ protected override void ProcessPropertyAnnotations(
{
annotations[SqlServerAnnotationNames.ValueGenerationStrategy] = property.GetValueGenerationStrategy();
}

if (!annotations.ContainsKey(RelationalAnnotationNames.Collation))
Copy link
Copy Markdown
Member

@roji roji Apr 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can use TryAdd (here and elsewhere)

{
annotations[RelationalAnnotationNames.Collation] = property.GetCollation();
}
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/EFCore.SqlServer/Update/Internal/SqlServerUpdateSqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,12 +767,15 @@ private void AppendDeclareTable(
private static string GetTypeNameForCopy(IProperty property)
{
var typeName = property.GetColumnType();
var collation = property[RelationalAnnotationNames.Collation]?.ToString();
Copy link
Copy Markdown
Member

@AndriySvyryd AndriySvyryd Apr 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var collation = property[RelationalAnnotationNames.Collation]?.ToString();
var collation = property.GetCollation();


return property.ClrType == typeof(byte[])
typeName = property.ClrType == typeof(byte[])
&& (typeName.Equals("rowversion", StringComparison.OrdinalIgnoreCase)
|| typeName.Equals("timestamp", StringComparison.OrdinalIgnoreCase))
? property.IsNullable ? "varbinary(8)" : "binary(8)"
: typeName;

return collation is null ? typeName : $"{typeName} COLLATE {collation}";
}

/// <summary>
Expand Down
3 changes: 0 additions & 3 deletions test/EFCore.Design.Tests/Scaffolding/Internal/CSharpRuntimeModelCodeGeneratorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1904,9 +1904,6 @@ public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
CoreStrings.RuntimeModelMissingData,
Assert.Throws<InvalidOperationException>(() => detailsProperty.IsSparse()).Message);
Assert.Null(detailsProperty[RelationalAnnotationNames.Collation]);
Assert.Equal(
CoreStrings.RuntimeModelMissingData,
Assert.Throws<InvalidOperationException>(() => detailsProperty.GetCollation()).Message);

var ownedFragment = referenceOwnedType.GetMappingFragments().Single();
Assert.Equal(nameof(OwnedType.Details), detailsProperty.GetColumnName(ownedFragment.StoreObject));
Expand Down