killbill-aplcache

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.sql.stg
index 3715ed9..59f9318 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.sql.stg
@@ -9,14 +9,14 @@ select
 , account_key
 , name
 , value
-from bac_fields
+from old_bac_fields
 where account_key = :account_key
 <AND_CHECK_TENANT()>
 ;
 >>
 
 addField(account_id, account_key, name, value) ::=<<
-insert into bac_fields (
+insert into old_bac_fields (
   account_id
 , account_key
 , name
@@ -34,9 +34,9 @@ insert into bac_fields (
 >>
 
 removeField(account_id, name) ::= <<
-delete from bac_fields where account_id = :account_id and name = :name <AND_CHECK_TENANT()>;
+delete from old_bac_fields where account_id = :account_id and name = :name <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bac_fields where <CHECK_TENANT()> limit 1;
+select 1 from old_bac_fields where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountSqlDao.sql.stg
index 819a5c9..1329899 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountSqlDao.sql.stg
@@ -8,7 +8,7 @@ getAccountsCreatedOverTime() ::= <<
     date(from_unixtime(created_date / 1000)) day
     -- TODO: use account_record_id, once populated
   , count(record_id) count
-  from bac
+  from old_bac
   where <CHECK_TENANT()>
   group by 1
   order by 1
@@ -31,7 +31,7 @@ getAccount(account_id) ::= <<
   , billing_address_country
   , currency
   , tenant_record_id
-  from bac
+  from old_bac
   where account_id=:account_id
   <AND_CHECK_TENANT()>
   limit 1
@@ -54,7 +54,7 @@ getAccountByKey(account_key) ::= <<
   , billing_address_country
   , currency
   , tenant_record_id
-  from bac
+  from old_bac
   where account_key=:account_key
   <AND_CHECK_TENANT()>
   limit 1
@@ -62,7 +62,7 @@ getAccountByKey(account_key) ::= <<
 >>
 
 createAccount() ::= <<
-  insert into bac(
+  insert into old_bac(
     account_id
   , account_key
   , created_date
@@ -98,7 +98,7 @@ createAccount() ::= <<
 >>
 
 saveAccount() ::= <<
-  update bac set
+  update old_bac set
     updated_date=:updated_date
   , balance=:balance
   , name=:name
@@ -115,9 +115,9 @@ saveAccount() ::= <<
 >>
 
 deleteAccount(account_id) ::= <<
-delete from bac where account_id = :account_id <AND_CHECK_TENANT()>;
+delete from old_bac where account_id = :account_id <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bac where <CHECK_TENANT()> limit 1;
+select 1 from old_bac where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.sql.stg
index 5c4d142..91e2e0b 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.sql.stg
@@ -8,14 +8,14 @@ select
   account_id
 , account_key
 , name
-from bac_tags
+from old_bac_tags
 where account_key = :account_key
 <AND_CHECK_TENANT()>
 ;
 >>
 
 addTag(account_id, account_key, name) ::=<<
-insert into bac_tags (
+insert into old_bac_tags (
   account_id
 , account_key
 , name
@@ -31,9 +31,9 @@ insert into bac_tags (
 >>
 
 removeTag(account_id, name) ::= <<
-delete from bac_tags where account_id = :account_id and name = :name <AND_CHECK_TENANT()>;
+delete from old_bac_tags where account_id = :account_id and name = :name <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bac_tags where <CHECK_TENANT()> limit 1;
+select 1 from old_bac_tags where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.sql.stg
index 63e1ce0..703f678 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.sql.stg
@@ -8,14 +8,14 @@ select
   invoice_id
 , name
 , value
-from bin_fields
+from old_bin_fields
 where invoice_id = :invoice_id
 <AND_CHECK_TENANT()>
 ;
 >>
 
 addField(invoice_id, name, value) ::=<<
-insert into bin_fields (
+insert into old_bin_fields (
   invoice_id
 , name
 , value
@@ -31,9 +31,9 @@ insert into bin_fields (
 >>
 
 removeField(invoice_id, name, value) ::= <<
-delete from bin_fields where invoice_id = :invoice_id and name = :name <AND_CHECK_TENANT()>;
+delete from old_bin_fields where invoice_id = :invoice_id and name = :name <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bin_tags where <CHECK_TENANT()> limit 1;
+select 1 from old_bin_tags where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.sql.stg
index c15d21c..3a5bd22 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.sql.stg
@@ -23,7 +23,7 @@ select
 , currency
 , linked_item_id
 , tenant_record_id
-from bii
+from old_bii
 where item_id = :item_id
 <AND_CHECK_TENANT()>
 limit 1
@@ -50,7 +50,7 @@ select
 , currency
 , linked_item_id
 , tenant_record_id
-from bii
+from old_bii
 where invoice_id = :invoice_id
 <AND_CHECK_TENANT()>
 order by created_date asc
@@ -77,7 +77,7 @@ select
 , currency
 , linked_item_id
 , tenant_record_id
-from bii
+from old_bii
 where external_key = :external_key
 <AND_CHECK_TENANT()>
 order by created_date asc
@@ -85,7 +85,7 @@ order by created_date asc
 >>
 
 createInvoiceItem() ::= <<
-insert into bii (
+insert into old_bii (
   item_id
 , created_date
 , updated_date
@@ -129,13 +129,13 @@ insert into bii (
 >>
 
 deleteInvoiceItem(item_id) ::= <<
-delete from bii where item_id = :item_id <AND_CHECK_TENANT()>;
+delete from old_bii where item_id = :item_id <AND_CHECK_TENANT()>;
 >>
 
 deleteInvoiceItemsForAccount(account_id) ::= <<
-delete from bii where bii.invoice_id in (select invoice_id from bin where bin.account_id = :account_id <AND_CHECK_TENANT("bin.")> for update) <AND_CHECK_TENANT("bii.")>;
+delete from old_bii where bii.invoice_id in (select invoice_id from bin where bin.account_id = :account_id <AND_CHECK_TENANT("bin.")> for update) <AND_CHECK_TENANT("bii.")>;
 >>
 
 test() ::= <<
-select 1 from bii where <CHECK_TENANT()> limit 1;
+select 1 from old_bii where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldSqlDao.sql.stg
index 9bee903..723962c 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldSqlDao.sql.stg
@@ -8,14 +8,14 @@ select
   payment_id
 , name
 , value
-from bip_fields
+from old_bip_fields
 where payment_id = :payment_id
 <AND_CHECK_TENANT()>
 ;
 >>
 
 addField(payment_id, name, value) ::=<<
-insert into bip_fields (
+insert into old_bip_fields (
   payment_id
 , name
 , value
@@ -31,9 +31,9 @@ insert into bip_fields (
 >>
 
 removeField(payment_id, name) ::= <<
-delete from bip_fields where payment_id = :payment_id and name = :name <AND_CHECK_TENANT()>;
+delete from old_bip_fields where payment_id = :payment_id and name = :name <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bip_fields where <CHECK_TENANT()> limit 1;
+select 1 from old_bip_fields where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.sql.stg
index e358c09..9b680de 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.sql.stg
@@ -26,7 +26,7 @@ select
 , invoice_payment_type
 , linked_invoice_payment_id
 , tenant_record_id
-from bip
+from old_bip
 where payment_id = :payment_id
 <AND_CHECK_TENANT()>
 limit 1
@@ -56,7 +56,7 @@ select
 , invoice_payment_type
 , linked_invoice_payment_id
 , tenant_record_id
-from bip
+from old_bip
 where account_key = :account_key
 <AND_CHECK_TENANT()>
 order by created_date asc
@@ -64,7 +64,7 @@ order by created_date asc
 >>
 
 createInvoicePayment() ::= <<
-insert into bip (
+insert into old_bip (
   payment_id
 , created_date
 , updated_date
@@ -114,9 +114,9 @@ insert into bip (
 >>
 
 deleteInvoicePayment(payment_id) ::= <<
-delete from bip where payment_id = :payment_id <AND_CHECK_TENANT()>
+delete from old_bip where payment_id = :payment_id <AND_CHECK_TENANT()>
 >>
 
 test() ::= <<
-select 1 from bip where <CHECK_TENANT()> limit 1;
+select 1 from old_bip where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagSqlDao.sql.stg
index 541a809..9740ce4 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagSqlDao.sql.stg
@@ -8,14 +8,14 @@ select
   payment_id
 , name
 , tenant_record_id
-from bip_tags
+from old_bip_tags
 where payment_id = :payment_id
 <AND_CHECK_TENANT()>
 ;
 >>
 
 addTag(payment_id, name) ::=<<
-insert into bip_tags (
+insert into old_bip_tags (
   payment_id
 , name
 , account_record_id
@@ -29,9 +29,9 @@ insert into bip_tags (
 >>
 
 removeTag(payment_id, name) ::= <<
-delete from bip_tags where payment_id = :payment_id and name = :name <AND_CHECK_TENANT()>;
+delete from old_bip_tags where payment_id = :payment_id and name = :name <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bip_tags where <CHECK_TENANT()> limit 1;
+select 1 from old_bip_tags where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceSqlDao.sql.stg
index 2d19030..ba12ac3 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceSqlDao.sql.stg
@@ -19,7 +19,7 @@ select
 , amount_charged
 , amount_credited
 , tenant_record_id
-from bin
+from old_bin
 where invoice_id = :invoice_id
 <AND_CHECK_TENANT()>
 limit 1
@@ -42,7 +42,7 @@ select
 , amount_charged
 , amount_credited
 , tenant_record_id
-from bin
+from old_bin
 where account_id = :account_id
 <AND_CHECK_TENANT()>
 order by created_date asc
@@ -65,7 +65,7 @@ select
 , amount_charged
 , amount_credited
 , tenant_record_id
-from bin
+from old_bin
 where account_key = :account_key
 <AND_CHECK_TENANT()>
 order by created_date asc
@@ -73,7 +73,7 @@ order by created_date asc
 >>
 
 createInvoice() ::= <<
-insert into bin (
+insert into old_bin (
   invoice_id
 , invoice_number
 , created_date
@@ -109,7 +109,7 @@ insert into bin (
 >>
 
 updateInvoice() ::= <<
-update bin set
+update old_bin set
   updated_date = :updated_date
 , invoice_number = :invoice_number
 , account_key = :account_key
@@ -126,13 +126,13 @@ where invoice_id = :invoice_id
 >>
 
 deleteInvoice(invoice_id) ::= <<
-delete from bin where invoice_id = :invoice_id <AND_CHECK_TENANT()>;
+delete from old_bin where invoice_id = :invoice_id <AND_CHECK_TENANT()>;
 >>
 
 deleteInvoicesForAccount(account_id) ::= <<
-delete from bin where account_id = :account_id <AND_CHECK_TENANT()>;
+delete from old_bin where account_id = :account_id <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bin where <CHECK_TENANT()> limit 1;
+select 1 from old_bin where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.sql.stg
index b2f5c0b..a357ea4 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.sql.stg
@@ -8,14 +8,14 @@ select
   invoice_id
 , name
 , tenant_record_id
-from bin_tags
+from old_bin_tags
 where invoice_id = :invoice_id
 <AND_CHECK_TENANT()>
 ;
 >>
 
 addTag(invoice_id, name) ::=<<
-insert into bin_tags (
+insert into old_bin_tags (
   invoice_id
 , name
 , account_record_id
@@ -29,9 +29,9 @@ insert into bin_tags (
 >>
 
 removeTag(invoice_id, name) ::= <<
-delete from bin_tags where invoice_id = :invoice_id and name = :name <AND_CHECK_TENANT()>;
+delete from old_bin_tags where invoice_id = :invoice_id and name = :name <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bin_tags where <CHECK_TENANT()> limit 1;
+select 1 from old_bin_tags where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.sql.stg
index 59eb814..941fab2 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.sql.stg
@@ -12,7 +12,7 @@ select
 , start_date
 , end_date
 , tenant_record_id
-from bos
+from old_bos
 where external_key = :external_key
 <AND_CHECK_TENANT()>
 order by start_date asc
@@ -20,7 +20,7 @@ order by start_date asc
 >>
 
 createOverdueStatus() ::= <<
-insert into bos (
+insert into old_bos (
   bundle_id
 , external_key
 , account_key
@@ -42,9 +42,9 @@ insert into bos (
 >>
 
 deleteOverdueStatusesForBundle(bundle_id) ::= <<
-delete from bos where bundle_id = :bundle_id <AND_CHECK_TENANT()>;
+delete from old_bos where bundle_id = :bundle_id <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bos where <CHECK_TENANT()> limit 1;
+select 1 from old_bos where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.sql.stg
index 3528475..b0c87fe 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.sql.stg
@@ -11,14 +11,14 @@ select
 , name
 , value
 , tenant_record_id
-from bst_fields
+from old_bst_fields
 where external_key = :external_key
 <AND_CHECK_TENANT()>
 ;
 >>
 
 addField(bundle_id, external_key, name, value) ::=<<
-insert into bst_fields (
+insert into old_bst_fields (
   bundle_id
 , external_key
 , account_key
@@ -38,9 +38,9 @@ insert into bst_fields (
 >>
 
 removeField(bundle_id, name) ::= <<
-delete from bst_fields where bundle_id = :bundle_id and name = :name <AND_CHECK_TENANT()>;
+delete from old_bst_fields where bundle_id = :bundle_id and name = :name <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bst_fields where <CHECK_TENANT()> limit 1;
+select 1 from old_bst_fields where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.sql.stg
index d88006e..92d6b18 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.sql.stg
@@ -7,7 +7,7 @@ getSubscriptionsCreatedOverTime(product_type, slug) ::= <<
   select
     date(from_unixtime(requested_timestamp / 1000)) day
   , count(record_id) count
-  from bst
+  from old_bst
   where event in ('ADD_ADD_ON', 'ADD_BASE', 'ADD_STANDALONE')
   and next_product_type = :product_type
   and next_slug = :slug
@@ -52,7 +52,7 @@ getTransitionsByKey(external_key) ::= <<
   , next_start_date
   , next_state
   , tenant_record_id
-  from bst
+  from old_bst
   where external_key=:external_key
   <AND_CHECK_TENANT()>
   order by requested_timestamp asc
@@ -94,7 +94,7 @@ getTransitionForSubscription(subscription_id) ::= <<
   , next_start_date
   , next_state
   , tenant_record_id
-  from bst
+  from old_bst
   where subscription_id = :subscription_id
   <AND_CHECK_TENANT()>
   order by requested_timestamp asc
@@ -136,7 +136,7 @@ getTransitionsForAccount(account_id) ::= <<
   , next_start_date
   , next_state
   , tenant_record_id
-  from bst
+  from old_bst
   where account_key = :account_key
   <AND_CHECK_TENANT()>
   order by requested_timestamp asc
@@ -144,7 +144,7 @@ getTransitionsForAccount(account_id) ::= <<
 >>
 
 createTransition() ::= <<
-  insert into bst(
+  insert into old_bst(
     total_ordering
   , bundle_id
   , external_key
@@ -218,12 +218,12 @@ createTransition() ::= <<
 >>
 
 deleteTransitionsForBundle(bundle_id) ::= <<
-  delete from bst
+  delete from old_bst
   where bundle_id=:bundle_id
   <AND_CHECK_TENANT()>
   ;
 >>
 
 test() ::= <<
-select 1 from bst where <CHECK_TENANT()> limit 1;
+select 1 from old_bst where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.sql.stg
index bd89b0d..621f950 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.sql.stg
@@ -10,14 +10,14 @@ select
 , account_key
 , name
 , tenant_record_id
-from bst_tags
+from old_bst_tags
 where external_key = :external_key
 <AND_CHECK_TENANT()>
 ;
 >>
 
 addTag(bundle_id, external_key, name) ::=<<
-insert into bst_tags (
+insert into old_bst_tags (
   bundle_id
 , external_key
 , account_key
@@ -35,9 +35,9 @@ insert into bst_tags (
 >>
 
 removeTag(bundle_id, name) ::= <<
-delete from bst_tags where bundle_id = :bundle_id and name = :name <AND_CHECK_TENANT()>;
+delete from old_bst_tags where bundle_id = :bundle_id and name = :name <AND_CHECK_TENANT()>;
 >>
 
 test() ::= <<
-select 1 from bst_tags where <CHECK_TENANT()> limit 1;
+select 1 from old_bst_tags where <CHECK_TENANT()> limit 1;
 >>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/ddl.sql b/analytics/src/main/resources/com/ning/billing/analytics/ddl.sql
index 7c93a84..8324289 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/ddl.sql
+++ b/analytics/src/main/resources/com/ning/billing/analytics/ddl.sql
@@ -1,7 +1,7 @@
 /*! SET storage_engine=INNODB */;
 
-drop table if exists bst;
-create table bst (
+drop table if exists old_bst;
+create table old_bst (
   record_id int(11) unsigned not null auto_increment
 , total_ordering bigint default 0
 , bundle_id char(36) not null
@@ -39,11 +39,11 @@ create table bst (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create index bst_key_index on bst (external_key, requested_timestamp asc);
-create index bst_tenant_account_record_id on bst(tenant_record_id, account_record_id);
+create index old_bst_key_index on old_bst (external_key, requested_timestamp asc);
+create index old_bst_tenant_account_record_id on old_bst(tenant_record_id, account_record_id);
 
-drop table if exists bac;
-create table bac (
+drop table if exists old_bac;
+create table old_bac (
   record_id int(11) unsigned not null auto_increment
 , account_id char(36) not null
 , account_key varchar(50) not null
@@ -62,11 +62,11 @@ create table bac (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create unique index bac_key_index on bac (account_key);
-create index bac_tenant_account_record_id on bac(tenant_record_id, account_record_id);
+create unique index old_bac_key_index on old_bac (account_key);
+create index old_bac_tenant_account_record_id on old_bac(tenant_record_id, account_record_id);
 
-drop table if exists bin;
-create table bin (
+drop table if exists old_bin;
+create table old_bin (
   record_id int(11) unsigned not null auto_increment
 , invoice_id char(36) not null
 , invoice_number bigint default null
@@ -85,11 +85,11 @@ create table bin (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create unique index bin_key_index on bin (invoice_id);
-create index bin_tenant_account_record_id on bin(tenant_record_id, account_record_id);
+create unique index old_bin_key_index on old_bin (invoice_id);
+create index old_bin_tenant_account_record_id on old_bin(tenant_record_id, account_record_id);
 
-drop table if exists bii;
-create table bii (
+drop table if exists old_bii;
+create table old_bii (
   record_id int(11) unsigned not null auto_increment
 , item_id char(36) not null
 , created_date bigint not null
@@ -112,11 +112,11 @@ create table bii (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create unique index bii_key_index on bii (item_id);
-create index bii_tenant_account_record_id on bii(tenant_record_id, account_record_id);
+create unique index old_bii_key_index on old_bii (item_id);
+create index old_bii_tenant_account_record_id on old_bii(tenant_record_id, account_record_id);
 
-drop table if exists bip;
-create table bip (
+drop table if exists old_bip;
+create table old_bip (
   record_id int(11) unsigned not null auto_increment
 , payment_id char(36) not null
 , created_date bigint not null
@@ -142,11 +142,11 @@ create table bip (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create unique index bip_key_index on bip (payment_id);
-create index bip_tenant_account_record_id on bip(tenant_record_id, account_record_id);
+create unique index old_bip_key_index on old_bip (payment_id);
+create index old_bip_tenant_account_record_id on old_bip(tenant_record_id, account_record_id);
 
-drop table if exists bos;
-create table bos (
+drop table if exists old_bos;
+create table old_bos (
   record_id int(11) unsigned not null auto_increment
 , bundle_id char(36) not null
 , external_key varchar(50) not null comment 'Bundle external key'
@@ -158,10 +158,10 @@ create table bos (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create index bos_tenant_account_record_id on bos(tenant_record_id, account_record_id);
+create index old_bos_tenant_account_record_id on old_bos(tenant_record_id, account_record_id);
 
-drop table if exists bac_tags;
-create table bac_tags (
+drop table if exists old_bac_tags;
+create table old_bac_tags (
   record_id int(11) unsigned not null auto_increment
 , account_id char(36) not null
 , account_key varchar(50) not null comment 'Account external key'
@@ -170,10 +170,10 @@ create table bac_tags (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create index bac_tags_tenant_account_record_id on bac_tags(tenant_record_id, account_record_id);
+create index old_bac_tags_tenant_account_record_id on old_bac_tags(tenant_record_id, account_record_id);
 
-drop table if exists bac_fields;
-create table bac_fields (
+drop table if exists old_bac_fields;
+create table old_bac_fields (
   record_id int(11) unsigned not null auto_increment
 , account_id char(36) not null
 , account_key varchar(50) not null comment 'Account external key'
@@ -183,10 +183,10 @@ create table bac_fields (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create index bac_fields_tenant_account_record_id on bac_fields(tenant_record_id, account_record_id);
+create index old_bac_fields_tenant_account_record_id on old_bac_fields(tenant_record_id, account_record_id);
 
-drop table if exists bst_tags;
-create table bst_tags (
+drop table if exists old_bst_tags;
+create table old_bst_tags (
   record_id int(11) unsigned not null auto_increment
 , bundle_id char(36) not null
 , external_key varchar(50) not null comment 'Bundle external key'
@@ -196,10 +196,10 @@ create table bst_tags (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create index bst_tags_tenant_account_record_id on bst_tags(tenant_record_id, account_record_id);
+create index old_bst_tags_tenant_account_record_id on old_bst_tags(tenant_record_id, account_record_id);
 
-drop table if exists bst_fields;
-create table bst_fields (
+drop table if exists old_bst_fields;
+create table old_bst_fields (
   record_id int(11) unsigned not null auto_increment
 , bundle_id char(36) not null
 , external_key varchar(50) not null comment 'Bundle external key'
@@ -210,10 +210,10 @@ create table bst_fields (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create index bst_fields_tenant_account_record_id on bst_fields(tenant_record_id, account_record_id);
+create index old_bst_fields_tenant_account_record_id on old_bst_fields(tenant_record_id, account_record_id);
 
-drop table if exists bin_tags;
-create table bin_tags (
+drop table if exists old_bin_tags;
+create table old_bin_tags (
   record_id int(11) unsigned not null auto_increment
 , invoice_id char(36) not null
 , name varchar(50) not null
@@ -221,10 +221,10 @@ create table bin_tags (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create index bin_tags_tenant_account_record_id on bin_tags(tenant_record_id, account_record_id);
+create index old_bin_tags_tenant_account_record_id on old_bin_tags(tenant_record_id, account_record_id);
 
-drop table if exists bin_fields;
-create table bin_fields (
+drop table if exists old_bin_fields;
+create table old_bin_fields (
   record_id int(11) unsigned not null auto_increment
 , invoice_id char(36) not null
 , name varchar(50) not null
@@ -233,10 +233,10 @@ create table bin_fields (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create index bin_fields_tenant_account_record_id on bin_fields(tenant_record_id, account_record_id);
+create index old_bin_fields_tenant_account_record_id on old_bin_fields(tenant_record_id, account_record_id);
 
-drop table if exists bip_tags;
-create table bip_tags (
+drop table if exists old_bip_tags;
+create table old_bip_tags (
   record_id int(11) unsigned not null auto_increment
 , payment_id char(36) not null
 , name varchar(50) not null
@@ -244,10 +244,10 @@ create table bip_tags (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create index bip_tags_tenant_account_record_id on bip_tags(tenant_record_id, account_record_id);
+create index old_bip_tags_tenant_account_record_id on old_bip_tags(tenant_record_id, account_record_id);
 
-drop table if exists bip_fields;
-create table bip_fields (
+drop table if exists old_bip_fields;
+create table old_bip_fields (
   record_id int(11) unsigned not null auto_increment
 , payment_id char(36) not null
 , name varchar(50) not null
@@ -256,4 +256,4 @@ create table bip_fields (
 , tenant_record_id int(11) unsigned default null
 , primary key(record_id)
 );
-create index bip_fields_tenant_account_record_id on bip_fields(tenant_record_id, account_record_id);
+create index old_bip_fields_tenant_account_record_id on old_bip_fields(tenant_record_id, account_record_id);