activerecord 6.0.0.rc1 → 6.0.3.rc1

data/lib/arel/visitors/postgresql.rb

@@ -4,7 +4,6 @@ module Arel # :nodoc: all
   module Visitors
     class PostgreSQL < Arel::Visitors::ToSql
       private
-
         def visit_Arel_Nodes_Matches(o, collector)
           op = o.case_sensitive ? " LIKE " : " ILIKE "
           collector = infix_value o, collector, op

data/lib/arel/visitors/sqlite.rb

@@ -4,7 +4,6 @@ module Arel # :nodoc: all
   module Visitors
     class SQLite < Arel::Visitors::ToSql
       private
-
         # Locks are not supported in SQLite
         def visit_Arel_Nodes_Lock(o, collector)
           collector

data/lib/arel/visitors/to_sql.rb

@@ -19,7 +19,6 @@ module Arel # :nodoc: all
       end
 
       private
-
         def visit_Arel_Nodes_DeleteStatement(o, collector)
           o = prepare_delete_statement(o)
 
@@ -52,10 +51,14 @@ module Arel # :nodoc: all
         def visit_Arel_Nodes_InsertStatement(o, collector)
           collector << "INSERT INTO "
           collector = visit o.relation, collector
-          if o.columns.any?
-            collector << " (#{o.columns.map { |x|
-              quote_column_name x.name
-            }.join ', '})"
+
+          unless o.columns.empty?
+            collector << " ("
+            o.columns.each_with_index do |x, i|
+              collector << ", " unless i == 0
+              collector << quote_column_name(x.name)
+            end
+            collector << ")"
           end
 
           if o.values
@@ -97,22 +100,20 @@ module Arel # :nodoc: all
         def visit_Arel_Nodes_ValuesList(o, collector)
           collector << "VALUES "
 
-          len = o.rows.length - 1
-          o.rows.each_with_index { |row, i|
+          o.rows.each_with_index do |row, i|
+            collector << ", " unless i == 0
             collector << "("
-            row_len = row.length - 1
             row.each_with_index do |value, k|
+              collector << ", " unless k == 0
               case value
               when Nodes::SqlLiteral, Nodes::BindParam
                 collector = visit(value, collector)
               else
                 collector << quote(value).to_s
               end
-              collector << ", " unless k == row_len
             end
             collector << ")"
-            collector << ", " unless i == len
-          }
+          end
           collector
         end
 
@@ -128,11 +129,10 @@ module Arel # :nodoc: all
 
           unless o.orders.empty?
             collector << " ORDER BY "
-            len = o.orders.length - 1
-            o.orders.each_with_index { |x, i|
+            o.orders.each_with_index do |x, i|
+              collector << ", " unless i == 0
               collector = visit(x, collector)
-              collector << ", " unless len == i
-            }
+            end
           end
 
           visit_Arel_Nodes_SelectOptions(o, collector)
@@ -506,7 +506,7 @@ module Arel # :nodoc: all
 
         def visit_Arel_Table(o, collector)
           if o.table_alias
-            collector << "#{quote_table_name o.name} #{quote_table_name o.table_alias}"
+            collector << quote_table_name(o.name) << " " << quote_table_name(o.table_alias)
           else
             collector << quote_table_name(o.name)
           end
@@ -682,13 +682,12 @@ module Arel # :nodoc: all
         end
 
         def visit_Arel_Nodes_UnqualifiedColumn(o, collector)
-          collector << "#{quote_column_name o.name}"
-          collector
+          collector << quote_column_name(o.name)
         end
 
         def visit_Arel_Attributes_Attribute(o, collector)
           join_name = o.relation.table_alias || o.relation.name
-          collector << "#{quote_table_name join_name}.#{quote_column_name o.name}"
+          collector << quote_table_name(join_name) << "." << quote_column_name(o.name)
         end
         alias :visit_Arel_Attributes_Integer :visit_Arel_Attributes_Attribute
         alias :visit_Arel_Attributes_Float :visit_Arel_Attributes_Attribute
@@ -785,14 +784,11 @@ module Arel # :nodoc: all
         end
 
         def inject_join(list, collector, join_str)
-          len = list.length - 1
-          list.each_with_index.inject(collector) { |c, (x, i)|
-            if i == len
-              visit x, c
-            else
-              visit(x, c) << join_str
-            end
-          }
+          list.each_with_index do |x, i|
+            collector << join_str unless i == 0
+            collector = visit(x, collector)
+          end
+          collector
         end
 
         def unboundable?(value)

data/lib/arel/visitors/visitor.rb

@@ -7,16 +7,15 @@ module Arel # :nodoc: all
         @dispatch = get_dispatch_cache
       end
 
-      def accept(object, *args)
-        visit object, *args
+      def accept(object, collector = nil)
+        visit object, collector
       end
 
       private
-
         attr_reader :dispatch
 
         def self.dispatch_cache
-          Hash.new do |hash, klass|
+          @dispatch_cache ||= Hash.new do |hash, klass|
             hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"
           end
         end
@@ -25,9 +24,13 @@ module Arel # :nodoc: all
           self.class.dispatch_cache
         end
 
-        def visit(object, *args)
+        def visit(object, collector = nil)
           dispatch_method = dispatch[object.class]
-          send dispatch_method, object, *args
+          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|

data/lib/arel/visitors/where_sql.rb

@@ -9,7 +9,6 @@ module Arel # :nodoc: all
       end
 
       private
-
         def visit_Arel_Nodes_SelectCore(o, collector)
           collector << "WHERE "
           wheres = o.wheres.map do |where|

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

@@ -13,7 +13,6 @@ module ActiveRecord
       end
 
       private
-
         def application_record_file_name
           @application_record_file_name ||=
             if namespaced?

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

@@ -17,7 +17,6 @@ module ActiveRecord
       end
 
       private
-
         def primary_key_type
           key_type = options[:primary_key_type]
           ", id: :#{key_type}" if key_type

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

@@ -37,7 +37,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
     <%- if attribute.has_index? -%>
     remove_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
     <%- end -%>
-    <%- if !attribute.virtual? %>
+    <%- if !attribute.virtual? -%>
     remove_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
     <%- end -%>
   <%- end -%>

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

@@ -35,7 +35,6 @@ module ActiveRecord
       hook_for :test_framework
 
       private
-
         def attributes_with_index
           attributes.select { |a| !a.reference? && a.has_index? }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc1
+  version: 6.0.3.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.3.rc1
 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.
@@ -53,6 +53,7 @@ files:
 - examples/performance.rb
 - examples/simple.rb
 - lib/active_record.rb
+- lib/active_record/advisory_lock_base.rb
 - lib/active_record/aggregations.rb
 - lib/active_record/association_relation.rb
 - lib/active_record/associations.rb
@@ -389,8 +390,11 @@ homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.rc1/activerecord
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.rc1/activerecord/CHANGELOG.md
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.3.rc1/activerecord/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.3.rc1/
+  mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.3.rc1/activerecord
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -408,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).