Skip to content

[Fix][Engine] fix pg execute custom sql error #587

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

Merged
zixi0825 merged 1 commit into from
Jul 27, 2026
Merged

[Fix][Engine] fix pg execute custom sql error #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 11 additions & 2 deletions ...-config/src/main/java/io/datavines/engine/flink/config/BaseFlinkConfigurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,17 @@ protected List<SourceConfig> getSourceConfigs() throws DataVinesException {
if (tableArray.length == 1) {
metricInputParameter.put(TABLE, tableArray[0]);
} else {
metricInputParameter.put(DATABASE, tableArray[0]);
metricInputParameter.put(TABLE, tableArray[1]);
String connectorSchema = connectorParameter.getParameters().get(SCHEMA) != null ?
(String)connectorParameter.getParameters().get(SCHEMA) : null;
if (connectorSchema != null && connectorSchema.equals(tableArray[0])) {
// When the table name from SQL already includes the schema prefix
// (e.g., "schema.table"), and it matches the configured schema,
// treat it as schema.table, not database.table
metricInputParameter.put(TABLE, tableArray[1]);
} else {
metricInputParameter.put(DATABASE, tableArray[0]);
metricInputParameter.put(TABLE, tableArray[1]);
}
}

SourceConfig sourceConfig = new SourceConfig();
Expand Down
13 changes: 11 additions & 2 deletions ...-config/src/main/java/io/datavines/engine/local/config/BaseLocalConfigurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,17 @@ protected List<SourceConfig> getSourceConfigs() throws DataVinesException {
if (tableArray.length == 1) {
metricInputParameter.put(TABLE, tableArray[0]);
} else {
metricInputParameter.put(DATABASE, tableArray[0]);
metricInputParameter.put(TABLE, tableArray[1]);
String connectorSchema = connectorParameter.getParameters().get(SCHEMA) != null ?
(String)connectorParameter.getParameters().get(SCHEMA) : null;
if (connectorSchema != null && connectorSchema.equals(tableArray[0])) {
// When the table name from SQL already includes the schema prefix
// (e.g., "schema.table"), and it matches the configured schema,
// treat it as schema.table, not database.table
metricInputParameter.put(TABLE, tableArray[1]);
} else {
metricInputParameter.put(DATABASE, tableArray[0]);
metricInputParameter.put(TABLE, tableArray[1]);
}
}

Map<String, Object> connectorParameterMap = new HashMap<>(connectorParameter.getParameters());
Expand Down
13 changes: 11 additions & 2 deletions ...-config/src/main/java/io/datavines/engine/spark/config/BaseSparkConfigurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,17 @@ protected List<SourceConfig> getSourceConfigs() throws DataVinesException {
if (tableArray.length == 1) {
metricInputParameter.put(TABLE, tableArray[0]);
} else {
metricInputParameter.put(DATABASE, tableArray[0]);
metricInputParameter.put(TABLE, tableArray[1]);
String connectorSchema = connectorParameter.getParameters().get(SCHEMA) != null ?
(String)connectorParameter.getParameters().get(SCHEMA) : null;
if (connectorSchema != null && connectorSchema.equals(tableArray[0])) {
// When the table name from SQL already includes the schema prefix
// (e.g., "schema.table"), and it matches the configured schema,
// treat it as schema.table, not database.table
metricInputParameter.put(TABLE, tableArray[1]);
} else {
metricInputParameter.put(DATABASE, tableArray[0]);
metricInputParameter.put(TABLE, tableArray[1]);
}
}

SourceConfig sourceConfig = new SourceConfig();
Expand Down
7 changes: 6 additions & 1 deletion ...nes-engine-spark-core/src/main/java/io/datavines/engine/spark/jdbc/source/JdbcSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,12 @@ public Dataset<Row> getData(SparkRuntimeEnvironment env) {
}

DataFrameReader reader = new DataFrameReader(env.sparkSession());
return reader.jdbc(config.getString(URL), config.getString(TABLE), properties);
String table = config.getString(TABLE);
String schema = config.getString(SCHEMA);
if (!StringUtils.isEmptyOrNullStr(schema)) {
table = schema + "." + table;
}
return reader.jdbc(config.getString(URL), table, properties);
}

private Dataset<Row> hiveSourceData(SparkRuntimeEnvironment env) {
Expand Down
Loading