From 5c44f046335e7964e308ab23a7d1098c7d0ffb56 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 2 Apr 2014 14:08:48 +0200 Subject: [PATCH] Updated, moved to mysql for development. --- config/database.yml.dist | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/config/database.yml.dist b/config/database.yml.dist index 3761ad512..a86d68e41 100644 --- a/config/database.yml.dist +++ b/config/database.yml.dist @@ -8,20 +8,24 @@ production: password: some_pass host: 127.0.0.1 +development: + adapter: mysql2 + database: zammad_development + pool: 50 + timeout: 5000 + encoding: utf8 + username: some_user + password: some_pass + host: 127.0.0.1 + +# 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. # SQLite version 3.x # gem install sqlite3 # # Ensure the SQLite 3 gem is defined in your Gemfile # gem 'sqlite3' -development: - adapter: sqlite3 - database: db/development.sqlite3 - timeout: 5000 - pool: 50 - -# 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: adapter: sqlite3 database: db/test.sqlite3