From 024bd260a7bb8df08844bd2ea3d9bdc3b3289fff Mon Sep 17 00:00:00 2001 From: hukl Date: Thu, 26 Feb 2009 10:52:42 +0100 Subject: renamed the sample files --- config/database.mysql-sample.yml | 45 ++++++++++++++++++++++++++++++ config/database.psql-sample.yml | 51 ++++++++++++++++++++++++++++++++++ config/database.sqlite3-sample.yml | 22 +++++++++++++++ config/database.yml-mysql-sample.yml | 45 ------------------------------ config/database.yml-psql-sample.yml | 51 ---------------------------------- config/database.yml-sqlite3-sample.yml | 22 --------------- 6 files changed, 118 insertions(+), 118 deletions(-) create mode 100644 config/database.mysql-sample.yml create mode 100644 config/database.psql-sample.yml create mode 100644 config/database.sqlite3-sample.yml delete mode 100644 config/database.yml-mysql-sample.yml delete mode 100644 config/database.yml-psql-sample.yml delete mode 100644 config/database.yml-sqlite3-sample.yml diff --git a/config/database.mysql-sample.yml b/config/database.mysql-sample.yml new file mode 100644 index 0000000..bdb5311 --- /dev/null +++ b/config/database.mysql-sample.yml @@ -0,0 +1,45 @@ +# MySQL. Versions 4.1 and 5.0 are recommended. +# +# Install the MySQL driver: +# gem install mysql +# On Mac OS X: +# sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql +# On Mac OS X Leopard: +# sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config +# This sets the ARCHFLAGS environment variable to your native architecture +# On Windows: +# gem install mysql +# Choose the win32 build. +# Install MySQL and put its /bin directory on your path. +# +# And be sure to use new-style password hashing: +# http://dev.mysql.com/doc/refman/5.0/en/old-client.html +development: + adapter: mysql + encoding: utf8 + database: mysql_development + pool: 5 + username: root + password: + socket: /opt/local/var/run/mysql5/mysqld.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 + database: mysql_test + pool: 5 + username: root + password: + socket: /opt/local/var/run/mysql5/mysqld.sock + +production: + adapter: mysql + encoding: utf8 + database: mysql_production + pool: 5 + username: root + password: + socket: /opt/local/var/run/mysql5/mysqld.sock diff --git a/config/database.psql-sample.yml b/config/database.psql-sample.yml new file mode 100644 index 0000000..db7276e --- /dev/null +++ b/config/database.psql-sample.yml @@ -0,0 +1,51 @@ +# PostgreSQL. Versions 7.4 and 8.x are supported. +# +# Install the ruby-postgres driver: +# gem install ruby-postgres +# On Mac OS X: +# gem install ruby-postgres -- --include=/usr/local/pgsql +# On Windows: +# gem install ruby-postgres +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +development: + adapter: postgresql + encoding: unicode + database: psql_development + pool: 5 + username: psql + password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # The server defaults to notice. + #min_messages: warning + +# 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: postgresql + encoding: unicode + database: psql_test + pool: 5 + username: psql + password: + +production: + adapter: postgresql + encoding: unicode + database: psql_production + pool: 5 + username: psql + password: diff --git a/config/database.sqlite3-sample.yml b/config/database.sqlite3-sample.yml new file mode 100644 index 0000000..025d62a --- /dev/null +++ b/config/database.sqlite3-sample.yml @@ -0,0 +1,22 @@ +# SQLite version 3.x +# gem install sqlite3-ruby (not necessary on OS X Leopard) +development: + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 + +# 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 + pool: 5 + timeout: 5000 + +production: + adapter: sqlite3 + database: db/production.sqlite3 + pool: 5 + timeout: 5000 diff --git a/config/database.yml-mysql-sample.yml b/config/database.yml-mysql-sample.yml deleted file mode 100644 index bdb5311..0000000 --- a/config/database.yml-mysql-sample.yml +++ /dev/null @@ -1,45 +0,0 @@ -# MySQL. Versions 4.1 and 5.0 are recommended. -# -# Install the MySQL driver: -# gem install mysql -# On Mac OS X: -# sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql -# On Mac OS X Leopard: -# sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config -# This sets the ARCHFLAGS environment variable to your native architecture -# On Windows: -# gem install mysql -# Choose the win32 build. -# Install MySQL and put its /bin directory on your path. -# -# And be sure to use new-style password hashing: -# http://dev.mysql.com/doc/refman/5.0/en/old-client.html -development: - adapter: mysql - encoding: utf8 - database: mysql_development - pool: 5 - username: root - password: - socket: /opt/local/var/run/mysql5/mysqld.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 - database: mysql_test - pool: 5 - username: root - password: - socket: /opt/local/var/run/mysql5/mysqld.sock - -production: - adapter: mysql - encoding: utf8 - database: mysql_production - pool: 5 - username: root - password: - socket: /opt/local/var/run/mysql5/mysqld.sock diff --git a/config/database.yml-psql-sample.yml b/config/database.yml-psql-sample.yml deleted file mode 100644 index db7276e..0000000 --- a/config/database.yml-psql-sample.yml +++ /dev/null @@ -1,51 +0,0 @@ -# PostgreSQL. Versions 7.4 and 8.x are supported. -# -# Install the ruby-postgres driver: -# gem install ruby-postgres -# On Mac OS X: -# gem install ruby-postgres -- --include=/usr/local/pgsql -# On Windows: -# gem install ruby-postgres -# Choose the win32 build. -# Install PostgreSQL and put its /bin directory on your path. -development: - adapter: postgresql - encoding: unicode - database: psql_development - pool: 5 - username: psql - password: - - # Connect on a TCP socket. Omitted by default since the client uses a - # domain socket that doesn't need configuration. Windows does not have - # domain sockets, so uncomment these lines. - #host: localhost - #port: 5432 - - # Schema search path. The server defaults to $user,public - #schema_search_path: myapp,sharedapp,public - - # Minimum log levels, in increasing order: - # debug5, debug4, debug3, debug2, debug1, - # log, notice, warning, error, fatal, and panic - # The server defaults to notice. - #min_messages: warning - -# 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: postgresql - encoding: unicode - database: psql_test - pool: 5 - username: psql - password: - -production: - adapter: postgresql - encoding: unicode - database: psql_production - pool: 5 - username: psql - password: diff --git a/config/database.yml-sqlite3-sample.yml b/config/database.yml-sqlite3-sample.yml deleted file mode 100644 index 025d62a..0000000 --- a/config/database.yml-sqlite3-sample.yml +++ /dev/null @@ -1,22 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3-ruby (not necessary on OS X Leopard) -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# 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 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 -- cgit v1.3