Skip to content

fix(sql-check): failed to check statement when connect to a lower case schema #1341

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

Merged
yhilmare merged 2 commits into from
Jan 3, 2024
Merged

fix(sql-check): failed to check statement when connect to a lower case schema #1341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0694e30
fix issue #1337
yhilmare Jan 3, 2024
aa6c63e
update submodule
yhilmare Jan 3, 2024
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 client
Open in desktop
Submodule client updated 7 files
+1 −1 package.json
+10 −10 pnpm-lock.yaml
+6 −0 src/component/MonacoEditor/index.tsx
+2 −1 src/component/SelectTransfer/index.tsx
+2 −2 src/page/Secure/Env/components/EnvironmentTable.tsx
+1 −1 src/store/setting.ts
+2 −2 src/util/dataSourceParser.ts
22 changes: 18 additions & 4 deletions ...e/src/main/java/com/oceanbase/odc/service/session/factory/OBConsoleDataSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,22 +261,36 @@ private static String getDbUser(@NonNull ConnectionConfig connectionConfig) {
return username;
}

public static String getSchema(@NonNull String schema, @NonNull DialectType dialectType) {
switch (dialectType) {
case OB_ORACLE:
case ORACLE:
return "\"" + schema + "\"";
case OB_MYSQL:
case MYSQL:
case ODP_SHARDING_OB_MYSQL:
return schema;
default:
return null;
}
}

public static String getDefaultSchema(@NonNull ConnectionConfig connectionConfig) {
String defaultSchema = connectionConfig.getDefaultSchema();
switch (connectionConfig.getDialectType()) {
case OB_ORACLE:
case ORACLE:
if (StringUtils.isNotEmpty(defaultSchema)) {
return "\"" + defaultSchema + "\"";
return getSchema(defaultSchema, connectionConfig.getDialectType());
}
return "\"" + getDbUser(connectionConfig) + "\"";
return getSchema(getDbUser(connectionConfig), connectionConfig.getDialectType());
case OB_MYSQL:
case MYSQL:
case ODP_SHARDING_OB_MYSQL:
if (StringUtils.isNotEmpty(defaultSchema)) {
return defaultSchema;
return getSchema(defaultSchema, connectionConfig.getDialectType());
}
return OdcConstants.MYSQL_DEFAULT_SCHEMA;
return getSchema(OdcConstants.MYSQL_DEFAULT_SCHEMA, connectionConfig.getDialectType());
default:
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion server/odc-service/src/main/java/com/oceanbase/odc/service/sqlcheck/SqlCheckService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public List<CheckViolation> check(@NotNull Long environmentId, @NonNull String d
Environment env = this.environmentService.detail(environmentId);
List<Rule> rules = this.ruleService.list(env.getRulesetId(), QueryRuleMetadataParams.builder().build());
OBConsoleDataSourceFactory factory = new OBConsoleDataSourceFactory(config, true, false);
factory.resetSchema(origin -> databaseName);
factory.resetSchema(origin -> OBConsoleDataSourceFactory.getSchema(databaseName, config.getDialectType()));
SqlCheckContext checkContext = new SqlCheckContext((long) sqls.size());
try (SingleConnectionDataSource dataSource = (SingleConnectionDataSource) factory.getDataSource()) {
JdbcTemplate jdbc = new JdbcTemplate(dataSource);
Expand Down