mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-05-02 20:40:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3656 from actiontech/inner-tmp_20.07

Browse Source 
cherry pick from inner685/627、issue 2063
This commit is contained in:
wenyh
2023-04-12 13:13:09 +08:00
committed by GitHub
parent b7ce9b1c21 18ece974dd
commit 4b6ca09daa
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/actiontech/dble/meta/ViewMeta.java
+1 -1
View File
@@ -91,8 +91,8 @@ public class ViewMeta {
viewQuery = new TableNode(schema, viewName, viewColumnMeta);
} else {
if (selNode instanceof MergeNode) {
this.setFieldsAlias(selNode, true);
selNode.setUpFields();
this.setFieldsAlias(selNode, true);
} else {
selNode.setUpFields();
this.setFieldsAlias(selNode, false);
src/main/java/com/actiontech/dble/server/util/SchemaUtil.java
+6 -1
View File
@@ -120,7 +120,9 @@ public final class SchemaUtil {
}
if (DbleServer.getInstance().getSystemVariables().isLowerCaseTableNames()) {
schemaInfo.table = schemaInfo.table.toLowerCase();
schemaInfo.schema = schemaInfo.schema.toLowerCase();
if (!schemaInfo.dual) {
schemaInfo.schema = schemaInfo.schema.toLowerCase();
}
}
if (!MYSQL_SYS_SCHEMA.contains(schemaInfo.schema.toUpperCase())) {
SchemaConfig schemaConfig = DbleServer.getInstance().getConfig().getSchemas().get(schemaInfo.schema);
@@ -209,6 +211,9 @@ public final class SchemaUtil {
throws SQLException {
SchemaInfo schemaInfo = SchemaUtil.getSchemaInfo(source.getUser(), contextSchema, table);
String currentSchema = schemaInfo.schema.toUpperCase();
if (schemaInfo.dual) {
return true;
}
if (SchemaUtil.MYSQL_SYS_SCHEMA.contains(currentSchema)) {
schemas.add(currentSchema);
return false;