[Addendum][Bug] [Seatunnel-web] Error when conditional column is not …

…used in SE (#239)
apache · Nov 7, 2024 · 53b5de8 · 53b5de8
1 parent d862b61
commit 53b5de8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/...unnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobInstanceServiceImpl.java b/...unnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobInstanceServiceImpl.java
@@ -103,10 +103,6 @@ public class JobInstanceServiceImpl extends SeatunnelBaseServiceImpl
 
     private static final String DAG_PARSING_MODE = "dag-parsing.mode";
 
-    private static final String WHERE_CONDITION = "where_condition";
-
-    private static final String QUERY = "query";
-
     @Resource private ConnectorDataSourceMapperConfig dataSourceMapperConfig;
 
     @Resource private IDatasourceService datasourceService;
@@ -237,7 +233,6 @@ public String generateJobConfig(
                                             businessMode,
                                             config,
                                             optionRule);
-                            mergeConfig = appendWhereClauseToQuery(mergeConfig);
                             sourceMap
                                     .get(task.getConnectorType())
                                     .add(filterEmptyValue(mergeConfig));
@@ -335,19 +330,6 @@ public String generateJobConfig(
         return JobUtils.replaceJobConfigPlaceholders(jobConfig, executeParam);
     }
 
-    private Config appendWhereClauseToQuery(Config mergeConfig) {
-        String where_condition = mergeConfig.getString(WHERE_CONDITION);
-        if (where_condition != null && !where_condition.isEmpty()) {
-            String query = mergeConfig.getString(QUERY);
-            String queryWithWhereClause = query + " " + where_condition;
-            mergeConfig =
-                    mergeConfig.withValue(
-                            QUERY, ConfigValueFactory.fromAnyRef(queryWithWhereClause));
-            mergeConfig = mergeConfig.withoutPath(WHERE_CONDITION);
-        }
-        return mergeConfig;
-    }
-
     @Override
     public JobExecutorRes getExecuteResource(@NonNull Long jobEngineId) {
         funcPermissionCheck(SeatunnelFuncPermissionKeyConstant.JOB_EXECUTOR_INSTANCE, 0);

diff --git a/...org/apache/seatunnel/app/thirdparty/datasource/impl/BaseJdbcDataSourceConfigSwitcher.java b/...org/apache/seatunnel/app/thirdparty/datasource/impl/BaseJdbcDataSourceConfigSwitcher.java
@@ -61,6 +61,8 @@ public abstract class BaseJdbcDataSourceConfigSwitcher extends AbstractDataSourc
     private static final String BASE_URL = "base-url";
     private static final String CATALOG_SCHEMA = "schema";
 
+    private static final String WHERE_CONDITION = "where_condition";
+
     private static final Option<String> DATABASE_SCHEMA =
             Options.key("database_schema")
                     .stringType()
@@ -138,6 +140,13 @@ public Config mergeDatasourceConfig(
 
                 String sql = tableFieldsToSql(tableFields, databaseName, tableName);
 
+                String where_condition = connectorConfig.getString(WHERE_CONDITION);
+
+                if (where_condition != null && !where_condition.isEmpty()) {
+                    sql = sql + " " + where_condition;
+                    connectorConfig = connectorConfig.withoutPath(WHERE_CONDITION);
+                }
+
                 connectorConfig =
                         connectorConfig.withValue(QUERY_KEY, ConfigValueFactory.fromAnyRef(sql));
             } else if (pluginType.equals(PluginType.SINK)) {