Remove hard-coded collation in JDBC adapter #1518
Merged
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
brfrn169
commented
Feb 19, 2024
| steps: | ||
| - name: Run MySQL 5.7 | ||
| run: | | ||
| docker run -e MYSQL_ROOT_PASSWORD=mysql -p 3306:3306 -d mysql:5.7 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin |
There was a problem hiding this comment.
Because we need to run MySQL with the collation-related parameters, we run docker run command here.
| @@ -607,6 +595,7 @@ jobs: | |||
| MSSQL_PID: "Express" | |||
| SA_PASSWORD: "SqlServer17" | |||
| ACCEPT_EULA: "Y" | |||
| MSSQL_COLLATION: "Japanese_BIN2" | |||
There was a problem hiding this comment.
Also, for SQL Server, we set MSSQL_COLLATION for the collation.
| return new String[] { | ||
| "CREATE SCHEMA " + enclose(fullSchema) + " character set utf8 COLLATE utf8_bin" | ||
| }; | ||
| return new String[] {"CREATE SCHEMA " + enclose(fullSchema)}; |
There was a problem hiding this comment.
Removed the hard-coded collation for MySQL.
| return new String[] { | ||
| "CREATE SCHEMA IF NOT EXISTS " + enclose(schema) + " character set utf8 COLLATE utf8_bin" | ||
| }; | ||
| return new String[] {"CREATE SCHEMA IF NOT EXISTS " + enclose(schema)}; |
| @@ -176,7 +176,7 @@ public String getDataTypeForEngine(DataType scalarDbDataType) { | |||
| case INT: | |||
| return "INT"; | |||
| case TEXT: | |||
| return "VARCHAR(8000) COLLATE Latin1_General_BIN"; | |||
| return "VARCHAR(8000)"; | |||
There was a problem hiding this comment.
Removed the hard-coded collation for SQL Server.
| import org.junit.jupiter.api.TestInstance; | ||
|
|
||
| @TestInstance(TestInstance.Lifecycle.PER_CLASS) | ||
| public abstract class DistributedStorageJapaneseIntegrationTestBase { |
There was a problem hiding this comment.
Added an integration test for Japanese.
brfrn169
requested review from
komamitsu,
feeblefakie,
Torch3333 and
kota2and3kan
brfrn169
changed the title
|
@kota2and3kan As discussed, I've added an integration test for Japanese Hankaku in f670592. Please take a look when you have time! |
This was referenced Feb 22, 2024
brfrn169
added a commit
that referenced
this pull request
Feb 22, 2024
brfrn169
added a commit
that referenced
this pull request
Feb 22, 2024
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.
Description
Currently, in the JDBC adapter, we use a hard-coded collation for SQL Server when creating tables. However, we've encountered an issue where Japanese cannot be used with the hard-coded collation in SQL Server. To resolve this, this PR removes the hard-coded collation for SQL Server. For consistency, it also eliminates the hard-coded collation for MySQL. As a result, the collation configured in the database will be used when creating tables.
Related issues and/or PRs
N/A
Changes made
Checklist
Additional notes (optional)
N/A
Release notes
Removed the hard-coded collation for MySQL and SQL Server in the JDBC adapter. As a result, the collation configured in the underlying database will be used when creating tables.