Db config

This commit is contained in:
bmv root 2017-02-02 12:19:28 -05:00
parent f76c3a9e2c
commit 72fe53bff2
2 changed files with 6 additions and 19 deletions

View File

@ -34,12 +34,6 @@ stats_test:
development: development:
<<: *default <<: *default
database: Pearlception_development 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 # Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake". # re-generated from your development database when you run "rake".
@ -47,12 +41,6 @@ development:
test: test:
<<: *default <<: *default
database: Pearlception_test 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, # 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 # like your database password, in your source code. If your source code is

View File

@ -22,8 +22,7 @@ ActiveRecord::Schema.define(version: 20170119161737) do
create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t| create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
t.string "email", default: "", null: false t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false t.string "encrypted_password", default: "", null: false
t.integer "company_id", null: false t.integer "company_id", default: -1, null: false
t.boolean "admin", default: false, null: false
t.string "reset_password_token" t.string "reset_password_token"
t.datetime "reset_password_sent_at" t.datetime "reset_password_sent_at"
t.datetime "remember_created_at" t.datetime "remember_created_at"