Merge pull request #173 from dxw/database

Define database names in config rather than ENVs

.env.example

@@ -9,8 +9,6 @@
 ROLLBAR_ACCESS_TOKEN=ROLLBAR_ACCESS_TOKEN
 ROLLBAR_ENV=development
 
-DATABASE_URL=postgres://postgres@localhost:5432/air-text-development
-
 # TODO: Replace `example.com` with the canonical hostname of the app
 CANONICAL_HOSTNAME=example.com
 

.env.test

@@ -5,9 +5,6 @@
 #
 # Reference=https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
 
-DATABASE_URL=postgres://postgres@localhost:5432/air-text-test
-HOSTNAME=localhost
-
 CERC_FORECAST_API_HOST_URL=https://cerc.example.com
 CERC_FORECAST_API_KEY=SECRET-API-KEY
 CERC_FORECAST_API_CACHE_LIMIT_MINS=60

config/database.yml

@@ -6,9 +6,11 @@ default: &default
   pool: <%= Integer(ENV.fetch('RAILS_MAX_THREADS') { 5 }) %>
 
 development:
+  database: air-text_development
   <<: *default
 
 test:
+  database: air-text_test
   <<: *default
 
 production:

db/schema.rb

@@ -45,8 +45,6 @@
     t.integer "cerc_type", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.float "latitude"
-    t.float "longitude"
     t.uuid "zone_group_id"
     t.index ["cerc_id"], name: "index_zones_on_cerc_id", unique: true
     t.index ["zone_group_id"], name: "index_zones_on_zone_group_id"