From 7de48cf878e9cf463fa10e20738e5bde22b1e7ed Mon Sep 17 00:00:00 2001
From: Nikola Trandafilovic <nt@freecode.no>
Date: Tue, 8 Nov 2011 16:24:25 +0100
Subject: [PATCH] Fixed backward compatibility and duplicate indexes in
 migration files

---
 db/migrate/20100830170056_create_weekly_sale_setup_liquids.rb   | 2 +-
 .../20100830203559_create_weekly_sale_setup_product_groups.rb   | 2 +-
 db/migrate/20101104220037_add_indexes_to_journals.rb            | 2 --
 db/migrate/20101104220543_add_indexes_to_journal_operations.rb  | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/db/migrate/20100830170056_create_weekly_sale_setup_liquids.rb b/db/migrate/20100830170056_create_weekly_sale_setup_liquids.rb
index 1ef0d4b..59cdd8c 100644
--- a/db/migrate/20100830170056_create_weekly_sale_setup_liquids.rb
+++ b/db/migrate/20100830170056_create_weekly_sale_setup_liquids.rb
@@ -10,7 +10,7 @@ def self.up
       t.integer :updated_by
       t.timestamps
     end
-    add_index :weekly_sale_setup_liquids, [:name, :weekly_sale_setup_id], :unique => true 
+    add_index :weekly_sale_setup_liquids, [:name, :weekly_sale_setup_id], :unique => true, :name => "weekly_sale_setup_liqs"
     execute "ALTER TABLE weekly_sale_setup_liquids ADD CONSTRAINT fk_weekly_sale_setup_liquids_account FOREIGN KEY (account_id)  REFERENCES accounts(id) "
     execute "ALTER TABLE weekly_sale_setup_liquids ADD CONSTRAINT fk_weekly_sale_setup_liquids_wueekly_sale_setup FOREIGN KEY (weekly_sale_setup_id)  REFERENCES weekly_sale_setups(id) "
     execute "ALTER TABLE weekly_sale_setup_liquids ADD CONSTRAINT fk_weekly_sale_setup_liquids_created_by FOREIGN KEY (created_by)  REFERENCES users(id) "
diff --git a/db/migrate/20100830203559_create_weekly_sale_setup_product_groups.rb b/db/migrate/20100830203559_create_weekly_sale_setup_product_groups.rb
index 4e514f9..18899dd 100644
--- a/db/migrate/20100830203559_create_weekly_sale_setup_product_groups.rb
+++ b/db/migrate/20100830203559_create_weekly_sale_setup_product_groups.rb
@@ -12,7 +12,7 @@ def self.up
 
       t.timestamps
     end
-    add_index :weekly_sale_setup_product_groups, [:name, :weekly_sale_setup_id], :unique => true 
+    add_index :weekly_sale_setup_product_groups, [:name, :weekly_sale_setup_id], :unique => true , :name => "weekly_sale_setup_prod_groups"
     execute "ALTER TABLE weekly_sale_setup_product_groups ADD CONSTRAINT fk_weekly_sale_setup_product_groups_project FOREIGN KEY (project_id)  REFERENCES projects(id) "
     execute "ALTER TABLE weekly_sale_setup_product_groups ADD CONSTRAINT fk_weekly_sale_setup_product_groups_account FOREIGN KEY (account_id)  REFERENCES accounts(id) "
     execute "ALTER TABLE weekly_sale_setup_product_groups ADD CONSTRAINT fk_weekly_sale_setup_product_groups_wueekly_sale_setup FOREIGN KEY (weekly_sale_setup_id)  REFERENCES weekly_sale_setups(id) "
diff --git a/db/migrate/20101104220037_add_indexes_to_journals.rb b/db/migrate/20101104220037_add_indexes_to_journals.rb
index ef6cb15..7d5b53c 100644
--- a/db/migrate/20101104220037_add_indexes_to_journals.rb
+++ b/db/migrate/20101104220037_add_indexes_to_journals.rb
@@ -1,13 +1,11 @@
 class AddIndexesToJournals < ActiveRecord::Migration
   def self.up
-    add_index :journals, :company_id
     add_index :journals, :bill_id
     add_index :journals, :period_id
     add_index :journals, :journal_type_id
   end
 
   def self.down
-    remove_index :journals, :company_id
     remove_index :journals, :bill_id
     remove_index :journals, :period_id
     remove_index :journals, :journal_type_id
diff --git a/db/migrate/20101104220543_add_indexes_to_journal_operations.rb b/db/migrate/20101104220543_add_indexes_to_journal_operations.rb
index d81b8f3..59afd49 100644
--- a/db/migrate/20101104220543_add_indexes_to_journal_operations.rb
+++ b/db/migrate/20101104220543_add_indexes_to_journal_operations.rb
@@ -1,6 +1,5 @@
 class AddIndexesToJournalOperations < ActiveRecord::Migration
   def self.up
-    add_index :journal_operations, :journal_id
     add_index :journal_operations, :account_id
     add_index :journal_operations, :vat_account_id
     add_index :journal_operations, :project_id
@@ -8,7 +7,6 @@ def self.up
   end
 
   def self.down
-    remove_index :journal_operations, :journal_id
     remove_index :journal_operations, :account_id
     remove_index :journal_operations, :vat_account_id
     remove_index :journal_operations, :project_id