Fix escaping database name for SqlServerAdapter::dropDatabase #2287
Conversation
This file contains 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
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
MasterOdin
commented
Jun 5, 2024
Comment on lines
+1210
to
+1211
| ALTER DATABASE %1$s SET SINGLE_USER WITH ROLLBACK IMMEDIATE; | ||
| DROP DATABASE %1$s;', |
There was a problem hiding this comment.
By using %1$s, I'm able to replace both instances with a single value. Downside is that cannot use " around the string like do in other places. Could use a heredoc, and then run the $sql through sprintf on a separate line, but that didn't feel in line with other places sprintf is used.
MasterOdin
commented
Jun 5, 2024
| @@ -1176,7 +1176,7 @@ public function createDatabase(string $name, array $options = []): void | |||
| { | |||
| $databaseName = $this->quoteColumnName($name); | |||
| if (isset($options['collation'])) { | |||
| $this->execute(sprintf('CREATE DATABASE %s COLLATE [%s]', $databaseName, $options['collation'])); | |||
| $this->execute(sprintf('CREATE DATABASE %s COLLATE %s', $databaseName, $options['collation'])); | |||
There was a problem hiding this comment.
Not sure why the collate argument had brackets around it as it's not an identifier and shouldn't be created as such. I also tried ' and " and it didn't work either.
This has probably been broken for a long time, and I guess no one is creating databases with specific collations.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR fixes a bug introduced in #2286 that broke dropping databases in sqlserver. I've fixed the syntax so that it actually works for database names that need escaping, discovering as well that the escaping of column names was also broken. Per https://learn.microsoft.com/en-us/previous-versions/sql/sql-server-2008-r2/ms176027(v=sql.105)?redirectedfrom=MSDN, to escape an identifier that has brackets, need to double up the brackets, not use
\.