Oracle数据库自定义Schema

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/connector/AbstractDataBaseConfigChecker.java

@@ -20,6 +20,7 @@ public abstract class AbstractDataBaseConfigChecker implements ConnectorConfigCh
         String url = params.get("url");
         String driverClassName = params.get("driverClassName");
         String primaryKey = params.get("primaryKey");
+        String schema = params.get("schema");
         Assert.hasText(username, "Username is empty.");
         Assert.hasText(password, "Password is empty.");
         Assert.hasText(url, "Url is empty.");
@@ -30,6 +31,7 @@ public abstract class AbstractDataBaseConfigChecker implements ConnectorConfigCh
         connectorConfig.setUrl(url);
         connectorConfig.setDriverClassName(driverClassName);
         connectorConfig.setPrimaryKey(primaryKey);
+        connectorConfig.setSchema(schema);
     }
 
     protected void modifyDql(DatabaseConfig connectorConfig, Map<String, String> params) {

dbsyncer-connector/src/main/java/org/dbsyncer/connector/oracle/OracleConnector.java

@@ -48,6 +48,6 @@ public final class OracleConnector extends AbstractDatabaseConnector {
 
     @Override
     protected String getSchema(DatabaseConfig config) {
-        return config.getUsername().toUpperCase();
+        return StringUtil.isBlank(config.getSchema())?config.getUsername().toUpperCase():config.getSchema().toUpperCase();
     }
 }

dbsyncer-web/src/main/resources/public/connector/addOracle.html

@@ -23,12 +23,16 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="col-sm-2 control-label">主键 <i class="fa fa-question-circle fa_gray" aria-hidden="true" title="如果使用的表没有主键，可以自定义主键（大小写必须一致，添加表映射关系时，主键不能为空）。"></i></label>
-        <div class="col-sm-4">
-            <input class="form-control" name="primaryKey" type="text" maxlength="32" placeholder="ID"
-                   th:value="${connector?.config?.primaryKey}"/>
+        <label class="col-sm-2 control-label">Schema</label>
+        <div class="col-sm-4 ">
+            <input class="form-control" name="schema" type="text" maxlength="32"
+                   th:value="${connector?.config?.schema}"/>
         </div>
-        <div class="col-sm-6"></div>
+<!--        <label class="col-sm-2 control-label">主键 <i class="fa fa-question-circle fa_gray" aria-hidden="true" title="如果使用的表没有主键，可以自定义主键（大小写必须一致，添加表映射关系时，主键不能为空）。"></i></label>-->
+<!--        <div class="col-sm-4">-->
+<!--            <input class="form-control" name="primaryKey" type="text" maxlength="32" placeholder="ID"-->
+<!--                   th:value="${connector?.config?.primaryKey}"/>-->
+<!--        </div>-->
     </div>
     <div class="form-group">
         <label class="col-sm-2 control-label">驱动 </label>