You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2020/02/29 06:06:36 UTC

[activemq] branch activemq-5.15.x updated: [AMQ-7368] Add limitQuery in HSQL, MySQL and PostgreSQL JDBC adapters

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
     new 330b8e8  [AMQ-7368] Add limitQuery in HSQL, MySQL and PostgreSQL JDBC adapters
330b8e8 is described below

commit 330b8e8431f68d3c2f77b0d052a7b347543eb72b
Author: jbonofre <jb...@apache.org>
AuthorDate: Thu Feb 27 20:34:56 2020 +0100

    [AMQ-7368] Add limitQuery in HSQL, MySQL and PostgreSQL JDBC adapters
    
    (cherry picked from commit 61bf624c6dd5a999dc9dd1f900bffc6c4feb9fa1)
---
 .../org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java   | 5 +++++
 .../org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java    | 6 ++++++
 .../org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java   | 1 +
 .../apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java   | 6 ++++++
 4 files changed, 18 insertions(+)

diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java
index 12d480f..eaebf8b 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java
@@ -30,4 +30,9 @@ public class HsqldbJDBCAdapter extends BytesJDBCAdapter {
         super.setStatements(statements);
     }
 
+    @Override
+    public String limitQuery(String query) {
+        return query + " LIMIT " + getMaxRows();
+    }
+
 }
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java
index dd93846..8fb3d24 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/MySqlJDBCAdapter.java
@@ -96,4 +96,10 @@ public class MySqlJDBCAdapter extends DefaultJDBCAdapter {
     public void setTypeStatement(String typeStatement) {
         this.typeStatement = typeStatement;
     }
+
+    @Override
+    public String limitQuery(String query) {
+        return query + " LIMIT " + getMaxRows();
+    }
+
 }
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
index 373ba58..c1fdac1 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
@@ -48,4 +48,5 @@ public class OracleJDBCAdapter extends DefaultJDBCAdapter {
     public String limitQuery(String query) {
         return "SELECT * FROM (" + query + ") WHERE ROWNUM <= " + getMaxRows();
     }
+
 }
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java
index 7334059..40fe9d3 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java
@@ -54,4 +54,10 @@ public class PostgresqlJDBCAdapter extends BytesJDBCAdapter {
     public void setAcksPkName(String acksPkName) {
         this.acksPkName = acksPkName;
     }
+
+    @Override
+    public String limitQuery(String query) {
+        return query + " LIMIT " + getMaxRows();
+    }
+
 }