activerecord 4.2.11.3 → 5.0.7.2

data/lib/rails/generators/active_record/migration.rb

@@ -13,6 +13,21 @@ module ActiveRecord
           ActiveRecord::Migration.next_migration_number(next_migration_number)
         end
       end
+
+      private
+
+        def primary_key_type
+          key_type = options[:primary_key_type]
+          ", id: :#{key_type}" if key_type
+        end
+
+        def db_migrate_path
+          if defined?(Rails.application) && Rails.application
+            Rails.application.config.paths["db/migrate"].to_ary.first
+          else
+            "db/migrate"
+          end
+        end
     end
   end
 end

data/lib/rails/generators/active_record/migration/migration_generator.rb

@@ -5,19 +5,20 @@ module ActiveRecord
     class MigrationGenerator < Base # :nodoc:
       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"
+
       def create_migration_file
         set_local_assigns!
         validate_file_name!
-        migration_template @migration_template, "db/migrate/#{file_name}.rb"
+        migration_template @migration_template, File.join(db_migrate_path, "#{file_name}.rb")
       end
 
       protected
       attr_reader :migration_action, :join_tables
 
-      # sets the default migration template that is being used for the generation of the migration
-      # depending on the arguments which would be sent out in the command line, the migration template 
-      # and the table name instance variables are setup.
-
+      # Sets the default migration template that is being used for the generation of the migration.
+      # Depending on command line arguments, the migration template and the table name instance
+      # variables are set up.
       def set_local_assigns!
         @migration_template = "migration.rb"
         case file_name
@@ -56,6 +57,8 @@ module ActiveRecord
           attributes.select { |a| !a.reference? && a.has_index? }
         end
 
+        # A migration file name can only contain underscores (_), lowercase characters,
+        # and numbers 0-9. Any other file name will raise an IllegalMigrationNameError.
         def validate_file_name!
           unless file_name =~ /^[_a-z0-9]+$/
             raise IllegalMigrationNameError.new(file_name)

data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb

@@ -1,17 +1,22 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
-    create_table :<%= table_name %> do |t|
+    create_table :<%= table_name %><%= primary_key_type %> do |t|
 <% attributes.each do |attribute| -%>
 <% if attribute.password_digest? -%>
       t.string :password_digest<%= attribute.inject_options %>
+<% elsif attribute.token? -%>
+      t.string :<%= attribute.name %><%= attribute.inject_options %>
 <% else -%>
       t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
 <% end -%>
 <% end -%>
 <% if options[:timestamps] %>
-      t.timestamps null: false
+      t.timestamps
 <% end -%>
     end
+<% attributes.select(&:token?).each do |attribute| -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>, unique: true
+<% end -%>
 <% attributes_with_index.each do |attribute| -%>
     add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
 <% end -%>

data/lib/rails/generators/active_record/migration/templates/migration.rb

@@ -1,9 +1,12 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
 <%- if migration_action == 'add' -%>
   def change
 <% attributes.each do |attribute| -%>
   <%- if attribute.reference? -%>
     add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+  <%- elsif attribute.token? -%>
+    add_column :<%= table_name %>, :<%= attribute.name %>, :string<%= attribute.inject_options %>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>, unique: true
   <%- else -%>
     add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
     <%- if attribute.has_index? -%>
@@ -16,7 +19,11 @@ class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_join_table :<%= join_tables.first %>, :<%= join_tables.second %> do |t|
     <%- attributes.each do |attribute| -%>
+      <%- if attribute.reference? -%>
+      t.references :<%= attribute.name %><%= attribute.inject_options %>
+      <%- else -%>
       <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %>
+      <%- end -%>
     <%- end -%>
     end
   end

data/lib/rails/generators/active_record/model/model_generator.rb

@@ -7,46 +7,63 @@ module ActiveRecord
 
       check_class_collision
 
-      class_option :migration,  :type => :boolean
-      class_option :timestamps, :type => :boolean
-      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 :migration, type: :boolean
+      class_option :timestamps, type: :boolean
+      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"
 
-      
       # creates the migration file for the model.
-
       def create_migration_file
         return unless options[:migration] && options[:parent].nil?
         attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false
-        migration_template "../../migration/templates/create_table_migration.rb", "db/migrate/create_#{table_name}.rb"
+        migration_template "../../migration/templates/create_table_migration.rb", File.join(db_migrate_path, "create_#{table_name}.rb")
       end
 
       def create_model_file
