[activemq] branch master updated: set name for primary key on create table

[jb...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 92da897  set name for primary key on create table
     new b977f8c  Merge pull request #232 from sturman/master
92da897 is described below

commit 92da897200351c55dd69b52f7e9007095fd46915
Author: Roman Isko <is...@gmail.com>
AuthorDate: Thu Mar 23 13:23:15 2017 +0200

    set name for primary key on create table
---
 .../src/main/java/org/apache/activemq/store/jdbc/Statements.java        | 2 +-
 .../org/apache/activemq/store/jdbc/adapter/TransactJDBCAdapter.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java
index 0fe6338..0be7d41 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java
@@ -106,7 +106,7 @@ public class Statements {
                     + ", SUB_DEST " + stringIdDataType 
                     + ", CLIENT_ID " + stringIdDataType + " NOT NULL" + ", SUB_NAME " + stringIdDataType
                     + " NOT NULL" + ", SELECTOR " + stringIdDataType + ", LAST_ACKED_ID " + sequenceDataType
-                    + ", PRIMARY KEY ( CONTAINER, CLIENT_ID, SUB_NAME))", 
+                    + ", CONSTRAINT PK_" + getDurableSubAcksTableName() + " PRIMARY KEY ( CONTAINER, CLIENT_ID, SUB_NAME))",
                 "ALTER TABLE " + getFullMessageTableName() + " ADD PRIORITY " + sequenceDataType,
                 "CREATE INDEX " + getFullMessageTableName() + "_PIDX ON " + getFullMessageTableName() + " (PRIORITY)",
                 "ALTER TABLE " + getFullMessageTableName() + " ADD XID " + stringIdDataType,
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/TransactJDBCAdapter.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/TransactJDBCAdapter.java
index 4187979..8672846 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/TransactJDBCAdapter.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/TransactJDBCAdapter.java
@@ -35,6 +35,7 @@ public class TransactJDBCAdapter extends ImageBasedJDBCAdaptor {
         }
 
         statements.setLockCreateStatement(lockCreateStatement);
+        statements.setDropAckPKAlterStatementEnd("DROP CONSTRAINT PK_" + statements.getDurableSubAcksTableName());
 
         super.setStatements(statements);
     }