aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-12-21 03:39:25 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-12-21 03:39:25 +0000
commit2556e674035a416cb98a336d96e7a5ea3d496ab6 (patch)
tree9ee715a60a6f42f3e88d6ddfd0eb41426e2a5a61 /railties
parentf6379bfe154087bf93e1546bb7626941c77e9da7 (diff)
downloadrails-2556e674035a416cb98a336d96e7a5ea3d496ab6.tar.gz
rails-2556e674035a416cb98a336d96e7a5ea3d496ab6.tar.bz2
rails-2556e674035a416cb98a336d96e7a5ea3d496ab6.zip
App generate says sqlite3 is the default and mentions frontbase. Closes #10550 [Cheah Chu Yeow, Will Cannings]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8457 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails_generator/generators/applications/app/app_generator.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 1dd72f349a..473ead2a7c 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -7,8 +7,9 @@ class AppGenerator < Rails::Generator::Base
Config::CONFIG['ruby_install_name'])
DATABASES = %w(mysql oracle postgresql sqlite2 sqlite3 frontbase)
+ DEFAULT_DATABASE = 'sqlite3'
- default_options :db => (ENV["RAILS_DEFAULT_DATABASE"] || "sqlite3"),
+ default_options :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),
:shebang => DEFAULT_SHEBANG, :freeze => false
mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
@@ -119,8 +120,8 @@ class AppGenerator < Rails::Generator::Base
"Default: #{DEFAULT_SHEBANG}") { |v| options[:shebang] = v }
opt.on("-d", "--database=name", String,
- "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).",
- "Default: mysql") { |v| options[:db] = v }
+ "Preconfigure for selected database (options: #{DATABASES.join('/')}).",
+ "Default: #{DEFAULT_DATABASE}") { |v| options[:db] = v }
opt.on("-f", "--freeze",
"Freeze Rails in vendor/rails from the gems generating the skeleton",