Quote collation names by default #37463
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull request overview
This PR addresses issue #37462 by changing the default behavior to quote collation names in SQL generation to prevent SQL injection vulnerabilities. The implementation adds quoting at the relational base layer and provides SQL Server-specific overrides that validate collation name characters instead of quoting (since SQL Server doesn't support quoted collation names).
- Collation names are now quoted by default in
QuerySqlGeneratorandMigrationsSqlGenerator - SQL Server overrides the quoting behavior with character validation (alphanumeric and underscores only)
- Added error message resource for invalid SQL Server collation names
- Added test coverage for SQL Server's invalid collation name validation
Reviewed changes
Copilot reviewed 6 out of 7 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| src/EFCore.Relational/Query/QuerySqlGenerator.cs | Changed to quote collation names by default using DelimitIdentifier for security, with explanatory comments about provider overrides |
| src/EFCore.Relational/Migrations/MigrationsSqlGenerator.cs | Changed to quote collation names in column definitions for consistency with query generation |
| src/EFCore.SqlServer/Query/Internal/SqlServerQuerySqlGenerator.cs | Added VisitCollate override to validate collation name characters instead of quoting (SQL Server doesn't support quoted collation names) |
| src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs | Added character validation for collation names in ColumnDefinition method |
| src/EFCore.SqlServer/Properties/SqlServerStrings.resx | Added error message resource for invalid collation names |
| src/EFCore.SqlServer/Properties/SqlServerStrings.Designer.cs | Generated code for the new error message resource |
| test/EFCore.SqlServer.FunctionalTests/Query/NorthwindDbFunctionsQuerySqlServerTest.cs | Added test to verify invalid collation names throw the correct exception |
Files not reviewed (1)
- src/EFCore.SqlServer/Properties/SqlServerStrings.Designer.cs: Language not supported
test/EFCore.SqlServer.FunctionalTests/Query/NorthwindDbFunctionsQuerySqlServerTest.cs
Show resolved
Hide resolved
src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs
Outdated
Show resolved
Hide resolved
AndriySvyryd
approved these changes
Jan 8, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #37462