killbill-uncached

payment: remove collation specification in tables Be consistent …

12/14/2012 3:51:06 PM

with other ddl files which don't specify any collation (we
don't rely on it anyways).

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

Pierre-Alexandre Meyer

Commit: 463bdb7

Tree: d4a9037

Parents: 551d019

Changes

payment/src/main/resources/com/ning/billing/payment/ddl.sql 48(+24 -24)

Details

payment/src/main/resources/com/ning/billing/payment/ddl.sql 48(+24 -24)

diff --git a/payment/src/main/resources/com/ning/billing/payment/ddl.sql b/payment/src/main/resources/com/ning/billing/payment/ddl.sql
index fbc1279..155280b 100644
--- a/payment/src/main/resources/com/ning/billing/payment/ddl.sql
+++ b/payment/src/main/resources/com/ning/billing/payment/ddl.sql
@@ -4,9 +4,9 @@ DROP TABLE IF EXISTS payments;
 CREATE TABLE payments (
     record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
     id char(36) NOT NULL,
-    account_id char(36) COLLATE utf8_bin NOT NULL,
-    invoice_id char(36) COLLATE utf8_bin NOT NULL,
-    payment_method_id char(36) COLLATE utf8_bin NOT NULL,    
+    account_id char(36) NOT NULL,
+    invoice_id char(36) NOT NULL,
+    payment_method_id char(36) NOT NULL,
     amount numeric(10,4),
     currency char(3),    
     effective_date datetime,
@@ -20,7 +20,7 @@ CREATE TABLE payments (
     account_record_id int(11) unsigned default null,
     tenant_record_id int(11) unsigned default null,
     PRIMARY KEY (record_id)
-) DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+);
 CREATE UNIQUE INDEX payments_id ON payments(id);
 CREATE INDEX payments_inv ON payments(invoice_id);
 CREATE INDEX payments_accnt ON payments(account_id);
@@ -31,9 +31,9 @@ CREATE TABLE payment_history (
     record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
     id char(36) NOT NULL,
     target_record_id int(11) unsigned NOT NULL,
-    account_id char(36) COLLATE utf8_bin NOT NULL,
-    invoice_id char(36) COLLATE utf8_bin NOT NULL,
-    payment_method_id char(36) COLLATE utf8_bin NOT NULL,    
+    account_id char(36) NOT NULL,
+    invoice_id char(36) NOT NULL,
+    payment_method_id char(36) NOT NULL,
     amount numeric(10,4),
     currency char(3),    
     effective_date datetime,
@@ -48,7 +48,7 @@ CREATE TABLE payment_history (
     account_record_id int(11) unsigned default null,
     tenant_record_id int(11) unsigned default null,
     PRIMARY KEY(record_id)
-) DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+);
 CREATE INDEX payment_history_target_record_id ON payment_history(target_record_id);
 CREATE INDEX payment_history_tenant_account_record_id ON payment_history(tenant_record_id, account_record_id);
 
@@ -56,7 +56,7 @@ DROP TABLE IF EXISTS payment_attempts;
 CREATE TABLE payment_attempts (
     record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
     id char(36) NOT NULL,
-    payment_id char(36) COLLATE utf8_bin NOT NULL,
+    payment_id char(36) NOT NULL,
     gateway_error_code varchar(32),              
     gateway_error_msg varchar(256),
     processing_status varchar(50),
@@ -68,7 +68,7 @@ CREATE TABLE payment_attempts (
     account_record_id int(11) unsigned default null,
     tenant_record_id int(11) unsigned default null,
     PRIMARY KEY (record_id)
-) DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+);
 CREATE UNIQUE INDEX payment_attempts_id ON payment_attempts(id);
 CREATE INDEX payment_attempts_payment ON payment_attempts(payment_id);
 CREATE INDEX payment_attempts_tenant_account_record_id ON payment_attempts(tenant_record_id, account_record_id);
@@ -78,7 +78,7 @@ CREATE TABLE payment_attempt_history (
     record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
     id char(36) NOT NULL,
     target_record_id int(11) unsigned NOT NULL,
-    payment_id char(36) COLLATE utf8_bin NOT NULL,
+    payment_id char(36) NOT NULL,
     gateway_error_code varchar(32),              
     gateway_error_msg varchar(256),
     processing_status varchar(50),
@@ -91,7 +91,7 @@ CREATE TABLE payment_attempt_history (
     account_record_id int(11) unsigned default null,
     tenant_record_id int(11) unsigned default null,
     PRIMARY KEY(record_id)
-) DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+);
 CREATE INDEX payment_attempt_history_target_record_id ON payment_attempt_history(target_record_id);
 CREATE INDEX payment_attempt_history_tenant_account_record_id ON payment_attempt_history(tenant_record_id, account_record_id);
 
