activerecord 4.2.9 → 6.1.4.1

data/lib/arel/visitors/visitor.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Arel # :nodoc: all
+  module Visitors
+    class Visitor
+      def initialize
+        @dispatch = get_dispatch_cache
+      end
+
+      def accept(object, collector = nil)
+        visit object, collector
+      end
+
+      private
+        attr_reader :dispatch
+
+        def self.dispatch_cache
+          @dispatch_cache ||= Hash.new do |hash, klass|
+            hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"
+          end
+        end
+
+        def get_dispatch_cache
+          self.class.dispatch_cache
+        end
+
+        def visit(object, collector = nil)
+          dispatch_method = dispatch[object.class]
+          if collector
+            send dispatch_method, object, collector
+          else
+            send dispatch_method, object
+          end
+        rescue NoMethodError => e
+          raise e if respond_to?(dispatch_method, true)
+          superklass = object.class.ancestors.find { |klass|
+            respond_to?(dispatch[klass], true)
+          }
+          raise(TypeError, "Cannot visit #{object.class}") unless superklass
+          dispatch[object.class] = dispatch[superklass]
+          retry
+        end
+    end
+  end
+end

data/lib/arel/visitors.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "arel/visitors/visitor"
+require "arel/visitors/to_sql"
+require "arel/visitors/sqlite"
+require "arel/visitors/postgresql"
+require "arel/visitors/mysql"
+require "arel/visitors/dot"
+
+module Arel # :nodoc: all
+  module Visitors
+  end
+end

data/lib/arel/window_predications.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Arel # :nodoc: all
+  module WindowPredications
+    def over(expr = nil)
+      Nodes::Over.new(self, expr)
+    end
+  end
+end

data/lib/arel.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "arel/errors"
+
+require "arel/crud"
+require "arel/factory_methods"
+
+require "arel/expressions"
+require "arel/predications"
+require "arel/window_predications"
+require "arel/math"
+require "arel/alias_predication"
+require "arel/order_predications"
+require "arel/table"
+require "arel/attributes/attribute"
+
+require "arel/visitors"
+require "arel/collectors/sql_string"
+
+require "arel/tree_manager"
+require "arel/insert_manager"
+require "arel/select_manager"
+require "arel/update_manager"
+require "arel/delete_manager"
+require "arel/nodes"
+
+module Arel
+  VERSION = "10.0.0"
+
+  # Wrap a known-safe SQL string for passing to query methods, e.g.
+  #
+  #   Post.order(Arel.sql("length(title)")).last
+  #
+  # Great caution should be taken to avoid SQL injection vulnerabilities.
+  # This method should not be used with unsafe values such as request
+  # parameters or model attributes.
+  def self.sql(raw_sql)
+    Arel::Nodes::SqlLiteral.new raw_sql
+  end
+
+  def self.star # :nodoc:
+    sql "*"
+  end
+
+  def self.arel_node?(value) # :nodoc:
+    value.is_a?(Arel::Nodes::Node) || value.is_a?(Arel::Attribute) || value.is_a?(Arel::Nodes::SqlLiteral)
+  end
+
+  def self.fetch_attribute(value, &block) # :nodoc:
+    unless String === value
+      value.fetch_attribute(&block)
+    end
+  end
+end

data/lib/rails/generators/active_record/application_record/application_record_generator.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "rails/generators/active_record"
+
+module ActiveRecord
+  module Generators # :nodoc:
+    class ApplicationRecordGenerator < ::Rails::Generators::Base # :nodoc:
+      source_root File.expand_path("templates", __dir__)
+
+      # FIXME: Change this file to a symlink once RubyGems 2.5.0 is required.
+      def create_application_record
+        template "application_record.rb", application_record_file_name
+      end
+
+      private
+        def application_record_file_name
+          @application_record_file_name ||=
+            if namespaced?
+              "app/models/#{namespaced_path}/application_record.rb"
+            else
+              "app/models/application_record.rb"
+            end
+        end
+    end
+  end
+end

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

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

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

