diff options
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | db/schema.rb | 35 |
2 files changed, 30 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 63ab2fda8..e7072b52e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,6 +70,7 @@ GEM remote: http://rubygems.org/ specs: GeoRuby (1.3.4) + RedCloth (4.2.9) RedCloth (4.2.9-java) SyslogLogger (1.4.1) actionmailer (3.2.6) @@ -105,6 +106,7 @@ GEM acts_as_list (0.1.6) addressable (2.2.8) arel (3.0.2) + bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-java) bouncy-castle-java (1.5.0146.1) builder (3.0.0) @@ -158,6 +160,7 @@ GEM factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) + ffi (1.0.11) ffi (1.0.11-java) ffi-geos (0.0.6) ffi (>= 1.0.0) @@ -194,6 +197,8 @@ GEM jruby-rack (>= 1.1.1) json (1.7.5-java) json_pure (1.7.5) + launchy (2.1.0) + addressable (~> 2.2.6) launchy (2.1.0-java) addressable (~> 2.2.6) ffi (~> 1.0.9) @@ -219,6 +224,7 @@ GEM net-ssh (2.5.2) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) + nokogiri (1.5.5) nokogiri (1.5.5-java) orm_adapter (0.4.0) polyamorous (0.5.0) diff --git a/db/schema.rb b/db/schema.rb index 061b2d6d6..044415bce 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -176,14 +176,16 @@ ActiveRecord::Schema.define(:version => 20120830095442) 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", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" end add_index "file_validation_log_messages", ["file_validation_id"], :name => "index_file_validation_log_messages_on_file_validation_id" @@ -193,8 +195,8 @@ ActiveRecord::Schema.define(:version => 20120830095442) do t.string "options", :limit => 2000 t.string "file_name" t.string "file_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" end create_table "group_of_lines", :force => true do |t| @@ -209,10 +211,13 @@ ActiveRecord::Schema.define(:version => 20120830095442) 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 - t.integer "line_id", :limit => 8 + t.integer "group_of_line_id", :limit => 8, :null => false + t.integer "line_id", :limit => 8, :null => false 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" @@ -254,10 +259,11 @@ ActiveRecord::Schema.define(:version => 20120830095442) 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 - t.integer "stop_point_id", :limit => 8 + t.integer "journey_pattern_id", :limit => 8, :null => false + t.integer "stop_point_id", :limit => 8, :null => false 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,6 +332,7 @@ ActiveRecord::Schema.define(:version => 20120830095442) do t.datetime "updated_at" t.string "prefix" t.string "projection_type" + t.string "bounding_box", :limit => nil t.string "time_zone" t.string "bounds" t.integer "organisation_id" @@ -353,6 +360,9 @@ ActiveRecord::Schema.define(:version => 20120830095442) 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 "stop_areas", :force => true do |t| t.integer "parent_id", :limit => 8 t.string "objectid", :null => false @@ -439,8 +449,8 @@ ActiveRecord::Schema.define(:version => 20120830095442) 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 - t.integer "vehicle_journey_id", :limit => 8 + t.integer "time_table_id", :limit => 8, :null => false + t.integer "vehicle_journey_id", :limit => 8, :null => false end add_index "time_tables_vehicle_journeys", ["time_table_id"], :name => "index_time_tables_vehicle_journeys_on_time_table_id" @@ -461,7 +471,6 @@ ActiveRecord::Schema.define(:version => 20120830095442) do t.datetime "updated_at" t.integer "organisation_id" t.string "name" - t.string "password_salt" t.string "confirmation_token" t.datetime "confirmed_at" t.datetime "confirmation_sent_at" @@ -491,8 +500,12 @@ ActiveRecord::Schema.define(:version => 20120830095442) 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" |