Merge branch 'tad_pmr' into sismo

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb

4 files changed, 38 insertions, 6 deletions

diff --git a/db/migrate/20140617141550_add_on_demand_transportation_to_line.ninoxe_engine.rb b/db/migrate/20140617141550_add_on_demand_transportation_to_line.ninoxe_engine.rb
new file mode 100644
index 000000000..358312ec4
--- /dev/null
+++ b/db/migrate/20140617141550_add_on_demand_transportation_to_line.ninoxe_engine.rb
@@ -0,0 +1,6 @@
+# This migration comes from ninoxe_engine (originally 20140617131630)
+class AddOnDemandTransportationToLine < ActiveRecord::Migration
+  def change
+    add_column :lines, :on_demand_transportation, :boolean
+  end
+end
diff --git a/db/migrate/20140617141551_add_details_to_vehicle_journey.ninoxe_engine.rb b/db/migrate/20140617141551_add_details_to_vehicle_journey.ninoxe_engine.rb
new file mode 100644
index 000000000..ec0c5af40
--- /dev/null
+++ b/db/migrate/20140617141551_add_details_to_vehicle_journey.ninoxe_engine.rb
@@ -0,0 +1,7 @@
+# This migration comes from ninoxe_engine (originally 20140617132236)
+class AddDetailsToVehicleJourney < ActiveRecord::Migration
+  def change
+    add_column :vehicle_journeys, :mobility_restricted_suitability, :boolean
+    add_column :vehicle_journeys, :on_demand_transportation, :boolean
+  end
+end
diff --git a/db/migrate/20140618072859_fix_column_name.ninoxe_engine.rb b/db/migrate/20140618072859_fix_column_name.ninoxe_engine.rb
new file mode 100644
index 000000000..9802528d3
--- /dev/null
+++ b/db/migrate/20140618072859_fix_column_name.ninoxe_engine.rb
@@ -0,0 +1,12 @@
+# This migration comes from ninoxe_engine (originally 20140618071147)
+class FixColumnName < ActiveRecord::Migration
+  def up
+    rename_column :lines, :on_demand_transportation, :flexible_service
+    rename_column :vehicle_journeys, :on_demand_transportation, :flexible_service
+  end
+
+  def down
+    rename_column :lines, :flexible_service, :on_demand_transportation
+    rename_column :vehicle_journeys, :flexible_service, :on_demand_transportation
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 70f317878..1d3d2aa24 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,11 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
+<<<<<<< HEAD
 ActiveRecord::Schema.define(:version => 20140626081658) do
+=======
+ActiveRecord::Schema.define(:version => 20140618072859) do
+>>>>>>> tad_pmr
 
   create_table "access_links", :force => true do |t|
     t.integer  "access_point_id",                        :limit => 8
@@ -279,6 +283,7 @@ ActiveRecord::Schema.define(:version => 20140626081658) do
     t.string   "comment"
     t.boolean  "mobility_restricted_suitability"
     t.integer  "int_user_needs"
+    t.boolean  "flexible_service"
   end
 
   add_index "lines", ["objectid"], :name => "lines_objectid_key", :unique => true
@@ -515,11 +520,11 @@ ActiveRecord::Schema.define(:version => 20140626081658) do
   add_index "vehicle_journey_at_stops", ["vehicle_journey_id"], :name => "index_vehicle_journey_at_stops_on_vehicle_journey_id"
 
   create_table "vehicle_journeys", :force => true do |t|
-    t.integer  "route_id",                     :limit => 8
-    t.integer  "journey_pattern_id",           :limit => 8
-    t.integer  "time_slot_id",                 :limit => 8
-    t.integer  "company_id",                   :limit => 8
-    t.string   "objectid",                                  :null => false
+    t.integer  "route_id",                        :limit => 8
+    t.integer  "journey_pattern_id",              :limit => 8
+    t.integer  "time_slot_id",                    :limit => 8
+    t.integer  "company_id",                      :limit => 8
+    t.string   "objectid",                                     :null => false
     t.integer  "object_version"
     t.datetime "creation_time"
     t.string   "creator_id"
@@ -530,7 +535,9 @@ ActiveRecord::Schema.define(:version => 20140626081658) do
     t.string   "published_journey_identifier"
     t.string   "facility"
     t.string   "vehicle_type_identifier"
-    t.integer  "number",                       :limit => 8
+    t.integer  "number",                          :limit => 8
+    t.boolean  "mobility_restricted_suitability"
+    t.boolean  "flexible_service"
   end
 
   add_index "vehicle_journeys", ["objectid"], :name => "vehicle_journeys_objectid_key", :unique => true