@@ -99,7 +99,7 @@ DROP TABLE IF EXISTS payment_methods;
 CREATE TABLE payment_methods (
     record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
     id char(36) NOT NULL,
-    account_id char(36) COLLATE utf8_bin NOT NULL,
+    account_id char(36) NOT NULL,
     plugin_name varchar(20) DEFAULT NULL,
     is_active bool DEFAULT true, 
     external_id varchar(64), 
@@ -110,7 +110,7 @@ CREATE TABLE payment_methods (
     account_record_id int(11) unsigned default null,
     tenant_record_id int(11) unsigned default null,
     PRIMARY KEY (record_id)
-) DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+);
 CREATE UNIQUE INDEX payment_methods_id ON payment_methods(id);
 CREATE INDEX payment_methods_active_accnt ON payment_methods(is_active, account_id);
 CREATE INDEX payment_methods_tenant_account_record_id ON payment_methods(tenant_record_id, account_record_id);
@@ -120,7 +120,7 @@ CREATE TABLE payment_method_history (
     record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
     id char(36) NOT NULL,
     target_record_id int(11) unsigned NOT NULL,
-    account_id char(36) COLLATE utf8_bin NOT NULL,
+    account_id char(36) NOT NULL,
     plugin_name varchar(20) DEFAULT NULL, 
     is_active bool DEFAULT true, 
     external_id varchar(64),                  
@@ -132,7 +132,7 @@ CREATE TABLE payment_method_history (
     account_record_id int(11) unsigned default null,
     tenant_record_id int(11) unsigned default null,
     PRIMARY KEY(record_id)
-) DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+);
 CREATE INDEX payment_method_history_target_record_id ON payment_method_history(target_record_id);
 CREATE INDEX payment_method_history_tenant_account_record_id ON payment_method_history(tenant_record_id, account_record_id);
 
@@ -140,10 +140,10 @@ DROP TABLE IF EXISTS refunds;
 CREATE TABLE refunds (
     record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
     id char(36) NOT NULL,
-    account_id char(36) COLLATE utf8_bin NOT NULL,
-    payment_id char(36) COLLATE utf8_bin NOT NULL,    
+    account_id char(36) NOT NULL,
+    payment_id char(36) NOT NULL,
     amount numeric(10,4),
-    currency char(3),   
+    currency char(3),
     is_adjusted tinyint(1),
     refund_status varchar(50), 
     created_by varchar(50) NOT NULL,
@@ -153,7 +153,7 @@ CREATE TABLE refunds (
     account_record_id int(11) unsigned default null,
     tenant_record_id int(11) unsigned default null,
     PRIMARY KEY (record_id)
-) DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+);
 CREATE UNIQUE INDEX refunds_id ON refunds(id);
 CREATE INDEX refunds_pay ON refunds(payment_id);
 CREATE INDEX refunds_accnt ON refunds(account_id);
@@ -164,10 +164,10 @@ CREATE TABLE refund_history (
     record_id int(11) unsigned NOT NULL AUTO_INCREMENT,
     id char(36) NOT NULL,
     target_record_id int(11) unsigned NOT NULL,
-    account_id char(36) COLLATE utf8_bin NOT NULL,
-    payment_id char(36) COLLATE utf8_bin NOT NULL,    
+    account_id char(36) NOT NULL,
+    payment_id char(36) NOT NULL,
     amount numeric(10,4),
-    currency char(3),   
+    currency char(3),
     is_adjusted tinyint(1),
     refund_status varchar(50), 
     change_type char(6) NOT NULL,
@@ -178,7 +178,7 @@ CREATE TABLE refund_history (
     account_record_id int(11) unsigned default null,
     tenant_record_id int(11) unsigned default null,
     PRIMARY KEY(record_id)
-) DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+);
 CREATE INDEX refund_history_target_record_id ON refund_history(target_record_id);
 CREATE INDEX refund_history_tenant_account_record_id ON refund_history(tenant_record_id, account_record_id);