+        generate_application_record
         template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
       end
 
       def create_module_file
         return if regular_class_path.empty?
+        generate_application_record
         template 'module.rb', File.join('app/models', "#{class_path.join('/')}.rb") if behavior == :invoke
       end
 
-      def attributes_with_index
-        attributes.select { |a| !a.reference? && a.has_index? }
-      end
-
-      def accessible_attributes
-        attributes.reject(&:reference?)
-      end
-
       hook_for :test_framework
 
       protected
 
+        def attributes_with_index
+          attributes.select { |a| !a.reference? && a.has_index? }
+        end
+
+        # FIXME: Change this file to a symlink once RubyGems 2.5.0 is required.
+        def generate_application_record
+          if self.behavior == :invoke && !application_record_exist?
+            template 'application_record.rb', application_record_file_name
+          end
+        end
+
         # Used by the migration template to determine the parent name of the model
         def parent_class_name
-          options[:parent] || "ActiveRecord::Base"
+          options[:parent] || 'ApplicationRecord'
         end
 
+        def application_record_exist?
+          file_exist = nil
+          in_root { file_exist = File.exist?(application_record_file_name) }
+          file_exist
+        end
+
+        def application_record_file_name
+          @application_record_file_name ||= if mountable_engine?
+            "app/models/#{namespaced_path}/application_record.rb"
+          else
+            'app/models/application_record.rb'
+          end
+        end
     end
   end
 end

data/lib/rails/generators/active_record/model/templates/application_record.rb

@@ -0,0 +1,5 @@
+<% module_namespacing do -%>
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
+<% end -%>

data/lib/rails/generators/active_record/model/templates/model.rb

@@ -3,6 +3,9 @@ class <%= class_name %> < <%= parent_class_name.classify %>
 <% attributes.select(&:reference?).each do |attribute| -%>
   belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %><%= ', required: true' if attribute.required? %>
 <% end -%>
+<% attributes.select(&:token?).each do |attribute| -%>
+  has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>
+<% end -%>
 <% if attributes.any?(&:password_digest?) -%>
   has_secure_password
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.2.11.3
+  version: 5.0.7.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 5.0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 5.0.7.2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 5.0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 5.0.7.2
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 description: Databases on Rails. Build a persistent domain model by mapping database
   tables to Ruby classes. Strong conventions for associations, validations, aggregations,
   migrations, and testing come baked-in.
@@ -106,6 +106,7 @@ files:
 - lib/active_record/associations/singular_association.rb
 - lib/active_record/associations/through_association.rb
 - lib/active_record/attribute.rb
+- lib/active_record/attribute/user_provided_default.rb
 - lib/active_record/attribute_assignment.rb
 - lib/active_record/attribute_decorators.rb
 - lib/active_record/attribute_methods.rb
@@ -117,6 +118,7 @@ files:
 - lib/active_record/attribute_methods/serialization.rb
 - lib/active_record/attribute_methods/time_zone_conversion.rb
 - lib/active_record/attribute_methods/write.rb
+- lib/active_record/attribute_mutation_tracker.rb
 - lib/active_record/attribute_set.rb
 - lib/active_record/attribute_set/builder.rb
 - lib/active_record/attributes.rb
@@ -125,6 +127,7 @@ files:
 - lib/active_record/callbacks.rb
 - lib/active_record/coders/json.rb
 - lib/active_record/coders/yaml_column.rb
+- lib/active_record/collection_cache_key.rb
 - lib/active_record/connection_adapters/abstract/connection_pool.rb
 - lib/active_record/connection_adapters/abstract/database_limits.rb
 - lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -140,33 +143,37 @@ files:
 - lib/active_record/connection_adapters/abstract_mysql_adapter.rb
 - lib/active_record/connection_adapters/column.rb
 - lib/active_record/connection_adapters/connection_specification.rb
+- lib/active_record/connection_adapters/determine_if_preparable_visitor.rb
+- lib/active_record/connection_adapters/mysql/column.rb
+- lib/active_record/connection_adapters/mysql/database_statements.rb
+- lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb
+- lib/active_record/connection_adapters/mysql/quoting.rb
+- lib/active_record/connection_adapters/mysql/schema_creation.rb
+- lib/active_record/connection_adapters/mysql/schema_definitions.rb
+- lib/active_record/connection_adapters/mysql/schema_dumper.rb
+- lib/active_record/connection_adapters/mysql/type_metadata.rb
 - lib/active_record/connection_adapters/mysql2_adapter.rb
