From 92da897200351c55dd69b52f7e9007095fd46915 Mon Sep 17 00:00:00 2001 From: Roman Isko Date: Thu, 23 Mar 2017 13:23:15 +0200 Subject: [PATCH] set name for primary key on create table --- .../main/java/org/apache/activemq/store/jdbc/Statements.java | 2 +- .../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 0fe63386e3..0be7d4159c 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 41879792cf..8672846f53 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); }