remove projection attributes from stop areas and access points in database

3 files changed, 48 insertions, 28 deletions

diff --git a/db/migrate/20130628130527_remove_projection_from_stop_areas.ninoxe_engine.rb b/db/migrate/20130628130527_remove_projection_from_stop_areas.ninoxe_engine.rb
new file mode 100644
index 000000000..3eb30a601
--- /dev/null
+++ b/db/migrate/20130628130527_remove_projection_from_stop_areas.ninoxe_engine.rb
@@ -0,0 +1,14 @@
+# This migration comes from ninoxe_engine (originally 20130628124932)
+class RemoveProjectionFromStopAreas < ActiveRecord::Migration
+  def up
+    remove_column :stop_areas, :x
+    remove_column :stop_areas, :y
+    remove_column :stop_areas, :projection_type
+  end
+
+  def down
+    add_column :stop_areas, :x, :decimal,:precision => 19, :scale => 2
+    add_column :stop_areas, :y, :decimal,:precision => 19, :scale => 2
+    add_column :stop_areas, :projection_type, :string
+  end
+end
diff --git a/db/migrate/20130628130528_remove_projection_from_access_points.ninoxe_engine.rb b/db/migrate/20130628130528_remove_projection_from_access_points.ninoxe_engine.rb
new file mode 100644
index 000000000..f0640a623
--- /dev/null
+++ b/db/migrate/20130628130528_remove_projection_from_access_points.ninoxe_engine.rb
@@ -0,0 +1,14 @@
+# This migration comes from ninoxe_engine (originally 20130628124951)
+class RemoveProjectionFromAccessPoints < ActiveRecord::Migration
+  def up
+    remove_column :access_points, :x
+    remove_column :access_points, :y
+    remove_column :access_points, :projection_type
+  end
+
+  def down
+    add_column :access_points, :x, :decimal,:precision => 19, :scale => 2
+    add_column :access_points, :y, :decimal,:precision => 19, :scale => 2
+    add_column :access_points, :projection_type, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6afe49f71..f8bbe06f3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130517090647) do
+ActiveRecord::Schema.define(:version => 20130628130528) do
 
   create_table "access_links", :force => true do |t|
     t.integer  "access_point_id",                        :limit => 8
@@ -46,9 +46,6 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
     t.decimal  "longitude",                                    :precision => 19, :scale => 16
     t.decimal  "latitude",                                     :precision => 19, :scale => 16
     t.string   "long_lat_type"
-    t.decimal  "x",                                            :precision => 19, :scale => 2
-    t.decimal  "y",                                            :precision => 19, :scale => 2
-    t.string   "projection_type"
     t.string   "country_code"
     t.string   "street_name"
     t.string   "contained_in"
@@ -63,13 +60,12 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
 
   add_index "access_points", ["objectid"], :name => "access_points_objectid_key", :unique => true
 
-  create_table "api_keys", :id => false, :force => true do |t|
-    t.integer  "id",             :limit => 8
+  create_table "api_keys", :force => true do |t|
     t.integer  "referential_id"
     t.string   "token"
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
   end
 
   create_table "companies", :force => true do |t|
@@ -124,8 +120,8 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
     t.datetime "failed_at"
     t.string   "locked_by"
     t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
   end
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
@@ -136,8 +132,8 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
     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 "export_log_messages", ["export_id"], :name => "index_export_log_messages_on_export_id"
@@ -147,8 +143,8 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
     t.string   "status"
     t.string   "type"
     t.string   "options"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                   :null => false
+    t.datetime "updated_at",                   :null => false
     t.string   "references_type"
     t.string   "reference_ids"
   end
@@ -230,8 +226,8 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
     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 "import_log_messages", ["import_id"], :name => "index_import_log_messages_on_import_id"
@@ -239,8 +235,8 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
   create_table "imports", :force => true do |t|
     t.integer  "referential_id", :limit => 8
     t.string   "status"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
     t.string   "type"
     t.string   "options"
     t.string   "file_type"
@@ -311,9 +307,8 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
 
   create_table "organisations", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-    t.string   "geoportail_key"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "pt_links", :force => true do |t|
@@ -334,8 +329,8 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
   create_table "referentials", :force => true do |t|
     t.string   "name"
     t.string   "slug"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                   :null => false
+    t.datetime "updated_at",                   :null => false
     t.string   "prefix"
     t.string   "projection_type"
     t.string   "time_zone"
@@ -380,9 +375,6 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
     t.decimal  "longitude",                        :precision => 19, :scale => 16
     t.decimal  "latitude",                         :precision => 19, :scale => 16
     t.string   "long_lat_type"
-    t.decimal  "x",                                :precision => 19, :scale => 2
-    t.decimal  "y",                                :precision => 19, :scale => 2
-    t.string   "projection_type"
     t.string   "country_code"
     t.string   "street_name"
   end
@@ -471,8 +463,8 @@ ActiveRecord::Schema.define(:version => 20130517090647) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                           :null => false
+    t.datetime "updated_at",                                           :null => false
     t.integer  "organisation_id"
     t.string   "name"
     t.string   "confirmation_token"