Always support tenancy

Simplifies code and testing
mbulat · Sep 1, 2016 · 18d310c · 18d310c
1 parent 93ce285
commit 18d310c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 46 deletions.
diff --git a/db/migrate/20160422034059_add_tenant_id_and_tenant_type_to_accounts.rb b/db/migrate/20160422034059_add_tenant_id_and_tenant_type_to_accounts.rb
@@ -1,38 +1,20 @@
 class AddTenantIdAndTenantTypeToAccounts < ActiveRecord::Migration
   def up
-    if Plutus.enable_tenancy
-      rename_column :plutus_accounts, :tenant_id, :old_tenant_id
-      Plutus::Account.reset_column_information
+    unless Plutus.enable_tenancy
+      add_column :plutus_accounts, :tenant_id, :integer
     end
 
-    add_column :plutus_accounts, :tenant_id, :string
     add_column :plutus_accounts, :tenant_type, :string
 
+    Plutus::Account.reset_column_information
     Plutus::Account.update_all(tenant_type: Plutus.tenant_class)
 
-    if Plutus.enable_tenancy
-      Plutus::Account.find_each do |account|
-        account.update(tenant_id: account.old_tenant_id.to_s)
-      end
-      remove_column :plutus_accounts, :old_tenant_id
-    end
-
     add_index :plutus_accounts, [:tenant_id, :tenant_type]
   end
 
   def down
-    if Plutus.enable_tenancy
-      rename_column :plutus_accounts, :tenant_id, :new_tenant_id
-      Plutus::Account.reset_column_information
-      add_column :plutus_accounts, :tenant_id, :integer, index: true
-
-      Plutus::Account.find_each do |account|
-        account.update(tenant_id: account.new_tenant_id.to_i)
-      end
-
-      remove_column :plutus_accounts, :new_tenant_id
-    else
-      remove_column :plutus_accounts, :tenant_id, :string
+    unless Plutus.enable_tenancy
+      remove_column :plutus_accounts, :tenant_id, :integer
     end
     remove_column :plutus_accounts, :tenant_type, :string
   end

diff --git a/..._rails_root/db/migrate/20160422044435_add_tenant_id_and_tenant_type_to_accounts.plutus.rb b/..._rails_root/db/migrate/20160422044435_add_tenant_id_and_tenant_type_to_accounts.plutus.rb
@@ -1,39 +1,21 @@
 # This migration comes from plutus (originally 20160422034059)
 class AddTenantIdAndTenantTypeToAccounts < ActiveRecord::Migration
   def up
-    if Plutus.enable_tenancy
-      rename_column :plutus_accounts, :tenant_id, :old_tenant_id
-      Plutus::Account.reset_column_information
+    unless Plutus.enable_tenancy
+      add_column :plutus_accounts, :tenant_id, :integer
     end
 
-    add_column :plutus_accounts, :tenant_id, :string
     add_column :plutus_accounts, :tenant_type, :string
 
+    Plutus::Account.reset_column_information
     Plutus::Account.update_all(tenant_type: Plutus.tenant_class)
 
-    if Plutus.enable_tenancy
-      Plutus::Account.find_each do |account|
-        account.update(tenant_id: account.old_tenant_id.to_s)
-      end
-      remove_column :plutus_accounts, :old_tenant_id
-    end
-
     add_index :plutus_accounts, [:tenant_id, :tenant_type]
   end
 
   def down
-    if Plutus.enable_tenancy
-      rename_column :plutus_accounts, :tenant_id, :new_tenant_id
-      Plutus::Account.reset_column_information
-      add_column :plutus_accounts, :tenant_id, :integer, index: true
-
-      Plutus::Account.find_each do |account|
-        account.update(tenant_id: account.new_tenant_id.to_i)
-      end
-
-      remove_column :plutus_accounts, :new_tenant_id
-    else
-      remove_column :plutus_accounts, :tenant_id, :string
+    unless Plutus.enable_tenancy
+      remove_column :plutus_accounts, :tenant_id, :integer
     end
     remove_column :plutus_accounts, :tenant_type, :string
   end