Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-5471: Push table aliasing to DatabaseAdapter impls 

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #2926.
This commit is contained in:
Matthew Burgess 2018-07-30 23:11:40 -04:00 committed by Pierre Villard
parent e97ae921f7
commit 9742dd2fac
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractDatabaseFetchProcessor.java
View File

@ -260,7 +260,7 @@ public abstract class AbstractDatabaseFetchProcessor extends AbstractSessionFact
if (StringUtils.isEmpty(sqlQuery)) {
query = dbAdapter.getSelectStatement(tableName, maxValueColumnNames, "1 = 0", null, null, null);
} else {
StringBuilder sbQuery = getWrappedQuery(sqlQuery, tableName);
StringBuilder sbQuery = getWrappedQuery(dbAdapter, sqlQuery, tableName);
sbQuery.append(" WHERE 1=0");
query = sbQuery.toString();
@ -312,8 +312,8 @@ public abstract class AbstractDatabaseFetchProcessor extends AbstractSessionFact
}
}
protected static StringBuilder getWrappedQuery(String sqlQuery, String tableName){
return new StringBuilder("SELECT * FROM (" + sqlQuery + ") AS " + tableName);
protected static StringBuilder getWrappedQuery(DatabaseAdapter dbAdaper, String sqlQuery, String tableName) {
return new StringBuilder("SELECT * FROM (" + sqlQuery + ") " + dbAdaper.getTableAliasClause(tableName));
}
protected static String getMaxValueFromRow(ResultSet resultSet,

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java
View File

@ -461,7 +461,7 @@ public class QueryDatabaseTable extends AbstractDatabaseFetchProcessor {
if (StringUtils.isEmpty(sqlQuery)) {
query = new StringBuilder(dbAdapter.getSelectStatement(tableName, columnNames, null, null, null, null));
} else {
query = getWrappedQuery(sqlQuery, tableName);
query = getWrappedQuery(dbAdapter, sqlQuery, tableName);
}
List<String> whereClauses = new ArrayList<>();

4
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/DatabaseAdapter.java
View File

@ -67,4 +67,8 @@ public interface DatabaseAdapter {
default String unwrapIdentifier(String identifier) {
return identifier == null ? null : identifier.replaceAll("\"", "");
}
default String getTableAliasClause(String tableName) {
return "AS " + tableName;
}
}

5
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
View File

@ -88,4 +88,9 @@ public class Oracle12DatabaseAdapter implements DatabaseAdapter {
return query.toString();
}
@Override
public String getTableAliasClause(String tableName) {
return tableName;
}
}

5
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/OracleDatabaseAdapter.java
View File

@ -102,4 +102,9 @@ public class OracleDatabaseAdapter implements DatabaseAdapter {
return query.toString();
}
@Override
public String getTableAliasClause(String tableName) {
return tableName;
}
}