killbill-aplcache

ddl: switch away from char When CHAR values are stored, they

7/15/2015 2:20:39 PM

Details

diff --git a/account/src/main/resources/org/killbill/billing/account/ddl.sql b/account/src/main/resources/org/killbill/billing/account/ddl.sql
index a0848f4..50227ce 100644
--- a/account/src/main/resources/org/killbill/billing/account/ddl.sql
+++ b/account/src/main/resources/org/killbill/billing/account/ddl.sql
@@ -3,14 +3,14 @@
 DROP TABLE IF EXISTS accounts;
 CREATE TABLE accounts (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     external_key varchar(128) NULL,
     email varchar(128) DEFAULT NULL,
     name varchar(100) DEFAULT NULL,
     first_name_length int DEFAULT NULL,
-    currency char(3) DEFAULT NULL,
+    currency varchar(3) DEFAULT NULL,
     billing_cycle_day_local int DEFAULT NULL,
-    payment_method_id char(36) DEFAULT NULL,
+    payment_method_id varchar(36) DEFAULT NULL,
     time_zone varchar(50) DEFAULT NULL,
     locale varchar(5) DEFAULT NULL,
     address1 varchar(100) DEFAULT NULL,
@@ -37,15 +37,15 @@ CREATE INDEX accounts_tenant_record_id ON accounts(tenant_record_id);
 DROP TABLE IF EXISTS account_history;
 CREATE TABLE account_history (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     target_record_id bigint /*! unsigned */ not null,
     external_key varchar(128) NULL,
     email varchar(128) DEFAULT NULL,
     name varchar(100) DEFAULT NULL,
     first_name_length int DEFAULT NULL,
-    currency char(3) DEFAULT NULL,
+    currency varchar(3) DEFAULT NULL,
     billing_cycle_day_local int DEFAULT NULL,
-    payment_method_id char(36) DEFAULT NULL,
+    payment_method_id varchar(36) DEFAULT NULL,
     time_zone varchar(50) DEFAULT NULL,
     locale varchar(5) DEFAULT NULL,
     address1 varchar(100) DEFAULT NULL,
@@ -58,7 +58,7 @@ CREATE TABLE account_history (
     phone varchar(25) DEFAULT NULL,
     migrated boolean default false,
     is_notified_for_invoices boolean NOT NULL,
-    change_type char(6) NOT NULL,
+    change_type varchar(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -72,8 +72,8 @@ CREATE INDEX account_history_tenant_record_id ON account_history(tenant_record_i
 DROP TABLE IF EXISTS account_emails;
 CREATE TABLE account_emails (
     record_id serial unique,
-    id char(36) NOT NULL,
-    account_id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
     email varchar(128) NOT NULL,
     is_active boolean default true,
     created_by varchar(50) NOT NULL,
@@ -91,12 +91,12 @@ CREATE INDEX account_emails_tenant_account_record_id ON account_emails(tenant_re
 DROP TABLE IF EXISTS account_email_history;
 CREATE TABLE account_email_history (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     target_record_id bigint /*! unsigned */ not null,
-    account_id char(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
     email varchar(128) NOT NULL,
     is_active boolean default true,
-    change_type char(6) NOT NULL,
+    change_type varchar(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
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 36d7721..64e4678 100644
--- a/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
+++ b/beatrix/src/main/resources/org/killbill/billing/beatrix/ddl.sql
@@ -5,10 +5,10 @@ CREATE TABLE bus_ext_events (
     record_id serial unique,
     class_name varchar(128) NOT NULL,
     event_json varchar(2048) NOT NULL,
-    user_token char(36),
+    user_token varchar(36),
     created_date datetime NOT NULL,
-    creating_owner char(50) NOT NULL,
-    processing_owner char(50) DEFAULT NULL,
+    creating_owner varchar(50) NOT NULL,
+    processing_owner varchar(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
     error_count int /*! unsigned */ DEFAULT 0,
@@ -24,10 +24,10 @@ CREATE TABLE bus_ext_events_history (
     record_id serial unique,
     class_name varchar(128) NOT NULL,
     event_json varchar(2048) NOT NULL,
-    user_token char(36),
+    user_token varchar(36),
     created_date datetime NOT NULL,
-    creating_owner char(50) NOT NULL,
-    processing_owner char(50) DEFAULT NULL,
+    creating_owner varchar(50) NOT NULL,
+    processing_owner varchar(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
     error_count int /*! unsigned */ DEFAULT 0,
diff --git a/catalog/src/main/resources/org/killbill/billing/catalog/ddl.sql b/catalog/src/main/resources/org/killbill/billing/catalog/ddl.sql
index 622c321..cb443fb 100644
--- a/catalog/src/main/resources/org/killbill/billing/catalog/ddl.sql
+++ b/catalog/src/main/resources/org/killbill/billing/catalog/ddl.sql
@@ -18,7 +18,7 @@ DROP TABLE IF EXISTS catalog_override_phase_definition;
 CREATE TABLE catalog_override_phase_definition (
     record_id serial unique,
     parent_phase_name varchar(255) NOT NULL,
-    currency char(3) NOT NULL,
+    currency varchar(3) NOT NULL,
     fixed_price numeric(15,9) NULL,
     recurring_price numeric(15,9) NULL,
     effective_date datetime NOT NULL,
diff --git a/entitlement/src/main/resources/org/killbill/billing/entitlement/ddl.sql b/entitlement/src/main/resources/org/killbill/billing/entitlement/ddl.sql
index 259c92e..a122b32 100644
--- a/entitlement/src/main/resources/org/killbill/billing/entitlement/ddl.sql
+++ b/entitlement/src/main/resources/org/killbill/billing/entitlement/ddl.sql
@@ -3,8 +3,8 @@
 DROP TABLE IF EXISTS blocking_states;
 CREATE TABLE blocking_states (
     record_id serial unique,
-    id char(36) NOT NULL,
-    blockable_id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
+    blockable_id varchar(36) NOT NULL,
     type varchar(20) NOT NULL,
     state varchar(50) NOT NULL,
     service varchar(20) NOT NULL,
diff --git a/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql b/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
index 9e895a5..f8b1375 100644
--- a/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
+++ b/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
@@ -3,12 +3,12 @@
 DROP TABLE IF EXISTS invoice_items;
 CREATE TABLE invoice_items (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     type varchar(24) NOT NULL,
-    invoice_id char(36) NOT NULL,
-    account_id char(36) NOT NULL,
-    bundle_id char(36),
-    subscription_id char(36),
+    invoice_id varchar(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
+    bundle_id varchar(36),
+    subscription_id varchar(36),
     description varchar(255),
     plan_name varchar(50),
     phase_name varchar(50),
@@ -17,8 +17,8 @@ CREATE TABLE invoice_items (
     end_date date,
     amount numeric(15,9) NOT NULL,
     rate numeric(15,9) NULL,
-    currency char(3) NOT NULL,
-    linked_item_id char(36),
+    currency varchar(3) NOT NULL,
+    linked_item_id varchar(36),
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     account_record_id bigint /*! unsigned */ not null,
@@ -34,11 +34,11 @@ CREATE INDEX invoice_items_tenant_account_record_id ON invoice_items(tenant_reco
 DROP TABLE IF EXISTS invoices;
 CREATE TABLE invoices (
     record_id serial unique,
-    id char(36) NOT NULL,
-    account_id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
     invoice_date date NOT NULL,
     target_date date NOT NULL,
-    currency char(3) NOT NULL,
+    currency varchar(3) NOT NULL,
     migrated bool NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
@@ -53,16 +53,16 @@ CREATE INDEX invoices_tenant_account_record_id ON invoices(tenant_record_id, acc
 DROP TABLE IF EXISTS invoice_payments;
 CREATE TABLE invoice_payments (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     type varchar(24) NOT NULL,
-    invoice_id char(36) NOT NULL,
-    payment_id char(36),
+    invoice_id varchar(36) NOT NULL,
+    payment_id varchar(36),
     payment_date datetime NOT NULL,
     amount numeric(15,9) NOT NULL,
-    currency char(3) NOT NULL,
-    processed_currency char(3) NOT NULL,
+    currency varchar(3) NOT NULL,
+    processed_currency varchar(3) NOT NULL,
     payment_cookie_id varchar(255) DEFAULT NULL,
-    linked_invoice_payment_id char(36) DEFAULT NULL,
+    linked_invoice_payment_id varchar(36) DEFAULT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     account_record_id bigint /*! unsigned */ not null,
diff --git a/payment/src/main/resources/org/killbill/billing/payment/ddl.sql b/payment/src/main/resources/org/killbill/billing/payment/ddl.sql
index e240187..98b3c0a 100644
--- a/payment/src/main/resources/org/killbill/billing/payment/ddl.sql
+++ b/payment/src/main/resources/org/killbill/billing/payment/ddl.sql
@@ -3,16 +3,16 @@
 DROP TABLE IF EXISTS payment_attempts;
 CREATE TABLE payment_attempts (
     record_id serial unique,
-    id char(36) NOT NULL,
-    account_id char(36) NOT NULL,
-    payment_method_id char(36) DEFAULT NULL,
-    payment_external_key char(128) NOT NULL,
-    transaction_id char(36),
-    transaction_external_key char(128) NOT NULL,
+    id varchar(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
+    payment_method_id varchar(36) DEFAULT NULL,
+    payment_external_key varchar(128) NOT NULL,
+    transaction_id varchar(36),
+    transaction_external_key varchar(128) NOT NULL,
     transaction_type varchar(32) NOT NULL,
     state_name varchar(32) NOT NULL,
     amount numeric(15,9),
-    currency char(3),
+    currency varchar(3),
     plugin_name varchar(1024) NOT NULL,
     plugin_properties mediumblob,
     created_by varchar(50) NOT NULL,
@@ -33,20 +33,20 @@ CREATE INDEX payment_attempts_tenant_account_record_id ON payment_attempts(tenan
 DROP TABLE IF EXISTS payment_attempt_history;
 CREATE TABLE payment_attempt_history (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     target_record_id bigint /*! unsigned */ not null,
-    account_id char(36) NOT NULL,
-    payment_method_id char(36) DEFAULT NULL,
-    payment_external_key char(128) NOT NULL,
-    transaction_id char(36),
-    transaction_external_key char(128) NOT NULL,
+    account_id varchar(36) NOT NULL,
+    payment_method_id varchar(36) DEFAULT NULL,
+    payment_external_key varchar(128) NOT NULL,
+    transaction_id varchar(36),
+    transaction_external_key varchar(128) NOT NULL,
     transaction_type varchar(32) NOT NULL,
     state_name varchar(32) NOT NULL,
     amount numeric(15,9),
-    currency char(3),
+    currency varchar(3),
     plugin_name varchar(1024) NOT NULL,
     plugin_properties mediumblob,
-    change_type char(6) NOT NULL,
+    change_type varchar(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -61,9 +61,9 @@ CREATE INDEX payment_attempt_history_tenant_account_record_id ON payment_attempt
 DROP TABLE IF EXISTS payment_methods;
 CREATE TABLE payment_methods (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     external_key varchar(255) NOT NULL,
-    account_id char(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
     plugin_name varchar(50) NOT NULL,
     is_active boolean default true,
     created_by varchar(50) NOT NULL,
@@ -83,13 +83,13 @@ CREATE INDEX payment_methods_tenant_account_record_id ON payment_methods(tenant_
 DROP TABLE IF EXISTS payment_method_history;
 CREATE TABLE payment_method_history (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     external_key varchar(255) NOT NULL,
     target_record_id bigint /*! unsigned */ not null,
-    account_id char(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
     plugin_name varchar(50) NOT NULL,
     is_active boolean default true,
-    change_type char(6) NOT NULL,
+    change_type varchar(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -105,9 +105,9 @@ CREATE INDEX payment_method_history_tenant_account_record_id ON payment_method_h
 DROP TABLE IF EXISTS payments;
 CREATE TABLE payments (
     record_id serial unique,
-    id char(36) NOT NULL,
-    account_id char(36) NOT NULL,
-    payment_method_id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
+    payment_method_id varchar(36) NOT NULL,
     external_key varchar(255) NOT NULL,
     state_name varchar(64) DEFAULT NULL,
     last_success_state_name varchar(64) DEFAULT NULL,
@@ -128,14 +128,14 @@ CREATE INDEX payments_tenant_account_record_id ON payments(tenant_record_id, acc
 DROP TABLE IF EXISTS payment_history;
 CREATE TABLE payment_history (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     target_record_id bigint /*! unsigned */ not null,
-    account_id char(36) NOT NULL,
-    payment_method_id char(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
+    payment_method_id varchar(36) NOT NULL,
     external_key varchar(255) NOT NULL,
     state_name varchar(64) DEFAULT NULL,
     last_success_state_name varchar(64) DEFAULT NULL,
-    change_type char(6) NOT NULL,
+    change_type varchar(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -151,17 +151,17 @@ CREATE INDEX payment_history_tenant_account_record_id ON payment_history(tenant_
 DROP TABLE IF EXISTS payment_transactions;
 CREATE TABLE payment_transactions (
     record_id serial unique,
-    id char(36) NOT NULL,
-    attempt_id char(36) DEFAULT NULL,
+    id varchar(36) NOT NULL,
+    attempt_id varchar(36) DEFAULT NULL,
     transaction_external_key varchar(255) NOT NULL,
     transaction_type varchar(32) NOT NULL,
     effective_date datetime NOT NULL,
     transaction_status varchar(50) NOT NULL,
     amount numeric(15,9),
-    currency char(3),
+    currency varchar(3),
     processed_amount numeric(15,9),
-    processed_currency char(3),
-    payment_id char(36) NOT NULL,
+    processed_currency varchar(3),
+    payment_id varchar(36) NOT NULL,
     gateway_error_code varchar(32),
     gateway_error_msg varchar(256),
     created_by varchar(50) NOT NULL,
@@ -181,21 +181,21 @@ CREATE INDEX transactions_tenant_account_record_id ON payment_transactions(tenan
 DROP TABLE IF EXISTS payment_transaction_history;
 CREATE TABLE payment_transaction_history (
     record_id serial unique,
-    id char(36) NOT NULL,
-    attempt_id char(36) DEFAULT NULL,
+    id varchar(36) NOT NULL,
+    attempt_id varchar(36) DEFAULT NULL,
     transaction_external_key varchar(255) NOT NULL,
     target_record_id bigint /*! unsigned */ not null,
     transaction_type varchar(32) NOT NULL,
     effective_date datetime NOT NULL,
     transaction_status varchar(50) NOT NULL,
     amount numeric(15,9),
-    currency char(3),
+    currency varchar(3),
     processed_amount numeric(15,9),
-    processed_currency char(3),
-    payment_id char(36) NOT NULL,
+    processed_currency varchar(3),
+    payment_id varchar(36) NOT NULL,
     gateway_error_code varchar(32),
     gateway_error_msg varchar(256),
-    change_type char(6) NOT NULL,
+    change_type varchar(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -212,15 +212,15 @@ CREATE INDEX transaction_history_tenant_account_record_id ON payment_transaction
 DROP TABLE IF EXISTS _invoice_payment_control_plugin_auto_pay_off;
 CREATE TABLE _invoice_payment_control_plugin_auto_pay_off (
     record_id serial unique,
-    attempt_id char(36) NOT NULL,
+    attempt_id varchar(36) NOT NULL,
     payment_external_key varchar(255) NOT NULL,
     transaction_external_key varchar(255) NOT NULL,
-    account_id char(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
     plugin_name varchar(50) NOT NULL,
-    payment_id char(36),
-    payment_method_id char(36) NOT NULL,
+    payment_id varchar(36),
+    payment_method_id varchar(36) NOT NULL,
     amount numeric(15,9),
-    currency char(3),
+    currency varchar(3),
     is_active boolean default true,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
diff --git a/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql b/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
index cfb7f50..30137f4 100644
--- a/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
+++ b/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
@@ -3,12 +3,12 @@
 DROP TABLE IF EXISTS subscription_events;
 CREATE TABLE subscription_events (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     event_type varchar(9) NOT NULL,
     user_type varchar(25) DEFAULT NULL,
     requested_date datetime NOT NULL,
     effective_date datetime NOT NULL,
-    subscription_id char(36) NOT NULL,
+    subscription_id varchar(36) NOT NULL,
     plan_name varchar(64) DEFAULT NULL,
     phase_name varchar(128) DEFAULT NULL,
     price_list_name varchar(64) DEFAULT NULL,
@@ -30,8 +30,8 @@ CREATE INDEX subscription_events_tenant_account_record_id ON subscription_events
 DROP TABLE IF EXISTS subscriptions;
 CREATE TABLE subscriptions (
     record_id serial unique,
-    id char(36) NOT NULL,
-    bundle_id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
+    bundle_id varchar(36) NOT NULL,
     category varchar(32) NOT NULL,
     start_date datetime NOT NULL,
     bundle_start_date datetime NOT NULL,
@@ -52,9 +52,9 @@ CREATE INDEX subscriptions_tenant_account_record_id ON subscriptions(tenant_reco
 DROP TABLE IF EXISTS bundles;
 CREATE TABLE bundles (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     external_key varchar(64) NOT NULL,
-    account_id char(36) NOT NULL,
+    account_id varchar(36) NOT NULL,
     last_sys_update_date datetime,
     original_created_date datetime NOT NULL,
     created_by varchar(50) NOT NULL,
diff --git a/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql b/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
index cba0b46..15d407b 100644
--- a/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
+++ b/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
@@ -3,7 +3,7 @@
 DROP TABLE IF EXISTS tenants;
 CREATE TABLE tenants (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     external_key varchar(128) NULL,
     api_key varchar(128) NULL,
     api_secret varchar(128) NULL,
@@ -21,7 +21,7 @@ CREATE UNIQUE INDEX tenants_api_key ON tenants(api_key);
 DROP TABLE IF EXISTS tenant_kvs;
 CREATE TABLE tenant_kvs (
    record_id serial unique,
-   id char(36) NOT NULL,
+   id varchar(36) NOT NULL,
    tenant_record_id bigint /*! unsigned */ not null default 0,
    tenant_key varchar(255) NOT NULL,
    tenant_value mediumtext NOT NULL,
@@ -38,12 +38,12 @@ CREATE INDEX tenant_kvs_key ON tenant_kvs(tenant_key);
 DROP TABLE IF EXISTS tenant_broadcasts;
 CREATE TABLE tenant_broadcasts (
    record_id serial unique,
-   id char(36) NOT NULL,
+   id varchar(36) NOT NULL,
    target_record_id bigint /*! unsigned */ not null,
    target_table_name varchar(50) NOT NULL,
    tenant_record_id bigint /*! unsigned */ not null default 0,
    type varchar(64) NOT NULL,
-   user_token char(36),
+   user_token varchar(36),
    created_date datetime NOT NULL,
    created_by varchar(50) NOT NULL,
    updated_date datetime DEFAULT NULL,
diff --git a/usage/src/main/resources/org/killbill/billing/usage/ddl.sql b/usage/src/main/resources/org/killbill/billing/usage/ddl.sql
index 30541f6..9415162 100644
--- a/usage/src/main/resources/org/killbill/billing/usage/ddl.sql
+++ b/usage/src/main/resources/org/killbill/billing/usage/ddl.sql
@@ -3,8 +3,8 @@
 DROP TABLE IF EXISTS rolled_up_usage;
 CREATE TABLE rolled_up_usage (
     record_id serial unique,
-    id char(36) NOT NULL,
-    subscription_id char(36),
+    id varchar(36) NOT NULL,
+    subscription_id varchar(36),
     unit_type varchar(50),
     record_date date NOT NULL,
     amount bigint NOT NULL,
diff --git a/util/src/main/resources/cleanAccount.sql b/util/src/main/resources/cleanAccount.sql
index cc74695..6abade9 100644
--- a/util/src/main/resources/cleanAccount.sql
+++ b/util/src/main/resources/cleanAccount.sql
@@ -1,6 +1,6 @@
 drop procedure if exists cleanAccount;
 DELIMITER //
-CREATE PROCEDURE cleanAccount(p_account_key char(36))
+CREATE PROCEDURE cleanAccount(p_account_key varchar(36))
 BEGIN
 
     DECLARE v_account_record_id bigint /*! unsigned */;
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 cdd315e..45547ec 100644
--- a/util/src/main/resources/org/killbill/billing/util/ddl.sql
+++ b/util/src/main/resources/org/killbill/billing/util/ddl.sql
@@ -3,8 +3,8 @@
 DROP TABLE IF EXISTS custom_fields;
 CREATE TABLE custom_fields (
     record_id serial unique,
-    id char(36) NOT NULL,
-    object_id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
+    object_id varchar(36) NOT NULL,
     object_type varchar(30) NOT NULL,
     is_active boolean default true,
     field_name varchar(30) NOT NULL,
@@ -24,14 +24,14 @@ CREATE INDEX custom_fields_tenant_account_record_id ON custom_fields(tenant_reco
 DROP TABLE IF EXISTS custom_field_history;
 CREATE TABLE custom_field_history (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     target_record_id bigint /*! unsigned */ not null,
-    object_id char(36) NOT NULL,
+    object_id varchar(36) NOT NULL,
     object_type varchar(30) NOT NULL,
     is_active boolean default true,
     field_name varchar(30),
     field_value varchar(255),
-    change_type char(6) NOT NULL,
+    change_type varchar(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -47,7 +47,7 @@ CREATE INDEX custom_field_history_tenant_account_record_id ON custom_field_histo
 DROP TABLE IF EXISTS tag_definitions;
 CREATE TABLE tag_definitions (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     name varchar(20) NOT NULL,
     description varchar(200) NOT NULL,
     is_active boolean default true,
@@ -64,12 +64,12 @@ CREATE INDEX tag_definitions_tenant_record_id ON tag_definitions(tenant_record_i
 DROP TABLE IF EXISTS tag_definition_history;
 CREATE TABLE tag_definition_history (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     target_record_id bigint /*! unsigned */ not null,
     name varchar(30) NOT NULL,
     description varchar(200),
     is_active boolean default true,
-    change_type char(6) NOT NULL,
+    change_type varchar(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -87,9 +87,9 @@ CREATE INDEX tag_definition_history_tenant_record_id ON tag_definition_history(t
 DROP TABLE IF EXISTS tags;
 CREATE TABLE tags (
     record_id serial unique,
-    id char(36) NOT NULL,
-    tag_definition_id char(36) NOT NULL,
-    object_id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
+    tag_definition_id varchar(36) NOT NULL,
+    object_id varchar(36) NOT NULL,
     object_type varchar(30) NOT NULL,
     is_active boolean default true,
     created_by varchar(50) NOT NULL,
@@ -107,13 +107,13 @@ CREATE INDEX tags_tenant_account_record_id ON tags(tenant_record_id, account_rec
 DROP TABLE IF EXISTS tag_history;
 CREATE TABLE tag_history (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     target_record_id bigint /*! unsigned */ not null,
-    object_id char(36) NOT NULL,
+    object_id varchar(36) NOT NULL,
     object_type varchar(30) NOT NULL,
-    tag_definition_id char(36) NOT NULL,
+    tag_definition_id varchar(36) NOT NULL,
     is_active boolean default true,
-    change_type char(6) NOT NULL,
+    change_type varchar(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -129,15 +129,15 @@ CREATE INDEX tag_history_tenant_account_record_id ON tag_history(tenant_record_i
 DROP TABLE IF EXISTS audit_log;
 CREATE TABLE audit_log (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     target_record_id bigint /*! unsigned */ not null,
     table_name varchar(50) NOT NULL,
-    change_type char(6) NOT NULL,
+    change_type varchar(6) NOT NULL,
     created_date datetime NOT NULL,
     created_by varchar(50) NOT NULL,
     reason_code varchar(255) DEFAULT NULL,
     comments varchar(255) DEFAULT NULL,
-    user_token char(36),
+    user_token varchar(36),
     account_record_id bigint /*! unsigned */ not null,
     tenant_record_id bigint /*! unsigned */ not null default 0,
     PRIMARY KEY(record_id)
@@ -154,18 +154,18 @@ CREATE TABLE notifications (
     record_id serial unique,
     class_name varchar(256) NOT NULL,
     event_json varchar(2048) NOT NULL,
-    user_token char(36),
+    user_token varchar(36),
     created_date datetime NOT NULL,
-    creating_owner char(50) NOT NULL,
-    processing_owner char(50) DEFAULT NULL,
+    creating_owner varchar(50) NOT NULL,
+    processing_owner varchar(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
     error_count int /*! unsigned */ DEFAULT 0,
     search_key1 bigint /*! unsigned */ not null,
     search_key2 bigint /*! unsigned */ not null default 0,
-    queue_name char(64) NOT NULL,
+    queue_name varchar(64) NOT NULL,
     effective_date datetime NOT NULL,
-    future_user_token char(36),
+    future_user_token varchar(36),
     PRIMARY KEY(record_id)
 ) /*! CHARACTER SET utf8 COLLATE utf8_bin */;
 CREATE INDEX idx_comp_where ON notifications (effective_date, processing_state, processing_owner, processing_available_date);
@@ -178,18 +178,18 @@ CREATE TABLE notifications_history (
     record_id serial unique,
     class_name varchar(256) NOT NULL,
     event_json varchar(2048) NOT NULL,
-    user_token char(36),
+    user_token varchar(36),
     created_date datetime NOT NULL,
-    creating_owner char(50) NOT NULL,
-    processing_owner char(50) DEFAULT NULL,
+    creating_owner varchar(50) NOT NULL,
+    processing_owner varchar(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
     error_count int /*! unsigned */ DEFAULT 0,
     search_key1 bigint /*! unsigned */ not null,
     search_key2 bigint /*! unsigned */ not null default 0,
-    queue_name char(64) NOT NULL,
+    queue_name varchar(64) NOT NULL,
     effective_date datetime NOT NULL,
-    future_user_token char(36),
+    future_user_token varchar(36),
     PRIMARY KEY(record_id)
 ) /*! CHARACTER SET utf8 COLLATE utf8_bin */;
 
@@ -198,10 +198,10 @@ CREATE TABLE bus_events (
     record_id serial unique,
     class_name varchar(128) NOT NULL,
     event_json varchar(2048) NOT NULL,
-    user_token char(36),
+    user_token varchar(36),
     created_date datetime NOT NULL,
-    creating_owner char(50) NOT NULL,
-    processing_owner char(50) DEFAULT NULL,
+    creating_owner varchar(50) NOT NULL,
+    processing_owner varchar(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
     error_count int /*! unsigned */ DEFAULT 0,
@@ -217,10 +217,10 @@ CREATE TABLE bus_events_history (
     record_id serial unique,
     class_name varchar(128) NOT NULL,
     event_json varchar(2048) NOT NULL,
-    user_token char(36),
+    user_token varchar(36),
     created_date datetime NOT NULL,
-    creating_owner char(50) NOT NULL,
-    processing_owner char(50) DEFAULT NULL,
+    creating_owner varchar(50) NOT NULL,
+    processing_owner varchar(50) DEFAULT NULL,
     processing_available_date datetime DEFAULT NULL,
     processing_state varchar(14) DEFAULT 'AVAILABLE',
     error_count int /*! unsigned */ DEFAULT 0,
diff --git a/util/src/test/java/org/killbill/billing/DBTestingHelper.java b/util/src/test/java/org/killbill/billing/DBTestingHelper.java
index 59f0f44..a7a0e80 100644
--- a/util/src/test/java/org/killbill/billing/DBTestingHelper.java
+++ b/util/src/test/java/org/killbill/billing/DBTestingHelper.java
@@ -60,14 +60,14 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
         instance.executeScript("drop table if exists accounts;" +
                                "CREATE TABLE accounts (\n" +
                                "    record_id serial unique,\n" +
-                               "    id char(36) NOT NULL,\n" +
+                               "    id varchar(36) NOT NULL,\n" +
                                "    external_key varchar(128) NULL,\n" +
                                "    email varchar(128) NOT NULL,\n" +
                                "    name varchar(100) NOT NULL,\n" +
                                "    first_name_length int NOT NULL,\n" +
-                               "    currency char(3) DEFAULT NULL,\n" +
+                               "    currency varchar(3) DEFAULT NULL,\n" +
                                "    billing_cycle_day_local int DEFAULT NULL,\n" +
-                               "    payment_method_id char(36) DEFAULT NULL,\n" +
+                               "    payment_method_id varchar(36) DEFAULT NULL,\n" +
                                "    time_zone varchar(50) DEFAULT NULL,\n" +
                                "    locale varchar(5) DEFAULT NULL,\n" +
                                "    address1 varchar(100) DEFAULT NULL,\n" +
@@ -90,7 +90,7 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
         instance.executeScript("DROP TABLE IF EXISTS tenants;\n" +
                                "CREATE TABLE tenants (\n" +
                                "    record_id serial unique,\n" +
-                               "    id char(36) NOT NULL,\n" +
+                               "    id varchar(36) NOT NULL,\n" +
                                "    external_key varchar(128) NULL,\n" +
                                "    api_key varchar(128) NULL,\n" +
                                "    api_secret varchar(128) NULL,\n" +
@@ -106,9 +106,9 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
         instance.executeScript("DROP TABLE IF EXISTS bundles;\n" +
                                "CREATE TABLE bundles (\n" +
                                "    record_id serial unique,\n" +
-                               "    id char(36) NOT NULL,\n" +
+                               "    id varchar(36) NOT NULL,\n" +
                                "    external_key varchar(64) NOT NULL,\n" +
-                               "    account_id char(36) NOT NULL,\n" +
+                               "    account_id varchar(36) NOT NULL,\n" +
                                "    last_sys_update_date datetime,\n" +
                                "    created_by varchar(50) NOT NULL,\n" +
                                "    created_date datetime NOT NULL,\n" +
@@ -121,8 +121,8 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
         instance.executeScript("DROP TABLE IF EXISTS subscriptions;\n" +
                                "CREATE TABLE subscriptions (\n" +
                                "    record_id serial unique,\n" +
-                               "    id char(36) NOT NULL,\n" +
-                               "    bundle_id char(36) NOT NULL,\n" +
+                               "    id varchar(36) NOT NULL,\n" +
+                               "    bundle_id varchar(36) NOT NULL,\n" +
                                "    category varchar(32) NOT NULL,\n" +
                                "    start_date datetime NOT NULL,\n" +
                                "    bundle_start_date datetime NOT NULL,\n" +
@@ -142,12 +142,12 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
         instance.executeScript("DROP TABLE IF EXISTS payments;\n" +
                                "CREATE TABLE payments (\n" +
                                "    record_id serial unique,\n" +
-                               "    id char(36) NOT NULL,\n" +
-                               "    account_id char(36) NOT NULL,\n" +
-                               "    invoice_id char(36) NOT NULL,\n" +
-                               "    payment_method_id char(36) NOT NULL,\n" +
+                               "    id varchar(36) NOT NULL,\n" +
+                               "    account_id varchar(36) NOT NULL,\n" +
+                               "    invoice_id varchar(36) NOT NULL,\n" +
+                               "    payment_method_id varchar(36) NOT NULL,\n" +
                                "    amount numeric(15,9),\n" +
-                               "    currency char(3),\n" +
+                               "    currency varchar(3),\n" +
                                "    effective_date datetime,\n" +
                                "    payment_status varchar(50),\n" +
                                "    created_by varchar(50) NOT NULL,\n" +
diff --git a/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java b/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
index 96a76e8..311c7d6 100644
--- a/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
+++ b/util/src/test/java/org/killbill/billing/util/callcontext/TestInternalCallContextFactory.java
@@ -42,11 +42,11 @@ public class TestInternalCallContextFactory extends UtilTestSuiteWithEmbeddedDB 
                 handle.execute("DROP TABLE IF EXISTS invoices;\n" +
                                "CREATE TABLE invoices (\n" +
                                "    record_id serial unique,\n" +
-                               "    id char(36) NOT NULL,\n" +
-                               "    account_id char(36) NOT NULL,\n" +
+                               "    id varchar(36) NOT NULL,\n" +
+                               "    account_id varchar(36) NOT NULL,\n" +
                                "    invoice_date date NOT NULL,\n" +
                                "    target_date date NOT NULL,\n" +
-                               "    currency char(3) NOT NULL,\n" +
+                               "    currency varchar(3) NOT NULL,\n" +
                                "    migrated bool NOT NULL,\n" +
                                "    created_by varchar(50) NOT NULL,\n" +
                                "    created_date datetime NOT NULL,\n" +
diff --git a/util/src/test/resources/org/killbill/billing/util/ddl_test.sql b/util/src/test/resources/org/killbill/billing/util/ddl_test.sql
index 9c2ae7b..6269d08 100644
--- a/util/src/test/resources/org/killbill/billing/util/ddl_test.sql
+++ b/util/src/test/resources/org/killbill/billing/util/ddl_test.sql
@@ -2,7 +2,7 @@
 
 DROP TABLE IF EXISTS dummy;
 CREATE TABLE dummy (
-    dummy_id char(36) NOT NULL,
+    dummy_id varchar(36) NOT NULL,
     value varchar(256) NOT NULL,
     PRIMARY KEY(dummy_id)
 );
@@ -10,7 +10,7 @@ CREATE TABLE dummy (
 DROP TABLE IF EXISTS dummy2;
 CREATE TABLE dummy2 (
     id serial unique,
-    dummy_id char(36) NOT NULL,
+    dummy_id varchar(36) NOT NULL,
     PRIMARY KEY(id)
 );
 
@@ -25,7 +25,7 @@ CREATE TABLE validation_test (
 DROP TABLE IF EXISTS kombucha;
 CREATE TABLE kombucha (
     record_id serial unique,
-    id char(36) NOT NULL,
+    id varchar(36) NOT NULL,
     tea varchar(50) NOT NULL,
     mushroom varchar(50) NOT NULL,
     sugar varchar(50) NOT NULL,