diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/association.rb | 19 | ||||
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/model/model_generator.rb | 2 |
2 files changed, 9 insertions, 12 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 4b72846ef6..6a3658f328 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -1,17 +1,14 @@ -# This is the parent Association class which defines certain class variables (valid_options) and -# instance variables (model, name, scope, options, reflection) which would be common across all the associations that we known today in Rails.. -# Every association need to have the values of these variables set and they are used at multiple places -# The heirarchy is defined as follows: +# This is the parent Association class which defines the variables +# used by all associations. +# +# The hierarchy is defined as follows: # Association # - SingularAssociation -# - BelongsTo -# - HasOne +# - BelongsToAssociation +# - HasOneAssociation # - CollectionAssociation -# - HasMany -# - HasAndBelongsToMany -# -# The HasMany :Through association is a special case of HasMany association with the :through option set for it -# +# - HasManyAssociation +# - HasAndBelongsToManyAssociation module ActiveRecord::Associations::Builder class Association #:nodoc: 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 821df0e0d6..7e8d68ce69 100644 --- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb +++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb @@ -13,7 +13,7 @@ module ActiveRecord class_option :indexes, :type => :boolean, :default => true, :desc => "Add indexes for references and belongs_to columns" - # creates the migration file for the model first followed by the model file itself + # creates the migration file for the model. def create_migration_file return unless options[:migration] && options[:parent].nil? |