-- lib/active_record/connection_adapters/mysql_adapter.rb
-- lib/active_record/connection_adapters/postgresql/array_parser.rb
 - lib/active_record/connection_adapters/postgresql/column.rb
 - lib/active_record/connection_adapters/postgresql/database_statements.rb
+- lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb
 - lib/active_record/connection_adapters/postgresql/oid.rb
 - lib/active_record/connection_adapters/postgresql/oid/array.rb
 - lib/active_record/connection_adapters/postgresql/oid/bit.rb
 - lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb
 - lib/active_record/connection_adapters/postgresql/oid/bytea.rb
 - lib/active_record/connection_adapters/postgresql/oid/cidr.rb
-- lib/active_record/connection_adapters/postgresql/oid/date.rb
 - lib/active_record/connection_adapters/postgresql/oid/date_time.rb
 - lib/active_record/connection_adapters/postgresql/oid/decimal.rb
 - lib/active_record/connection_adapters/postgresql/oid/enum.rb
-- lib/active_record/connection_adapters/postgresql/oid/float.rb
 - lib/active_record/connection_adapters/postgresql/oid/hstore.rb
 - lib/active_record/connection_adapters/postgresql/oid/inet.rb
-- lib/active_record/connection_adapters/postgresql/oid/infinity.rb
-- lib/active_record/connection_adapters/postgresql/oid/integer.rb
 - lib/active_record/connection_adapters/postgresql/oid/json.rb
 - lib/active_record/connection_adapters/postgresql/oid/jsonb.rb
 - lib/active_record/connection_adapters/postgresql/oid/money.rb
 - lib/active_record/connection_adapters/postgresql/oid/point.rb
+- lib/active_record/connection_adapters/postgresql/oid/rails_5_1_point.rb
 - lib/active_record/connection_adapters/postgresql/oid/range.rb
 - lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb
-- lib/active_record/connection_adapters/postgresql/oid/time.rb
 - lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
 - lib/active_record/connection_adapters/postgresql/oid/uuid.rb
 - lib/active_record/connection_adapters/postgresql/oid/vector.rb
@@ -174,10 +181,16 @@ files:
 - lib/active_record/connection_adapters/postgresql/quoting.rb
 - lib/active_record/connection_adapters/postgresql/referential_integrity.rb
 - lib/active_record/connection_adapters/postgresql/schema_definitions.rb
+- lib/active_record/connection_adapters/postgresql/schema_dumper.rb
 - lib/active_record/connection_adapters/postgresql/schema_statements.rb
+- lib/active_record/connection_adapters/postgresql/type_metadata.rb
 - lib/active_record/connection_adapters/postgresql/utils.rb
 - lib/active_record/connection_adapters/postgresql_adapter.rb
 - lib/active_record/connection_adapters/schema_cache.rb
+- lib/active_record/connection_adapters/sql_type_metadata.rb
+- lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb
+- lib/active_record/connection_adapters/sqlite3/quoting.rb
+- lib/active_record/connection_adapters/sqlite3/schema_creation.rb
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/active_record/connection_adapters/statement_pool.rb
 - lib/active_record/connection_handling.rb
@@ -194,6 +207,7 @@ files:
 - lib/active_record/gem_version.rb
 - lib/active_record/inheritance.rb
 - lib/active_record/integration.rb
+- lib/active_record/internal_metadata.rb
 - lib/active_record/legacy_yaml_adapter.rb
 - lib/active_record/locale/en.yml
 - lib/active_record/locking/optimistic.rb
@@ -201,6 +215,7 @@ files:
 - lib/active_record/log_subscriber.rb
 - lib/active_record/migration.rb
 - lib/active_record/migration/command_recorder.rb
+- lib/active_record/migration/compatibility.rb
 - lib/active_record/migration/join_table.rb
 - lib/active_record/model_schema.rb
 - lib/active_record/nested_attributes.rb
@@ -218,15 +233,27 @@ files:
 - lib/active_record/reflection.rb
 - lib/active_record/relation.rb
 - lib/active_record/relation/batches.rb
