Prosoft Git

killbill-aplcache

ddl: use true/false for boolean PostgreSQL doesn't support …

7/14/2015 1:08:12 PM
Pierre-Alexandre Meyer

Pierre-Alexandre Meyer

Commit: a628b39

Tree: 96be2f1

Parents: 8ab3550

Changes

account/src/main/resources/org/killbill/billing/account/ddl.sql 8(+4 -4)

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

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

payment/src/main/resources/org/killbill/billing/payment/ddl.sql 6(+3 -3)

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

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

util/src/main/resources/org/killbill/billing/util/ddl.sql 18(+9 -9)

util/src/test/java/org/killbill/billing/DBTestingHelper.java 2(+1 -1)

Details

account/src/main/resources/org/killbill/billing/account/ddl.sql 8(+4 -4) 

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 bfb4ce1..a0848f4 100644
--- a/account/src/main/resources/org/killbill/billing/account/ddl.sql
+++ b/account/src/main/resources/org/killbill/billing/account/ddl.sql
@@ -21,7 +21,7 @@ CREATE TABLE accounts (
     country varchar(50) DEFAULT NULL,
     postal_code varchar(16) DEFAULT NULL,
     phone varchar(25) DEFAULT NULL,
-    migrated bool DEFAULT false,
+    migrated boolean default false,
     is_notified_for_invoices boolean NOT NULL,
     created_date datetime NOT NULL,
     created_by varchar(50) NOT NULL,
@@ -56,7 +56,7 @@ CREATE TABLE account_history (
     country varchar(50) DEFAULT NULL,
     postal_code varchar(16) DEFAULT NULL,
     phone varchar(25) DEFAULT NULL,
-    migrated bool DEFAULT false,
+    migrated boolean default false,
     is_notified_for_invoices boolean NOT NULL,
     change_type char(6) NOT NULL,
     created_by varchar(50) NOT NULL,
@@ -75,7 +75,7 @@ CREATE TABLE account_emails (
     id char(36) NOT NULL,
     account_id char(36) NOT NULL,
     email varchar(128) NOT NULL,
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -95,7 +95,7 @@ CREATE TABLE account_email_history (
     target_record_id bigint /*! unsigned */ not null,
     account_id char(36) NOT NULL,
     email varchar(128) NOT NULL,
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     change_type char(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,

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

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 ab0b058..8e112fb 100644
--- a/catalog/src/main/resources/org/killbill/billing/catalog/ddl.sql
+++ b/catalog/src/main/resources/org/killbill/billing/catalog/ddl.sql
@@ -5,7 +5,7 @@ CREATE TABLE catalog_override_plan_definition (
     record_id serial unique,
     parent_plan_name varchar(255) NOT NULL,
     effective_date datetime NOT NULL,
-    is_active bool DEFAULT 1,
+    is_active boolean default true,
     created_date datetime NOT NULL,
     created_by varchar(50) NOT NULL,
     tenant_record_id bigint /*! unsigned */ not null default 0,

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

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 960a364..259c92e 100644
--- a/entitlement/src/main/resources/org/killbill/billing/entitlement/ddl.sql
+++ b/entitlement/src/main/resources/org/killbill/billing/entitlement/ddl.sql
@@ -12,7 +12,7 @@ CREATE TABLE blocking_states (
     block_entitlement bool NOT NULL,
     block_billing bool NOT NULL,
     effective_date datetime NOT NULL,
-    is_active bool DEFAULT 1,
+    is_active boolean default true,
     created_date datetime NOT NULL,
     created_by varchar(50) NOT NULL,
     updated_date datetime DEFAULT NULL,

payment/src/main/resources/org/killbill/billing/payment/ddl.sql 6(+3 -3) 

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 182da08..9d9496e 100644
--- a/payment/src/main/resources/org/killbill/billing/payment/ddl.sql
+++ b/payment/src/main/resources/org/killbill/billing/payment/ddl.sql
@@ -65,7 +65,7 @@ CREATE TABLE payment_methods (
     external_key varchar(255) NOT NULL,
     account_id char(36) NOT NULL,
     plugin_name varchar(50) NOT NULL,
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -88,7 +88,7 @@ CREATE TABLE payment_method_history (
     target_record_id bigint /*! unsigned */ not null,
     account_id char(36) NOT NULL,
     plugin_name varchar(50) NOT NULL,
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     change_type char(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
@@ -221,7 +221,7 @@ CREATE TABLE _invoice_payment_control_plugin_auto_pay_off (
     payment_method_id char(36) NOT NULL,
     amount numeric(15,9),
     currency char(3),
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     PRIMARY KEY (record_id)

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

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 812e4df..cfb7f50 100644
--- a/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
+++ b/subscription/src/main/resources/org/killbill/billing/subscription/ddl.sql
@@ -13,7 +13,7 @@ CREATE TABLE subscription_events (
     phase_name varchar(128) DEFAULT NULL,
     price_list_name varchar(64) DEFAULT NULL,
     current_version int DEFAULT 1,
-    is_active bool DEFAULT 1,
+    is_active boolean default true,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,

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

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 9cd149f..cba0b46 100644
--- a/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
+++ b/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
@@ -25,7 +25,7 @@ CREATE TABLE tenant_kvs (
    tenant_record_id bigint /*! unsigned */ not null default 0,
    tenant_key varchar(255) NOT NULL,
    tenant_value mediumtext NOT NULL,
-   is_active bool DEFAULT 1,
+   is_active boolean default true,
    created_date datetime NOT NULL,
    created_by varchar(50) NOT NULL,
    updated_date datetime DEFAULT NULL,

util/src/main/resources/org/killbill/billing/util/ddl.sql 18(+9 -9) 

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 a4e8031..2c7045e 100644
--- a/util/src/main/resources/org/killbill/billing/util/ddl.sql
+++ b/util/src/main/resources/org/killbill/billing/util/ddl.sql
@@ -6,7 +6,7 @@ CREATE TABLE custom_fields (
     id char(36) NOT NULL,
     object_id char(36) NOT NULL,
     object_type varchar(30) NOT NULL,
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     field_name varchar(30) NOT NULL,
     field_value varchar(255),
     created_by varchar(50) NOT NULL,
@@ -28,7 +28,7 @@ CREATE TABLE custom_field_history (
     target_record_id bigint /*! unsigned */ not null,
     object_id char(36) NOT NULL,
     object_type varchar(30) NOT NULL,
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     field_name varchar(30),
     field_value varchar(255),
     change_type char(6) NOT NULL,
@@ -50,7 +50,7 @@ CREATE TABLE tag_definitions (
     id char(36) NOT NULL,
     name varchar(20) NOT NULL,
     description varchar(200) NOT NULL,
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -68,7 +68,7 @@ CREATE TABLE tag_definition_history (
     target_record_id bigint /*! unsigned */ not null,
     name varchar(30) NOT NULL,
     description varchar(200),
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     change_type char(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
@@ -90,7 +90,7 @@ CREATE TABLE tags (
     tag_definition_id char(36) NOT NULL,
     object_id char(36) NOT NULL,
     object_type varchar(30) NOT NULL,
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -111,7 +111,7 @@ CREATE TABLE tag_history (
     object_id char(36) NOT NULL,
     object_type varchar(30) NOT NULL,
     tag_definition_id char(36) NOT NULL,
-    is_active bool DEFAULT true,
+    is_active boolean default true,
     change_type char(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
@@ -246,7 +246,7 @@ CREATE TABLE users (
     username varchar(128) NULL,
     password varchar(128) NULL,
     password_salt varchar(128) NULL,
-    is_active bool DEFAULT 1,
+    is_active boolean default true,
     created_date datetime NOT NULL,
     created_by varchar(50) NOT NULL,
     updated_date datetime DEFAULT NULL,
@@ -261,7 +261,7 @@ CREATE TABLE user_roles (
     record_id serial unique,
     username varchar(128) NULL,
     role_name varchar(128) NULL,
-    is_active bool DEFAULT 1,
+    is_active boolean default true,
     created_date datetime NOT NULL,
     created_by varchar(50) NOT NULL,
     updated_date datetime DEFAULT NULL,
@@ -276,7 +276,7 @@ CREATE TABLE roles_permissions (
     record_id serial unique,
     role_name varchar(128) NULL,
     permission varchar(128) NULL,
-    is_active bool DEFAULT 1,
+    is_active boolean default true,
     created_date datetime NOT NULL,
     created_by varchar(50) NOT NULL,
     updated_date datetime DEFAULT NULL,

util/src/test/java/org/killbill/billing/DBTestingHelper.java 2(+1 -1) 

diff --git a/util/src/test/java/org/killbill/billing/DBTestingHelper.java b/util/src/test/java/org/killbill/billing/DBTestingHelper.java
index 9466add..f96f3e7 100644
--- a/util/src/test/java/org/killbill/billing/DBTestingHelper.java
+++ b/util/src/test/java/org/killbill/billing/DBTestingHelper.java
@@ -79,7 +79,7 @@ public class DBTestingHelper extends PlatformDBTestingHelper {
                                "    country varchar(50) DEFAULT NULL,\n" +
                                "    postal_code varchar(16) DEFAULT NULL,\n" +
                                "    phone varchar(25) DEFAULT NULL,\n" +
-                               "    migrated bool DEFAULT false,\n" +
+                               "    migrated boolean default false,\n" +
                                "    is_notified_for_invoices boolean NOT NULL,\n" +
                                "    created_date datetime NOT NULL,\n" +
                                "    created_by varchar(50) NOT NULL,\n" +

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github