diff options
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/094_remove_old_tags_foreign_key.rb | 7 | ||||
-rw-r--r-- | db/migrate/098_fix_public_body_translations.rb | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/db/migrate/094_remove_old_tags_foreign_key.rb b/db/migrate/094_remove_old_tags_foreign_key.rb index 1a87b97c2..5a6a00acc 100644 --- a/db/migrate/094_remove_old_tags_foreign_key.rb +++ b/db/migrate/094_remove_old_tags_foreign_key.rb @@ -2,12 +2,11 @@ class RemoveOldTagsForeignKey < ActiveRecord::Migration def self.up if ActiveRecord::Base.connection.adapter_name == "PostgreSQL" execute "ALTER TABLE has_tag_string_tags DROP CONSTRAINT fk_public_body_tags_public_body" + execute 'DROP INDEX index_public_body_tags_on_public_body_id_and_name_and_value' + execute 'DROP INDEX index_public_body_tags_on_name' end - remove_index :public_body_tags, [:public_body_id, :name, :value] - remove_index :public_body_tags, :name - - add_index :has_tag_string_tags, [:model, :model_id, :name, :value] + add_index :has_tag_string_tags, [:model, :model_id, :name, :value], :name => 'by_model_and_model_id_and_name_and_value' add_index :has_tag_string_tags, :name end diff --git a/db/migrate/098_fix_public_body_translations.rb b/db/migrate/098_fix_public_body_translations.rb index 9bcefb1c0..25f36336f 100644 --- a/db/migrate/098_fix_public_body_translations.rb +++ b/db/migrate/098_fix_public_body_translations.rb @@ -15,13 +15,12 @@ class FixPublicBodyTranslations < ActiveRecord::Migration where first_letter is null ; SQL - + execute <<-SQL update public_body_translations - set publication_scheme = public_bodies.publication_scheme - from public_bodies - where public_body_translations.public_body_id = public_bodies.id - and public_body_translations.publication_scheme is null + set publication_scheme = (SELECT public_bodies.publication_scheme FROM public_bodies WHERE +public_body_translations.public_body_id = public_bodies.id ) + where public_body_translations.publication_scheme is null ; SQL end |