killbill-memoizeit

Remove AUTO_INCREMENT from bus/notification history tables

9/16/2014 12:54:36 PM

stephane brossier

Commit: 97b111d

Tree: afe757b

Parents: eda4fbb

Changes

beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql 2(+1 -1)

profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcRealm.java 2(+1 -1)

util/src/main/resources/org/killbill/billing/util/ddl.sql 4(+2 -2)

Details

beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql 2(+1 -1)

diff --git a/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql b/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
index 2783fc6..f7811c7 100644
--- a/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
+++ b/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
@@ -21,7 +21,7 @@ CREATE INDEX bus_ext_events_tenant_account_record_id ON bus_ext_events(search_ke
 
 DROP TABLE IF EXISTS bus_ext_events_history;
 CREATE TABLE bus_ext_events_history (
-    record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
+    record_id int(11) unsigned NOT NULL,
     class_name varchar(128) NOT NULL,
     event_json varchar(2048) NOT NULL,
     user_token char(36),

profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcRealm.java 2(+1 -1)

diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcRealm.java b/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcRealm.java
index 1ff2198..5b0ead6 100644
--- a/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcRealm.java
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcRealm.java
@@ -74,7 +74,7 @@ public class KillbillJdbcRealm extends JdbcRealm {
 
     private void configureDataSource() {
         final DataSource realDataSource = new DataSourceProvider(config).get();
-        final DataSource dataSource = new ReferenceableDataSourceSpy<DataSource>(realDataSource, SHIRO_DATA_SOURCE_ID);
+        final DataSource dataSource = new ReferenceableDataSourceSpy(realDataSource, SHIRO_DATA_SOURCE_ID);
         setDataSource(dataSource);
     }
 }

util/src/main/resources/org/killbill/billing/util/ddl.sql 4(+2 -2)

diff --git a/util/src/main/resources/org/killbill/billing/util/ddl.sql b/util/src/main/resources/org/killbill/billing/util/ddl.sql
index 2704dc9..db53c9c 100644
--- a/util/src/main/resources/org/killbill/billing/util/ddl.sql
+++ b/util/src/main/resources/org/killbill/billing/util/ddl.sql
@@ -174,7 +174,7 @@ CREATE INDEX notifications_tenant_account_record_id ON notifications(search_key2
 
 DROP TABLE IF EXISTS notifications_history;
 CREATE TABLE notifications_history (
-    record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
+    record_id int(11) unsigned NOT NULL,
     class_name varchar(256) NOT NULL,
     event_json varchar(2048) NOT NULL,
     user_token char(36),
@@ -213,7 +213,7 @@ CREATE INDEX bus_events_tenant_account_record_id ON bus_events(search_key2, sear
 
 DROP TABLE IF EXISTS bus_events_history;
 CREATE TABLE bus_events_history (
-    record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
+    record_id int(11) unsigned NOT NULL,
     class_name varchar(128) NOT NULL,
     event_json varchar(2048) NOT NULL,
     user_token char(36),