Refs #5750 @1h; Add a "kind" attribute to StopAreas

This determines if the StopArea is commercial or not
The useless fields are hidden in the form for the non-commercials ones

1 files changed, 6 insertions, 1 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 2b94f655b..ec858a14a 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: 20180123174450) do
+ActiveRecord::Schema.define(version: 20180126134944) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -95,6 +95,8 @@ ActiveRecord::Schema.define(version: 20180123174450) do
     t.integer   "int_day_types"
     t.date      "excluded_dates",                            array: true
     t.integer   "workgroup_id",    limit: 8
+    t.integer   "int_day_types"
+    t.date      "excluded_dates",                            array: true
   end
 
   add_index "calendars", ["organisation_id"], name: "index_calendars_on_organisation_id", using: :btree
@@ -794,7 +796,10 @@ ActiveRecord::Schema.define(version: 20180123174450) do
     t.string   "stif_type"
     t.integer  "waiting_time"
     t.string   "kind"
+<<<<<<< HEAD
     t.jsonb    "localized_names"
+=======
+>>>>>>> Refs #5750 @1h; Add a "kind" attribute to StopAreas
   end
 
   add_index "stop_areas", ["name"], name: "index_stop_areas_on_name", using: :btree