From a534fbac065dfd9cebbe83bb3f596a39610dc4be Mon Sep 17 00:00:00 2001 From: Xinhui Date: Tue, 14 Nov 2017 11:28:09 +0100 Subject: Drop table rule_parameter_sets Refs #4516 --- db/migrate/20171114102438_drop_table_rule_parameter_sets.rb | 5 +++++ db/schema.rb | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 db/migrate/20171114102438_drop_table_rule_parameter_sets.rb (limited to 'db') diff --git a/db/migrate/20171114102438_drop_table_rule_parameter_sets.rb b/db/migrate/20171114102438_drop_table_rule_parameter_sets.rb new file mode 100644 index 000000000..55dfd32df --- /dev/null +++ b/db/migrate/20171114102438_drop_table_rule_parameter_sets.rb @@ -0,0 +1,5 @@ +class DropTableRuleParameterSets < ActiveRecord::Migration + def change + drop_table :rule_parameter_sets + end +end diff --git a/db/schema.rb b/db/schema.rb index d6823e8b0..68b15c245 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171109101514) do +ActiveRecord::Schema.define(version: 20171114102438) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -680,14 +680,6 @@ ActiveRecord::Schema.define(version: 20171109101514) do t.integer "line_id", limit: 8 end - create_table "rule_parameter_sets", id: :bigserial, force: :cascade do |t| - t.text "parameters" - t.string "name" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "organisation_id", limit: 8 - end - create_table "stop_area_referential_memberships", id: :bigserial, force: :cascade do |t| t.integer "organisation_id", limit: 8 t.integer "stop_area_referential_id", limit: 8 -- cgit v1.2.3 From cc785a55c485a3a69f917c183c00db18a9de6614 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Tue, 14 Nov 2017 11:39:28 +0100 Subject: Remove rule parameter set route Refs #4516 Removel rule parameter set from migration --- db/migrate/20150218175300_set_organisation_id_to_rps.rb | 7 +++---- db/migrate/20150219175300_insert_default_organisation.rb | 6 +----- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'db') diff --git a/db/migrate/20150218175300_set_organisation_id_to_rps.rb b/db/migrate/20150218175300_set_organisation_id_to_rps.rb index 024f5938e..77ac1a71c 100644 --- a/db/migrate/20150218175300_set_organisation_id_to_rps.rb +++ b/db/migrate/20150218175300_set_organisation_id_to_rps.rb @@ -1,13 +1,12 @@ class SetOrganisationIdToRps < ActiveRecord::Migration def up - RuleParameterSet.where(organisation_id: nil).update_all "name = concat(name, ' ', id)" - + # RuleParameterSet.where(organisation_id: nil).update_all "name = concat(name, ' ', id)" # RuleParameterSet.joins(...).update_all("organisation_id = referentials.organisation_id") # fails (see https://github.com/rails/arel/pull/294) - execute "UPDATE rule_parameter_sets SET organisation_id = referentials.organisation_id FROM referentials WHERE referentials.id = rule_parameter_sets.referential_id;" + # execute "UPDATE rule_parameter_sets SET organisation_id = referentials.organisation_id FROM referentials WHERE referentials.id = rule_parameter_sets.referential_id;" end def down - RuleParameterSet.update_all organisation_id: nil + # RuleParameterSet.update_all organisation_id: nil end end diff --git a/db/migrate/20150219175300_insert_default_organisation.rb b/db/migrate/20150219175300_insert_default_organisation.rb index c8e97b562..fe7bbd539 100644 --- a/db/migrate/20150219175300_insert_default_organisation.rb +++ b/db/migrate/20150219175300_insert_default_organisation.rb @@ -4,7 +4,7 @@ class InsertDefaultOrganisation < ActiveRecord::Migration has_many :rule_parameter_sets, :dependent => :destroy end - + def up organisation = Organisation.find_or_create_by!(:name => "Chouette") Referential.where( :organisation_id => nil).each do |r| @@ -13,10 +13,6 @@ class InsertDefaultOrganisation < ActiveRecord::Migration User.where( :organisation_id => nil).each do |r| r.update_attributes :organisation_id => organisation.id end - Organisation.all.each do |organisation| - RuleParameterSet.default_for_all_modes( organisation).save if organisation.rule_parameter_sets.empty? - end - end def down -- cgit v1.2.3 From 219af774c2d589446133bda55aa0f001d6526181 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Fri, 17 Nov 2017 12:04:41 +0100 Subject: Remove migration Refs #4516 --- db/migrate/20150218175300_set_organisation_id_to_rps.rb | 12 ------------ db/migrate/20150219175300_insert_default_organisation.rb | 2 -- 2 files changed, 14 deletions(-) delete mode 100644 db/migrate/20150218175300_set_organisation_id_to_rps.rb (limited to 'db') diff --git a/db/migrate/20150218175300_set_organisation_id_to_rps.rb b/db/migrate/20150218175300_set_organisation_id_to_rps.rb deleted file mode 100644 index 77ac1a71c..000000000 --- a/db/migrate/20150218175300_set_organisation_id_to_rps.rb +++ /dev/null @@ -1,12 +0,0 @@ -class SetOrganisationIdToRps < ActiveRecord::Migration - def up - # RuleParameterSet.where(organisation_id: nil).update_all "name = concat(name, ' ', id)" - # RuleParameterSet.joins(...).update_all("organisation_id = referentials.organisation_id") - # fails (see https://github.com/rails/arel/pull/294) - # execute "UPDATE rule_parameter_sets SET organisation_id = referentials.organisation_id FROM referentials WHERE referentials.id = rule_parameter_sets.referential_id;" - end - - def down - # RuleParameterSet.update_all organisation_id: nil - end -end diff --git a/db/migrate/20150219175300_insert_default_organisation.rb b/db/migrate/20150219175300_insert_default_organisation.rb index fe7bbd539..2734893f5 100644 --- a/db/migrate/20150219175300_insert_default_organisation.rb +++ b/db/migrate/20150219175300_insert_default_organisation.rb @@ -1,8 +1,6 @@ class InsertDefaultOrganisation < ActiveRecord::Migration class Organisation < ActiveRecord::Base attr_accessor :name - - has_many :rule_parameter_sets, :dependent => :destroy end def up -- cgit v1.2.3