[Fix][Connector] Fix When SqlServer executes a job, the generated tab…

…le name does not include a schema. (#303)
datavane · Dec 5, 2023 · 71a26ef · 71a26ef
1 parent 2bbc315
commit 71a26ef
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/...s-connector/datavines-connector-api/src/main/java/io/datavines/connector/api/Dialect.java b/...s-connector/datavines-connector-api/src/main/java/io/datavines/connector/api/Dialect.java
@@ -89,7 +89,7 @@ default DataType getDataType(String jdbcType) {
     }
 
     default String quoteIdentifier(String entity) {
-        return "`" + entity + "`";
+        return entity;
     }
 
     default String getTableExistsQuery(String table) {

diff --git a/...s/datavines-connector-mysql/src/main/java/io/datavines/connector/plugin/MysqlDialect.java b/...s/datavines-connector-mysql/src/main/java/io/datavines/connector/plugin/MysqlDialect.java
@@ -43,4 +43,9 @@ public boolean invalidateItemCanOutputToSelf() {
     public boolean supportToBeErrorDataStorage() {
         return true;
     }
+
+    @Override
+    public String quoteIdentifier(String entity) {
+        return "`" + entity + "`";
+    }
 }
diff --git a/...nes-connector-sqlserver/src/main/java/io/datavines/connector/plugin/SqlServerDialect.java b/...nes-connector-sqlserver/src/main/java/io/datavines/connector/plugin/SqlServerDialect.java
@@ -47,4 +47,9 @@ public boolean invalidateItemCanOutputToSelf() {
     public boolean supportToBeErrorDataStorage() {
         return true;
     }
+
+    @Override
+    public String quoteIdentifier(String entity) {
+        return entity;
+    }
 }
diff --git a/...-config/src/main/java/io/datavines/engine/local/config/BaseLocalConfigurationBuilder.java b/...-config/src/main/java/io/datavines/engine/local/config/BaseLocalConfigurationBuilder.java
@@ -73,7 +73,9 @@ protected List<SourceConfig> getSourceConfigs() throws DataVinesException {
                     metricInputParameter.put(DATABASE_NAME,metricInputParameter.get(DATABASE));
                     metricInputParameter.put(TABLE_NAME,metricInputParameter.get(TABLE));
                     metricInputParameter.put(COLUMN_NAME,metricInputParameter.get(COLUMN));
-
+                    if (connectorParameter.getParameters().get(SCHEMA) != null) {
+                        metricInputParameter.put(SCHEMA, (String)connectorParameter.getParameters().get(SCHEMA));
+                    }
                     String table = connectorFactory.getDialect()
                             .getFullQualifiedTableName(metricInputParameter.get(DATABASE),metricInputParameter.get(SCHEMA),metricInputParameter.get(TABLE));
                     connectorParameterMap.put(TABLE, table);
@@ -90,9 +92,6 @@ protected List<SourceConfig> getSourceConfigs() throws DataVinesException {
                     metricInputParameter.putAll(connectorFactory.getDialect().getDialectKeyMap());
                     metricInputParameter.put(SRC_CONNECTOR_TYPE, connectorParameter.getType());
                     metricInputParameter.put(TABLE, table);
-                    if (connectorParameter.getParameters().get(SCHEMA) != null) {
-                        metricInputParameter.put(SCHEMA, (String)connectorParameter.getParameters().get(SCHEMA));
-                    }
 
                     boolean invalidateItemCanOutput = Boolean.parseBoolean(metricInputParameter.get(INVALIDATE_ITEM_CAN_OUTPUT));
                     invalidateItemCanOutput &= connectorFactory.getDialect().invalidateItemCanOutput();