@@ -1,63 +1,69 @@
-require 'rails/generators/active_record'
+# frozen_string_literal: true
+
+require "rails/generators/active_record"
 
 module ActiveRecord
   module Generators # :nodoc:
     class MigrationGenerator < Base # :nodoc:
-      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
+      argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
+
+      class_option :timestamps, type: :boolean
+      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."
 
       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.
+      private
+        attr_reader :migration_action, :join_tables
 
-      def set_local_assigns!
-        @migration_template = "migration.rb"
-        case file_name
-        when /^(add|remove)_.*_(?:to|from)_(.*)/
-          @migration_action = $1
-          @table_name       = normalize_table_name($2)
-        when /join_table/
-          if attributes.length == 2
-            @migration_action = 'join'
-            @join_tables      = pluralize_table_names? ? attributes.map(&:plural_name) : attributes.map(&:singular_name)
+        # 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
+          when /^(add)_.*_to_(.*)/, /^(remove)_.*?_from_(.*)/
+            @migration_action = $1
+            @table_name       = normalize_table_name($2)
+          when /join_table/
+            if attributes.length == 2
+              @migration_action = "join"
+              @join_tables      = pluralize_table_names? ? attributes.map(&:plural_name) : attributes.map(&:singular_name)
 
-            set_index_names
+              set_index_names
+            end
+          when /^create_(.+)/
+            @table_name = normalize_table_name($1)
+            @migration_template = "create_table_migration.rb"
           end
-        when /^create_(.+)/
-          @table_name = normalize_table_name($1)
-          @migration_template = "create_table_migration.rb"
         end
-      end
 
-      def set_index_names
-        attributes.each_with_index do |attr, i|
-          attr.index_name = [attr, attributes[i - 1]].map{ |a| index_name_for(a) }
+        def set_index_names
+          attributes.each_with_index do |attr, i|
+            attr.index_name = [attr, attributes[i - 1]].map { |a| index_name_for(a) }
+          end
         end
-      end
 
-      def index_name_for(attribute)
-        if attribute.foreign_key?
-          attribute.name
-        else
-          attribute.name.singularize.foreign_key
-        end.to_sym
-      end
+        def index_name_for(attribute)
+          if attribute.foreign_key?
+            attribute.name
+          else
+            attribute.name.singularize.foreign_key
+          end.to_sym
+        end
 
-      private
         def attributes_with_index
           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]+$/
+          unless /^[_a-z0-9]+$/.match?(file_name)
             raise IllegalMigrationNameError.new(file_name)
           end
         end

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

@@ -0,0 +1,26 @@
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+  def change
+    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 %>
+<% elsif attribute.reference? -%>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %><%= foreign_key_type %>
+<% elsif !attribute.virtual? -%>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
+<% end -%>
+<% end -%>
+<% if options[:timestamps] %>
+      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 -%>
+  end
+end

data/lib/rails/generators/active_record/migration/templates/{migration.rb → migration.rb.tt}

@@ -1,10 +1,13 @@
-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 %>
-  <%- else -%>
+    add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %><%= foreign_key_type %>
+  <%- 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
+  <%- elsif !attribute.virtual? -%>
     add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
     <%- if attribute.has_index? -%>
     add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
@@ -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 %><%= foreign_key_type %>
+      <%- elsif !attribute.virtual? -%>
       <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %>
+      <%- end -%>
     <%- end -%>
     end
   end
@@ -25,12 +32,14 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 <% attributes.each do |attribute| -%>
 <%- if migration_action -%>
   <%- if attribute.reference? -%>
-    remove_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+    remove_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %><%= foreign_key_type %>
   <%- else -%>
     <%- if attribute.has_index? -%>
     remove_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
     <%- end -%>
+    <%- if !attribute.virtual? -%>
     remove_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
+    <%- end -%>
   <%- end -%>
 <%- end -%>
 <%- end -%>

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

@@ -1,4 +1,6 @@
-require 'rails/generators/migration'
+# frozen_string_literal: true
+
+require "rails/generators/migration"
 
 module ActiveRecord
   module Generators # :nodoc:
