diff --git a/.gitignore b/.gitignore index 5d0dbeb..c12c19b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ bundled_gems/ vendor/ examples/db/*.db examples/config/database.yml +db/config.yml diff --git a/db/config.yml b/db/config.yml deleted file mode 100644 index 5c18b6e..0000000 --- a/db/config.yml +++ /dev/null @@ -1,26 +0,0 @@ -mysql: - adapter: mysql - database: database_cleaner_test - username: root - password: - host: 127.0.0.1 - port: 3306 - encoding: utf8 - -mysql2: - adapter: mysql - database: database_cleaner_test - username: root - password: - host: 127.0.0.1 - port: 3306 - encoding: utf8 - -postgres: - adapter: postgresql - database: database_cleaner_test - username: postgres - password: - host: 127.0.0.1 - encoding: unicode - template: template0 diff --git a/db/sample.config.yml b/db/sample.config.yml index e0f9c8d..5c18b6e 100644 --- a/db/sample.config.yml +++ b/db/sample.config.yml @@ -1,13 +1,26 @@ -mysql_test: - adapter: mysql2 +mysql: + adapter: mysql database: database_cleaner_test username: root password: host: 127.0.0.1 port: 3306 + encoding: utf8 -postgres_test: - adapter: postgresql +mysql2: + adapter: mysql database: database_cleaner_test username: root password: + host: 127.0.0.1 + port: 3306 + encoding: utf8 + +postgres: + adapter: postgresql + database: database_cleaner_test + username: postgres + password: + host: 127.0.0.1 + encoding: unicode + template: template0