aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/rails/generators/active_record
diff options
context:
space:
mode:
authorYuji Yaginuma <yuuji.yaginuma@gmail.com>2019-03-20 16:00:07 +0900
committerGitHub <noreply@github.com>2019-03-20 16:00:07 +0900
commitec72a9fd3068b3150fb0fc6a016715fab5c4792d (patch)
tree178f906d8033b18becca300046872e9ae71adf56 /activerecord/lib/rails/generators/active_record
parent7c6343078a566264ce6df6e531c9790ff2d2f432 (diff)
parente5d7b98fbd5f1903ac5e85a2bf85bb769789d570 (diff)
downloadrails-ec72a9fd3068b3150fb0fc6a016715fab5c4792d.tar.gz
rails-ec72a9fd3068b3150fb0fc6a016715fab5c4792d.tar.bz2
rails-ec72a9fd3068b3150fb0fc6a016715fab5c4792d.zip
Merge pull request #35679 from y-yagi/make_aliases_of_database_option_work
Make aliases of `database` option in generators work
Diffstat (limited to 'activerecord/lib/rails/generators/active_record')
-rw-r--r--activerecord/lib/rails/generators/active_record/migration/migration_generator.rb2
-rw-r--r--activerecord/lib/rails/generators/active_record/model/model_generator.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
index dd79bcf542..cb2c74f1ca 100644
--- a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
@@ -8,7 +8,7 @@ module ActiveRecord
argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
class_option :primary_key_type, type: :string, desc: "The type for primary key"
- class_option :database, type: :string, aliases: %i(db), desc: "The database for your migration. By default, the current environment's primary database is used."
+ class_option :database, type: :string, aliases: %i(--db), desc: "The database for your migration. By default, the current environment's primary database is used."
def create_migration_file
set_local_assigns!
diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
index eac504f9f1..c71bbdcab8 100644
--- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
@@ -14,7 +14,7 @@ module ActiveRecord
class_option :parent, type: :string, desc: "The parent class for the generated model"
class_option :indexes, type: :boolean, default: true, desc: "Add indexes for references and belongs_to columns"
class_option :primary_key_type, type: :string, desc: "The type for primary key"
- class_option :database, type: :string, aliases: %i(db), desc: "The database for your model's migration. By default, the current environment's primary database is used."
+ class_option :database, type: :string, aliases: %i(--db), desc: "The database for your model's migration. By default, the current environment's primary database is used."
# creates the migration file for the model.
def create_migration_file