+- lib/active_record/relation/batches/batch_enumerator.rb
 - lib/active_record/relation/calculations.rb
 - lib/active_record/relation/delegation.rb
 - lib/active_record/relation/finder_methods.rb
+- lib/active_record/relation/from_clause.rb
 - lib/active_record/relation/merger.rb
 - lib/active_record/relation/predicate_builder.rb
 - lib/active_record/relation/predicate_builder/array_handler.rb
+- lib/active_record/relation/predicate_builder/association_query_handler.rb
+- lib/active_record/relation/predicate_builder/base_handler.rb
+- lib/active_record/relation/predicate_builder/basic_object_handler.rb
+- lib/active_record/relation/predicate_builder/class_handler.rb
+- lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb
+- lib/active_record/relation/predicate_builder/range_handler.rb
 - lib/active_record/relation/predicate_builder/relation_handler.rb
+- lib/active_record/relation/query_attribute.rb
 - lib/active_record/relation/query_methods.rb
+- lib/active_record/relation/record_fetch_warning.rb
 - lib/active_record/relation/spawn_methods.rb
+- lib/active_record/relation/where_clause.rb
+- lib/active_record/relation/where_clause_factory.rb
 - lib/active_record/result.rb
 - lib/active_record/runtime_registry.rb
 - lib/active_record/sanitization.rb
@@ -236,41 +263,37 @@ files:
 - lib/active_record/scoping.rb
 - lib/active_record/scoping/default.rb
 - lib/active_record/scoping/named.rb
+- lib/active_record/secure_token.rb
 - lib/active_record/serialization.rb
-- lib/active_record/serializers/xml_serializer.rb
 - lib/active_record/statement_cache.rb
 - lib/active_record/store.rb
+- lib/active_record/suppressor.rb
+- lib/active_record/table_metadata.rb
 - lib/active_record/tasks/database_tasks.rb
 - lib/active_record/tasks/mysql_database_tasks.rb
 - lib/active_record/tasks/postgresql_database_tasks.rb
 - lib/active_record/tasks/sqlite_database_tasks.rb
 - lib/active_record/timestamp.rb
+- lib/active_record/touch_later.rb
 - lib/active_record/transactions.rb
 - lib/active_record/translation.rb
 - lib/active_record/type.rb
-- lib/active_record/type/big_integer.rb
-- lib/active_record/type/binary.rb
-- lib/active_record/type/boolean.rb
+- lib/active_record/type/adapter_specific_registry.rb
 - lib/active_record/type/date.rb
 - lib/active_record/type/date_time.rb
-- lib/active_record/type/decimal.rb
-- lib/active_record/type/decimal_without_scale.rb
-- lib/active_record/type/decorator.rb
-- lib/active_record/type/float.rb
 - lib/active_record/type/hash_lookup_type_map.rb
-- lib/active_record/type/integer.rb
-- lib/active_record/type/mutable.rb
-- lib/active_record/type/numeric.rb
+- lib/active_record/type/internal/abstract_json.rb
+- lib/active_record/type/internal/timezone.rb
 - lib/active_record/type/serialized.rb
-- lib/active_record/type/string.rb
-- lib/active_record/type/text.rb
 - lib/active_record/type/time.rb
-- lib/active_record/type/time_value.rb
 - lib/active_record/type/type_map.rb
-- lib/active_record/type/unsigned_integer.rb
-- lib/active_record/type/value.rb
+- lib/active_record/type_caster.rb
+- lib/active_record/type_caster/connection.rb
+- lib/active_record/type_caster/map.rb
 - lib/active_record/validations.rb
+- lib/active_record/validations/absence.rb
 - lib/active_record/validations/associated.rb
+- lib/active_record/validations/length.rb
 - lib/active_record/validations/presence.rb
 - lib/active_record/validations/uniqueness.rb
 - lib/active_record/version.rb
@@ -280,9 +303,10 @@ files:
 - lib/rails/generators/active_record/migration/templates/create_table_migration.rb
 - lib/rails/generators/active_record/migration/templates/migration.rb
 - lib/rails/generators/active_record/model/model_generator.rb
+- lib/rails/generators/active_record/model/templates/application_record.rb
 - lib/rails/generators/active_record/model/templates/model.rb
 - lib/rails/generators/active_record/model/templates/module.rb
-homepage: http://www.rubyonrails.org
+homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata: {}
@@ -296,14 +320,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).