Skip to content
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

#1109 - add 'default' value for table attribute type in schema.xml #1110

Merged
merged 2 commits into from
Apr 10, 2019
+8 −5
Merged

#1109 - add 'default' value for table attribute type in schema.xml #1110

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3397f0a
#1109 - add 'default' value for table attribute type in schema.xml
Apr 10, 2019
724ec6f
Merge branch 'master' into issue-1109
yanhuqing666 Apr 10, 2019
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
13 changes: 8 additions & 5 deletions src/main/java/com/actiontech/dble/config/loader/xml/XMLSchemaLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ private void mergeFkERMap(SchemaConfig schemaConfig) {
erRelations.putAll(schemaFkERMap);
}


private Map<String, TableConfig> loadTables(Element node, boolean isLowerCaseNames) {
// supprot [`] BEN GONG in table name
Map<String, TableConfig> tables = new TableConfigMap();
Expand All @@ -242,10 +241,14 @@ private Map<String, TableConfig> loadTables(Element node, boolean isLowerCaseNam
TableTypeEnum tableType = TableTypeEnum.TYPE_SHARDING_TABLE;
if (tableElement.hasAttribute("type")) {
String tableTypeStr = tableElement.getAttribute("type");
if ("global".equalsIgnoreCase(tableTypeStr)) {
tableType = TableTypeEnum.TYPE_GLOBAL_TABLE;
} else {
problemReporter.warn("Table[" + tableElement.getAttribute("name") + "] attribute type " + tableTypeStr + " in schema.xml is illegal, use sharding replaced");
switch (tableTypeStr.toLowerCase()) {
case "global":
tableType = TableTypeEnum.TYPE_GLOBAL_TABLE;
break;
case "default":
break;
default:
problemReporter.warn("Table[" + tableElement.getAttribute("name") + "] attribute type value '" + tableTypeStr + "' in schema.xml is illegal, use default replaced");
}
}
//dataNode of table
Expand Down