kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #36603 from y-yagi/add_skip_collision_check_option

Browse source 
Add `skip-collision-check` option to generator
This commit is contained in:
Yuji Yaginuma 2019-07-18 07:17:47 +09:00 committed by GitHub
commit c5a24c8ebb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
railties/lib/rails/generators/base.rb
View file

@ -20,6 +20,8 @@ module Rails
class_option :skip_namespace, type: :boolean, default: false,
desc: "Skip namespace (affects only isolated applications)"
class_option :skip_collision_check, type: :boolean, default: false,
desc: "Skip collision check"
add_runtime_options!
strict_args_position!
@ -249,6 +251,7 @@ module Rails
# application or Ruby on Rails.
def class_collisions(*class_names)
return unless behavior == :invoke
return if options.skip_collision_check?
class_names.flatten.each do |class_name|
class_name = class_name.to_s
@ -261,8 +264,8 @@ module Rails
if last && last.const_defined?(last_name.camelize, false)
raise Error, "The name '#{class_name}' is either already used in your application " \
"or reserved by Ruby on Rails. Please choose an alternative and run " \
"this generator again."
"or reserved by Ruby on Rails. Please choose an alternative or use --skip-collision-check " \
"to skip this check and run this generator again."
end
end
end

10
railties/test/application/generators_test.rb
View file

@ -198,5 +198,15 @@ module ApplicationTests
assert_no_match "active_record:migration", output
end
end
test "skip collision check" do
rails("generate", "model", "post", "title:string")
output = rails("generate", "model", "post", "title:string", "body:string")
assert_match(/The name 'Post' is either already used in your application or reserved/, output)
output = rails("generate", "model", "post", "title:string", "body:string", "--skip-collision-check")
assert_no_match(/The name 'Post' is either already used in your application or reserved/, output)
end
end
end