@@ -13,6 +15,38 @@ 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 foreign_key_type
+          key_type = options[:primary_key_type]
+          ", type: :#{key_type}" if key_type
+        end
+
+        def db_migrate_path
+          if defined?(Rails.application) && Rails.application
+            configured_migrate_path || default_migrate_path
+          else
+            "db/migrate"
+          end
+        end
+
+        def default_migrate_path
+          Rails.application.config.paths["db/migrate"].to_ary.first
+        end
+
+        def configured_migrate_path
+          return unless database = options[:database]
+          config = ActiveRecord::Base.configurations.configs_for(
+            env_name: Rails.env,
+            name: database
+          )
+          config&.migrations_paths
+        end
     end
   end
 end

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

@@ -1,52 +1,85 @@
-require 'rails/generators/active_record'
+# frozen_string_literal: true
+
+require "rails/generators/active_record"
 
 module ActiveRecord
   module Generators # :nodoc:
     class ModelGenerator < Base # :nodoc:
-      argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
+      argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
 
       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"
+      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
-        return unless options[:migration] && options[:parent].nil?
+        return if skip_migration_creation?
         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
-        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
+        generate_abstract_class if database && !parent
+        template "model.rb", File.join("app/models", class_path, "#{file_name}.rb")
       end
 
       def create_module_file
         return if regular_class_path.empty?
-        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?)
+        template "module.rb", File.join("app/models", "#{class_path.join('/')}.rb") if behavior == :invoke
       end
 
       hook_for :test_framework
 
-      protected
+      private
+        # Skip creating migration file if:
+        #   - options parent is present and database option is not present
+        #   - migrations option is nil or false
+        def skip_migration_creation?
+          parent && !database || !migration
+        end
+
+        def attributes_with_index
+          attributes.select { |a| !a.reference? && a.has_index? }
+        end
 
         # Used by the migration template to determine the parent name of the model
         def parent_class_name
-          options[:parent] || "ActiveRecord::Base"
+          if parent
+            parent
+          elsif database
+            abstract_class_name
+          else
+            "ApplicationRecord"
+          end
         end
 
+        def generate_abstract_class
+          path = File.join("app/models", "#{database.underscore}_record.rb")
+          return if File.exist?(path)
+
+          template "abstract_base_class.rb", path
+        end
+
+        def abstract_class_name
+          "#{database.camelize}Record"
+        end
+
+        def database
+          options[:database]
+        end
+
+        def parent
+          options[:parent]
+        end
+
+        def migration
+          options[:migration]
+        end
     end
   end
 end

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

@@ -0,0 +1,7 @@
+<% module_namespacing do -%>
+class <%= abstract_class_name %> < ApplicationRecord
+  self.abstract_class = true
+
+  connects_to database: { <%= ActiveRecord::Base.writing_role %>: :<%= database -%> }
+end
+<% end -%>

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

@@ -0,0 +1,22 @@
+<% module_namespacing do -%>
+class <%= class_name %> < <%= parent_class_name.classify %>
+<% attributes.select(&:reference?).each do |attribute| -%>
+  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %>
+<% end -%>
+<% attributes.select(&:rich_text?).each do |attribute| -%>
+  has_rich_text :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachment?).each do |attribute| -%>
+  has_one_attached :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachments?).each do |attribute| -%>
+  has_many_attached :<%= attribute.name %>
+<% 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 -%>
+end
+<% end -%>

data/lib/rails/generators/active_record.rb

@@ -1,7 +1,9 @@
-require 'rails/generators/named_base'
-require 'rails/generators/active_model'
-require 'rails/generators/active_record/migration'
-require 'active_record'
+# frozen_string_literal: true
+
+require "rails/generators/named_base"
+require "rails/generators/active_model"
+require "rails/generators/active_record/migration"
+require "active_record"
 
 module ActiveRecord
   module Generators # :nodoc:
@@ -10,7 +12,7 @@ module ActiveRecord
 
       # Set the current directory as base for the inherited generators.
       def self.base_root
-        File.dirname(__FILE__)
+        __dir__
       end
     end
   end