From 290983be3114cd48f63265466abb57b15cbfb8f5 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 25 Feb 2006 18:41:13 +0000 Subject: Added -d/--database option to the rails command, so you can do "rails --database=sqlite2 myapp" to start a new application preconfigured to use SQLite2 as the database. Removed the configuration examples from SQLite and PostgreSQL from the default MySQL configuration [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3642 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/configs/databases/mysql.yml | 47 +++++++++++++++++++++++++++++++ railties/configs/databases/postgresql.yml | 44 +++++++++++++++++++++++++++++ railties/configs/databases/sqlite2.yml | 16 +++++++++++ railties/configs/databases/sqlite3.yml | 16 +++++++++++ 4 files changed, 123 insertions(+) create mode 100644 railties/configs/databases/mysql.yml create mode 100644 railties/configs/databases/postgresql.yml create mode 100644 railties/configs/databases/sqlite2.yml create mode 100644 railties/configs/databases/sqlite3.yml (limited to 'railties/configs/databases') diff --git a/railties/configs/databases/mysql.yml b/railties/configs/databases/mysql.yml new file mode 100644 index 0000000000..13a54b3cd7 --- /dev/null +++ b/railties/configs/databases/mysql.yml @@ -0,0 +1,47 @@ +# MySQL (default setup). Versions 4.1 and 5.0 are recommended. +# +# Install the MySQL driver: +# gem install mysql +# On MacOS X: +# gem install mysql -- --include=/usr/local/lib +# On Windows: +# There is no gem for Windows. Install mysql.so from RubyForApache. +# http://rubyforge.org/projects/rubyforapache +# +# And be sure to use new-style password hashing: +# http://dev.mysql.com/doc/refman/5.0/en/old-client.html +development: + adapter: mysql + database: <%= app_name %>_development + username: root + password: +<% if socket -%> + socket: <%= socket %> +<% else -%> + host: localhost +<% end -%> + +# 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 + database: <%= app_name %>_test + username: root + password: +<% if socket -%> + socket: <%= socket %> +<% else -%> + host: localhost +<% end -%> + +production: + adapter: mysql + database: <%= app_name %>_production + username: root + password: +<% if socket -%> + socket: <%= socket %> +<% else -%> + host: localhost +<% end -%> \ No newline at end of file diff --git a/railties/configs/databases/postgresql.yml b/railties/configs/databases/postgresql.yml new file mode 100644 index 0000000000..3c146c13a1 --- /dev/null +++ b/railties/configs/databases/postgresql.yml @@ -0,0 +1,44 @@ +# PostgreSQL versions 7.4 - 8.1 +# +# Get the C bindings: +# gem install postgres +# or use the pure-Ruby bindings on Windows: +# gem install postgres-pr +development: + adapter: postgresql + database: <%= app_name %>_development + username: <%= app_name %> + 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 + + # Character set encoding. The server defaults to sql_ascii. + #encoding: UTF8 + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # info, notice, warning, error, log, fatal, or 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 + database: <%= app_name %>_test + username: <%= app_name %> + password: + +production: + adapter: postgresql + database: <%= app_name %>_production + username: <%= app_name %> + password: diff --git a/railties/configs/databases/sqlite2.yml b/railties/configs/databases/sqlite2.yml new file mode 100644 index 0000000000..92550d4647 --- /dev/null +++ b/railties/configs/databases/sqlite2.yml @@ -0,0 +1,16 @@ +# SQLite version 2.x +# gem install sqlite-ruby +development: + adapter: sqlite + database: db/development.sqlite2 + +# 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: sqlite + database: ":memory:" + +production: + adapter: sqlite + database: db/production.sqlite2 diff --git a/railties/configs/databases/sqlite3.yml b/railties/configs/databases/sqlite3.yml new file mode 100644 index 0000000000..bd06c0876e --- /dev/null +++ b/railties/configs/databases/sqlite3.yml @@ -0,0 +1,16 @@ +# SQLite version 3.x +# gem install sqlite3-ruby +development: + adapter: sqlite3 + database: db/development.sqlite3 + +# 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: ":memory:" + +production: + adapter: sqlite3 + database: db/production.sqlite3 -- cgit v1.2.3