diff options
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20170307155042_set_updated_at.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20180330124436_add_metadata_to_other_models.rb | 1 | ||||
| -rw-r--r-- | db/migrate/20180528125333_spring_cleanup.rb | 7 | ||||
| -rw-r--r-- | db/schema.rb | 33 |
4 files changed, 11 insertions, 32 deletions
diff --git a/db/migrate/20170307155042_set_updated_at.rb b/db/migrate/20170307155042_set_updated_at.rb index 16bfda3d9..6280ba9a8 100644 --- a/db/migrate/20170307155042_set_updated_at.rb +++ b/db/migrate/20170307155042_set_updated_at.rb @@ -1,6 +1,6 @@ class SetUpdatedAt < ActiveRecord::Migration def up - models = %w(VehicleJourney Timeband TimeTable StopPoint StopArea RoutingConstraintZone Route PtLink Network Line + models = %w(VehicleJourney TimeTable StopPoint StopArea RoutingConstraintZone Route PtLink Network Line JourneyPattern GroupOfLine ConnectionLink Company AccessPoint AccessLink) models.each do |table| diff --git a/db/migrate/20180330124436_add_metadata_to_other_models.rb b/db/migrate/20180330124436_add_metadata_to_other_models.rb index db01c77df..be031de0c 100644 --- a/db/migrate/20180330124436_add_metadata_to_other_models.rb +++ b/db/migrate/20180330124436_add_metadata_to_other_models.rb @@ -17,7 +17,6 @@ class AddMetadataToOtherModels < ActiveRecord::Migration Chouette::StopArea, Chouette::StopPoint, Chouette::TimeTable, - Chouette::Timeband, Chouette::VehicleJourney, ComplianceCheckSet, ComplianceControlSet, diff --git a/db/migrate/20180528125333_spring_cleanup.rb b/db/migrate/20180528125333_spring_cleanup.rb new file mode 100644 index 000000000..75f4c0c0b --- /dev/null +++ b/db/migrate/20180528125333_spring_cleanup.rb @@ -0,0 +1,7 @@ +class SpringCleanup < ActiveRecord::Migration + def change + [:journey_frequencies, :timebands].each do |t| + drop_table t + end + end +end diff --git a/db/schema.rb b/db/schema.rb index c5fe6e0d1..27bb19579 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: 20180517190722) do +ActiveRecord::Schema.define(version: 20180528125333) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -92,9 +92,9 @@ ActiveRecord::Schema.define(version: 20180517190722) do t.integer "organisation_id", limit: 8 t.datetime "created_at" t.datetime "updated_at" + t.integer "workgroup_id", limit: 8 t.integer "int_day_types" t.date "excluded_dates", array: true - t.integer "workgroup_id", limit: 8 t.jsonb "metadata", default: {} end @@ -472,29 +472,15 @@ ActiveRecord::Schema.define(version: 20180517190722) do t.string "type" t.integer "parent_id", limit: 8 t.string "parent_type" + t.datetime "notified_parent_at" t.integer "current_step", default: 0 t.integer "total_steps", default: 0 - t.datetime "notified_parent_at" t.string "creator" end add_index "imports", ["referential_id"], name: "index_imports_on_referential_id", using: :btree add_index "imports", ["workbench_id"], name: "index_imports_on_workbench_id", using: :btree - create_table "journey_frequencies", id: :bigserial, force: :cascade do |t| - t.integer "vehicle_journey_id", limit: 8 - t.time "scheduled_headway_interval", null: false - t.time "first_departure_time", null: false - t.time "last_departure_time" - t.boolean "exact_time", default: false - t.datetime "created_at" - t.datetime "updated_at" - t.integer "timeband_id", limit: 8 - end - - add_index "journey_frequencies", ["timeband_id"], name: "index_journey_frequencies_on_timeband_id", using: :btree - add_index "journey_frequencies", ["vehicle_journey_id"], name: "index_journey_frequencies_on_vehicle_journey_id", using: :btree - create_table "journey_patterns", id: :bigserial, force: :cascade do |t| t.integer "route_id", limit: 8 t.string "objectid", null: false @@ -967,17 +953,6 @@ ActiveRecord::Schema.define(version: 20180517190722) do add_index "time_tables_vehicle_journeys", ["time_table_id"], name: "index_time_tables_vehicle_journeys_on_time_table_id", using: :btree add_index "time_tables_vehicle_journeys", ["vehicle_journey_id"], name: "index_time_tables_vehicle_journeys_on_vehicle_journey_id", using: :btree - create_table "timebands", id: :bigserial, force: :cascade do |t| - t.string "objectid", null: false - t.integer "object_version", limit: 8 - t.string "name" - t.time "start_time", null: false - t.time "end_time", null: false - t.datetime "created_at" - t.datetime "updated_at" - t.jsonb "metadata", default: {} - end - create_table "users", id: :bigserial, force: :cascade do |t| t.string "email", default: "", null: false t.string "encrypted_password", default: "" @@ -1110,8 +1085,6 @@ ActiveRecord::Schema.define(version: 20180517190722) do add_foreign_key "compliance_controls", "compliance_control_sets" add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", on_delete: :cascade add_foreign_key "import_resources", "referentials" - add_foreign_key "journey_frequencies", "timebands", on_delete: :nullify - add_foreign_key "journey_frequencies", "vehicle_journeys", on_delete: :nullify add_foreign_key "journey_patterns", "routes", name: "jp_route_fkey", on_delete: :cascade add_foreign_key "journey_patterns", "stop_points", column: "arrival_stop_point_id", name: "arrival_point_fkey", on_delete: :nullify add_foreign_key "journey_patterns", "stop_points", column: "departure_stop_point_id", name: "departure_point_fkey", on_delete: :nullify |