Permalink
Browse files

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
  • Loading branch information...
1 parent f6379bf commit 2556e674035a416cb98a336d96e7a5ea3d496ab6 @jeremy jeremy committed Dec 21, 2007
Showing with 4 additions and 3 deletions.
  1. +4 −3 railties/lib/rails_generator/generators/applications/app/app_generator.rb
View
7 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 @@ def add_options!(opt)
"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",

0 comments on commit 2556e67

Please sign in to comment.