doc/demo/config/database.yml in acts_as_ferret-0.5.2 vs doc/demo/config/database.yml in acts_as_ferret-0.5.3

- old
+ new

@@ -1,38 +1,30 @@ -# MySQL (default setup). Versions 4.1 and 5.0 are recommended. +# MySQL. Versions 4.1 and 5.0 are recommended. # -# Get the fast C bindings: -# gem install mysql -# (on OS X: gem install mysql -- --include=/usr/local/lib) +# Install the MySQL driver: +# gem install mysql2 +# # And be sure to use new-style password hashing: # http://dev.mysql.com/doc/refman/5.0/en/old-client.html -# -# mysql config development: adapter: mysql + encoding: utf8 + reconnect: false database: aaf_dev + pool: 5 username: ferret password: ferret - + 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: adapter: mysql + encoding: utf8 + reconnect: false database: aaf_test + pool: 5 username: ferret password: ferret - -# since this is a demo, we won't need this one -#production: -# adapter: mysql -# database: ferret_production -# username: root -# password: -# socket: /var/run/mysqld/mysqld.sock - -# SQLITE -#development: -# adapter: sqlite3 -# dbfile: db/dev.sqlite - -#test: -# adapter: sqlite3 -# dbfile: db/test.sqlite + socket: /tmp/mysql.sock