From 72fe53bff2b5468c5e272c437ccfff600ca2aaf3 Mon Sep 17 00:00:00 2001
From: bmv root <bmv@example.com>
Date: Thu, 2 Feb 2017 12:19:28 -0500
Subject: [PATCH] Db config

---
 Pearlception/config/database.yml | 12 ------------
 Pearlception/db/schema.rb        | 13 ++++++-------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/Pearlception/config/database.yml b/Pearlception/config/database.yml
index 5c38342..07430f8 100644
--- a/Pearlception/config/database.yml
+++ b/Pearlception/config/database.yml
@@ -34,12 +34,6 @@ stats_test:
 development:
   <<: *default
   database: Pearlception_development
-  username: <%= ENV['DEV_DB_USER'] %>
-  password: <%= ENV['DEV_DB_PASS'] %>
-  #host: <%= ENV['DEV_DB_URL'] %>
-  host: localhost
-  port: 3306
-  #database: main
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -47,12 +41,6 @@ development:
 test:
   <<: *default
   database: Pearlception_test
-  username: <%= ENV['DEV_DB_USER'] %>
-  password: <%= ENV['DEV_DB_PASS'] %>
-  #host: <%= ENV['DEV_DB_URL'] %>
-  host: localhost
-  port: 3306
-  #database: main
 
 # As with config/secrets.yml, you never want to store sensitive information,
 # like your database password, in your source code. If your source code is
diff --git a/Pearlception/db/schema.rb b/Pearlception/db/schema.rb
index bb71542..d7f0285 100644
--- a/Pearlception/db/schema.rb
+++ b/Pearlception/db/schema.rb
@@ -20,20 +20,19 @@ ActiveRecord::Schema.define(version: 20170119161737) do
   end
 
   create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "email",                  default: "",    null: false
-    t.string   "encrypted_password",     default: "",    null: false
-    t.integer  "company_id",                             null: false
-    t.boolean  "admin",                  default: false, null: false
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
+    t.integer  "company_id",             default: -1, null: false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,     null: false
+    t.integer  "sign_in_count",          default: 0,  null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.datetime "created_at",                             null: false
-    t.datetime "updated_at",                             null: false
+    t.datetime "created_at",                          null: false
+    t.datetime "updated_at",                          null: false
     t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
   end