aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorSteve Agalloco <steve.agalloco@gmail.com>2009-12-30 01:05:30 -0500
committerJosé Valim <jose.valim@gmail.com>2010-01-03 00:47:01 +0100
commitc3d19eb950578ff4a20692bd1b20ee074789818e (patch)
tree4f4a38c8d765eefeef11027aaf7d3b71086411af /railties/lib/rails/generators
parent8e57deed8b4efad6ea1c551f415b74596111f890 (diff)
downloadrails-c3d19eb950578ff4a20692bd1b20ee074789818e.tar.gz
rails-c3d19eb950578ff4a20692bd1b20ee074789818e.tar.bz2
rails-c3d19eb950578ff4a20692bd1b20ee074789818e.zip
app_generator option should be skip_activerecord not no_activerecord
(Thor actually accepts both, the patch was applied to improve readability) Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index ee401b1fde..0073c6ba26 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -46,7 +46,7 @@ module Rails::Generators
def initialize(*args)
super
- if !options[:no_activerecord] && !DATABASES.include?(options[:database])
+ if !options[:skip_activerecord] && !DATABASES.include?(options[:database])
raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}."
end
end