diff options
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20120823053740_create_organisation.rb | 11 | ||||
| -rw-r--r-- | db/migrate/20140107084816_insert_rule_parameter_sets.rb | 10 | ||||
| -rw-r--r-- | db/migrate/20150218175300_set_organisation_id_to_rps.rb | 32 | ||||
| -rw-r--r-- | db/schema.rb | 41 |
4 files changed, 63 insertions, 31 deletions
diff --git a/db/migrate/20120823053740_create_organisation.rb b/db/migrate/20120823053740_create_organisation.rb index 202dba082..3419df4db 100644 --- a/db/migrate/20120823053740_create_organisation.rb +++ b/db/migrate/20120823053740_create_organisation.rb @@ -10,12 +10,13 @@ class CreateOrganisation < ActiveRecord::Migration change_table :users do |u| u.belongs_to :organisation end - Referential.reset_column_information - User.reset_column_information - organisation = Organisation.first_or_create(:name => "Chouette") - Referential.update_all :organisation_id => organisation.id - User.update_all :organisation_id => organisation.id + # Referential.reset_column_information + # User.reset_column_information + + # organisation = Organisation.first_or_create(:name => "Chouette") + # Referential.update_all :organisation_id => organisation.id + # User.update_all :organisation_id => organisation.id end def down diff --git a/db/migrate/20140107084816_insert_rule_parameter_sets.rb b/db/migrate/20140107084816_insert_rule_parameter_sets.rb deleted file mode 100644 index fd951c765..000000000 --- a/db/migrate/20140107084816_insert_rule_parameter_sets.rb +++ /dev/null @@ -1,10 +0,0 @@ -class InsertRuleParameterSets < ActiveRecord::Migration - def up - Referential.all.each do |referential| - RuleParameterSet.default_for_all_modes( referential).save if referential.rule_parameter_sets.empty? - end - end - - def down - end -end diff --git a/db/migrate/20150218175300_set_organisation_id_to_rps.rb b/db/migrate/20150218175300_set_organisation_id_to_rps.rb index f7028449d..06180988c 100644 --- a/db/migrate/20150218175300_set_organisation_id_to_rps.rb +++ b/db/migrate/20150218175300_set_organisation_id_to_rps.rb @@ -1,19 +1,19 @@ class SetOrganisationIdToRps < ActiveRecord::Migration - #class RuleParameterSet < ActiveRecord::Base - #attr_accessor :referential_id - #attr_accessor :organisation_id - #attr_accessor :name - #end - #def up - #RuleParameterSet.all.each_with_index do |rps, index| - # rps.update_attributes :organisation_id => Referential.find( rps.referential_id).organisation_id, - # :name => "#{rps.name} #{index}" - #end - #end + # class RuleParameterSet < ActiveRecord::Base + # attr_accessor :referential_id + # attr_accessor :organisation_id + # attr_accessor :name + # end + # def up + # RuleParameterSet.all.each_with_index do |rps, index| + # rps.update_attributes :organisation_id => Referential.find( rps.referential_id).organisation_id, + # :name => "{rps.name} {index}" + # end + # end - #def down - #RuleParameterSet.all.each_with_index do |rps, index| - # rps.update_attributes :organisation_id => nil - #end - #end + # def down + # RuleParameterSet.all.each_with_index do |rps, index| + # rps.update_attributes :organisation_id => nil + # end + # end end diff --git a/db/schema.rb b/db/schema.rb index b7feb13be..4bb4654cc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,11 @@ # # It's strongly recommended that you check this file into your version control system. +<<<<<<< HEAD ActiveRecord::Schema.define(version: 20150304090743) do +======= +ActiveRecord::Schema.define(:version => 20150219205300) do +>>>>>>> V2_5 # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -195,6 +199,7 @@ ActiveRecord::Schema.define(version: 20150304090743) do t.integer "choice_code" end +<<<<<<< HEAD create_table "footnotes", force: true do |t| t.integer "line_id", limit: 8 t.string "code" @@ -210,6 +215,23 @@ ActiveRecord::Schema.define(version: 20150304090743) do create_table "group_of_lines", force: true do |t| t.string "objectid", null: false +======= + create_table "footnotes", :force => true do |t| + t.integer "line_id", :limit => 8 + t.string "code" + t.string "label" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "footnotes_vehicle_journeys", :id => false, :force => true do |t| + t.integer "vehicle_journey_id", :limit => 8 + t.integer "footnote_id", :limit => 8 + end + + create_table "group_of_lines", :force => true do |t| + t.string "objectid", :null => false +>>>>>>> V2_5 t.integer "object_version" t.datetime "creation_time" t.string "creator_id" @@ -323,9 +345,15 @@ ActiveRecord::Schema.define(version: 20150304090743) do create_table "organisations", force: true do |t| t.string "name" +<<<<<<< HEAD t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "data_format" +======= + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.boolean "hub_restrictions_by_default" +>>>>>>> V2_5 end create_table "pt_links", force: true do |t| @@ -356,7 +384,11 @@ ActiveRecord::Schema.define(version: 20150304090743) do t.text "geographical_bounds" t.integer "user_id", limit: 8 t.string "user_name" +<<<<<<< HEAD t.string "data_format" +======= + t.boolean "hub_restrictions" +>>>>>>> V2_5 end create_table "routes", force: true do |t| @@ -381,12 +413,21 @@ ActiveRecord::Schema.define(version: 20150304090743) do t.integer "line_id", limit: 8 end +<<<<<<< HEAD create_table "rule_parameter_sets", force: true do |t| t.text "parameters" t.string "name" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "organisation_id", limit: 8 +======= + create_table "rule_parameter_sets", :force => true do |t| + t.text "parameters" + t.string "name" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "organisation_id", :limit => 8 +>>>>>>> V2_5 end create_table "stop_areas", force: true do |t| |