fix Refs #96, Refs #102, Refs #95

1 files changed, 28 insertions, 23 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 26e881fba..944588d55 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -176,16 +176,14 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
     t.integer "choice_code"
   end
 
-  add_index "facilities_features", ["facility_id"], :name => "idx_facility_id"
-
   create_table "file_validation_log_messages", :force => true do |t|
     t.integer  "file_validation_id"
     t.string   "key"
     t.string   "arguments",          :limit => 1000
     t.integer  "position"
     t.string   "severity"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
   end
 
   add_index "file_validation_log_messages", ["file_validation_id"], :name => "index_file_validation_log_messages_on_file_validation_id"
@@ -195,8 +193,18 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
     t.string   "options",    :limit => 2000
     t.string   "file_name"
     t.string   "file_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "geometry_columns", :id => false, :force => true do |t|
+    t.string  "f_table_catalog",   :limit => 256, :null => false
+    t.string  "f_table_schema",    :limit => 256, :null => false
+    t.string  "f_table_name",      :limit => 256, :null => false
+    t.string  "f_geometry_column", :limit => 256, :null => false
+    t.integer "coord_dimension",                  :null => false
+    t.integer "srid",                             :null => false
+    t.string  "type",              :limit => 30,  :null => false
   end
 
   create_table "group_of_lines", :force => true do |t|
@@ -211,13 +219,10 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
   add_index "group_of_lines", ["objectid"], :name => "group_of_lines_objectid_key", :unique => true
 
   create_table "group_of_lines_lines", :id => false, :force => true do |t|
-    t.integer "group_of_line_id", :limit => 8, :null => false
-    t.integer "line_id",          :limit => 8, :null => false
+    t.integer "group_of_line_id", :limit => 8
+    t.integer "line_id",          :limit => 8
   end
 
-  add_index "group_of_lines_lines", ["group_of_line_id"], :name => "idx_grli_gr"
-  add_index "group_of_lines_lines", ["line_id"], :name => "idx_grli_li"
-
   create_table "import_log_messages", :force => true do |t|
     t.integer  "import_id"
     t.string   "key"
@@ -259,11 +264,10 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
   add_index "journey_patterns", ["objectid"], :name => "journey_patterns_objectid_key", :unique => true
 
   create_table "journey_patterns_stop_points", :id => false, :force => true do |t|
-    t.integer "journey_pattern_id", :limit => 8, :null => false
-    t.integer "stop_point_id",      :limit => 8, :null => false
+    t.integer "journey_pattern_id", :limit => 8
+    t.integer "stop_point_id",      :limit => 8
   end
 
-  add_index "journey_patterns_stop_points", ["journey_pattern_id"], :name => "idx_jpsp_jpid"
   add_index "journey_patterns_stop_points", ["journey_pattern_id"], :name => "index_journey_pattern_id_on_journey_patterns_stop_points"
 
   create_table "lines", :force => true do |t|
@@ -326,8 +330,8 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
     t.datetime "updated_at"
     t.string   "prefix"
     t.string   "projection_type"
-    t.string   "bounding_box",    :limit => nil
     t.string   "time_zone"
+    t.string   "the_geom"
     t.string   "bounds"
   end
 
@@ -353,8 +357,13 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
     t.integer "line_id",      :limit => 8
   end
 
-  add_index "routing_constraints_lines", ["line_id"], :name => "idx_rcli_li"
-  add_index "routing_constraints_lines", ["stop_area_id"], :name => "idx_rcli_st"
+  create_table "spatial_ref_sys", :id => false, :force => true do |t|
+    t.integer "srid",                      :null => false
+    t.string  "auth_name", :limit => 256
+    t.integer "auth_srid"
+    t.string  "srtext",    :limit => 2048
+    t.string  "proj4text", :limit => 2048
+  end
 
   create_table "stop_areas", :force => true do |t|
     t.integer  "parent_id",           :limit => 8
@@ -442,8 +451,8 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
   add_index "time_tables", ["objectid"], :name => "time_tables_objectid_key", :unique => true
 
   create_table "time_tables_vehicle_journeys", :id => false, :force => true do |t|
-    t.integer "time_table_id",      :limit => 8, :null => false
-    t.integer "vehicle_journey_id", :limit => 8, :null => false
+    t.integer "time_table_id",      :limit => 8
+    t.integer "vehicle_journey_id", :limit => 8
   end
 
   add_index "time_tables_vehicle_journeys", ["time_table_id"], :name => "index_time_tables_vehicle_journeys_on_time_table_id"
@@ -477,12 +486,8 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
     t.time    "waiting_time"
     t.time    "elapse_duration"
     t.time    "headway_frequency"
-    t.integer "position",                       :limit => 8
-    t.boolean "is_departure",                                :default => false
-    t.boolean "is_arrival",                                  :default => false
   end
 
-  add_index "vehicle_journey_at_stops", ["stop_point_id"], :name => "index_vehicle_journey_at_stops_on_stop_point_id"
   add_index "vehicle_journey_at_stops", ["stop_point_id"], :name => "index_vehicle_journey_at_stops_on_stop_pointid"
   add_index "vehicle_journey_at_stops", ["vehicle_journey_id"], :name => "index_vehicle_journey_at_stops_on_vehicle_journey_id"