You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2016/09/22 10:22:19 UTC

nifi git commit: NIFI-2802 The implementation classes don't support orderByClause.

Repository: nifi
Updated Branches:
  refs/heads/master 5198e70d1 -> 77f8503e9


NIFI-2802 The implementation classes don't support orderByClause.

This closes #1044.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/77f8503e
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/77f8503e
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/77f8503e

Branch: refs/heads/master
Commit: 77f8503e98faa8d76c33756670e3d23bf189ef58
Parents: 5198e70
Author: Byunghwa Yun <co...@combineads.co.kr>
Authored: Thu Sep 22 19:00:16 2016 +0900
Committer: Pierre Villard <pi...@gmail.com>
Committed: Thu Sep 22 12:21:43 2016 +0200

----------------------------------------------------------------------
 .../nifi/processors/standard/db/impl/GenericDatabaseAdapter.java   | 2 +-
 .../nifi/processors/standard/db/impl/OracleDatabaseAdapter.java    | 2 +-
 .../nifi/processors/standard/db/impl/DerbyDatabaseAdapter.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/77f8503e/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/GenericDatabaseAdapter.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/GenericDatabaseAdapter.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/GenericDatabaseAdapter.java
index 5beae29..c48d2cd 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/GenericDatabaseAdapter.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/GenericDatabaseAdapter.java
@@ -48,7 +48,7 @@ public class GenericDatabaseAdapter implements DatabaseAdapter {
         }
         if (!StringUtils.isEmpty(orderByClause)) {
             query.append(" ORDER BY ");
-            query.append(whereClause);
+            query.append(orderByClause);
         }
         if (limit != null) {
             query.append(" LIMIT ");

http://git-wip-us.apache.org/repos/asf/nifi/blob/77f8503e/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/OracleDatabaseAdapter.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/OracleDatabaseAdapter.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/OracleDatabaseAdapter.java
index ffe54dc..d918400 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/OracleDatabaseAdapter.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/OracleDatabaseAdapter.java
@@ -62,7 +62,7 @@ public class OracleDatabaseAdapter implements DatabaseAdapter {
         }
         if (!StringUtils.isEmpty(orderByClause)) {
             query.append(" ORDER BY ");
-            query.append(whereClause);
+            query.append(orderByClause);
         }
         if (nestedSelect) {
             query.append(") a");

http://git-wip-us.apache.org/repos/asf/nifi/blob/77f8503e/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/DerbyDatabaseAdapter.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/DerbyDatabaseAdapter.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/DerbyDatabaseAdapter.java
index 1356959..7d6ab89 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/DerbyDatabaseAdapter.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/DerbyDatabaseAdapter.java
@@ -49,7 +49,7 @@ public class DerbyDatabaseAdapter implements DatabaseAdapter {
         }
         if (!StringUtils.isEmpty(orderByClause)) {
             query.append(" ORDER BY ");
-            query.append(whereClause);
+            query.append(orderByClause);
         }
         if (offset != null && offset > 0) {
             query.append(" OFFSET ");