From 1befc5e2a561ea5e18ca58026392df67214b5716 Mon Sep 17 00:00:00 2001 From: Adam Krawiec Date: Sat, 4 Mar 2017 16:53:55 -0600 Subject: [PATCH 1/2] ensure school has _id --- .../20170304200019_update_coords_to_floats.rb | 3 +-- db/migrate/20170304225055_add_id_to_schools.rb | 4 ++++ db/schema.rb | 13 ++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20170304225055_add_id_to_schools.rb diff --git a/db/migrate/20170304200019_update_coords_to_floats.rb b/db/migrate/20170304200019_update_coords_to_floats.rb index e6b574c..95b7d1e 100644 --- a/db/migrate/20170304200019_update_coords_to_floats.rb +++ b/db/migrate/20170304200019_update_coords_to_floats.rb @@ -1,6 +1,5 @@ class UpdateCoordsToFloats < ActiveRecord::Migration[5.0] def change - change_column :gas_well_inspections, :x, :float - change_column :gas_well_inspections, :y, :float + add_column :schools, :_id, :integer end end diff --git a/db/migrate/20170304225055_add_id_to_schools.rb b/db/migrate/20170304225055_add_id_to_schools.rb new file mode 100644 index 0000000..3acb3f9 --- /dev/null +++ b/db/migrate/20170304225055_add_id_to_schools.rb @@ -0,0 +1,4 @@ +class AddIdToSchools < ActiveRecord::Migration[5.0] + def change + end +end diff --git a/db/schema.rb b/db/schema.rb index 45f49e0..b646e82 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170304200019) do +ActiveRecord::Schema.define(version: 20170304225055) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,6 +41,16 @@ t.integer "longitude" end + create_table "crimes", force: :cascade do |t| + t.integer "_id" + t.string "crime" + t.string "locname" + t.datetime "incidentdatetime" + t.string "publicadress" + t.string "agency" + t.string "accuracy" + end + create_table "demographics", force: :cascade do |t| t.integer "_id" t.integer "year" @@ -111,6 +121,7 @@ end create_table "schools", force: :cascade do |t| + t.integer "_id" t.integer "objectid" t.float "gis_nr_sde_schools_area" t.float "perimeter" From 5c9b8062d6658631d1287f7aac54590447af262a Mon Sep 17 00:00:00 2001 From: Adam Krawiec Date: Sat, 4 Mar 2017 16:59:10 -0600 Subject: [PATCH 2/2] revert changes --- db/migrate/20170304200019_update_coords_to_floats.rb | 3 ++- db/migrate/20170304225055_add_id_to_schools.rb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/db/migrate/20170304200019_update_coords_to_floats.rb b/db/migrate/20170304200019_update_coords_to_floats.rb index 95b7d1e..e6b574c 100644 --- a/db/migrate/20170304200019_update_coords_to_floats.rb +++ b/db/migrate/20170304200019_update_coords_to_floats.rb @@ -1,5 +1,6 @@ class UpdateCoordsToFloats < ActiveRecord::Migration[5.0] def change - add_column :schools, :_id, :integer + change_column :gas_well_inspections, :x, :float + change_column :gas_well_inspections, :y, :float end end diff --git a/db/migrate/20170304225055_add_id_to_schools.rb b/db/migrate/20170304225055_add_id_to_schools.rb index 3acb3f9..457db33 100644 --- a/db/migrate/20170304225055_add_id_to_schools.rb +++ b/db/migrate/20170304225055_add_id_to_schools.rb @@ -1,4 +1,5 @@ class AddIdToSchools < ActiveRecord::Migration[5.0] def change + add_column :schools, :_id, :integer end end