Merge branch 'update-config-db' of nicolas/mmsc_app into master
This commit is contained in:
commit
c72ca9e5ed
@ -7,7 +7,6 @@
|
||||
default: &default
|
||||
adapter: mysql2
|
||||
encoding: utf8mb4
|
||||
database: mmsc_app
|
||||
pool: 5
|
||||
timeout: 5000
|
||||
variables:
|
||||
@ -15,15 +14,16 @@ default: &default
|
||||
|
||||
development:
|
||||
<<: *default
|
||||
database: mmsc_app_development
|
||||
username: root
|
||||
socket: /tmp/mysql.sock
|
||||
|
||||
# Warning: The database defined as "test" will be erased and
|
||||
# re-generated from your development database when you run "rake".
|
||||
# Do not set this db to the same as development or production.
|
||||
test:
|
||||
<<: *default
|
||||
database: db/test.sqlite3
|
||||
database: mmsc_app_test
|
||||
username: root
|
||||
|
||||
production:
|
||||
<<: *default
|
||||
|
344
db/schema.rb
344
db/schema.rb
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user