torque-postgresql 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e426686cf04fcf990d84b945abe3b3435168237f1ff24c6f23ac3b4941bbc4e
-  data.tar.gz: 2f936f5676f80804e4766bc9bf64b81d70ddbd08e9409b373b0d59d7d20e8bf1
+  metadata.gz: f108bfb672743d7edd701b77eb102aa6f9164b4981e1f366d2354d9e8cf3360b
+  data.tar.gz: 60d7208f0798acbde69aee78fca7a92d4824c75dcecc44acd16dcf59568f0e04
 SHA512:
-  metadata.gz: 373d085090e02e76eb2523f7c2d5a32434c002f712cf892aa38f81bc9935a51f2426054c97bb5df534c47e23fd1800d84b670b9443266908e2f076f20928e7a2
-  data.tar.gz: f0441cc66de2ed015d0b8dbb13ae88dc4074a54c8477fc7a31fc1d51e2bfd7cb57ab0e3de529dcbd4feb3fa72dd1fc8894738868e8bfa36ad9490badc3d1c990
+  metadata.gz: 0a463f94c5a09f74bbb2ba57fe9fb2f7fe649f243c239f7709180c29988f2b5424bffec68d0ec1d2c4ae8ad1191d6156e96dd00c2a66a2a473e02411c563e21f
+  data.tar.gz: 1568915cd13e2b93b77a702cfd346326aa9e07605aac3deca0f3dacbe82b24762a84f3007a4dffc493888c94802724defbfc01037d0bad984e3735783a790f35

data/lib/torque/postgresql/adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'adapter/database_statements'
 require_relative 'adapter/oid'
 require_relative 'adapter/quoting'
@@ -19,6 +21,11 @@ module Torque
           select_value('SELECT version()').match(/#{Adapter::ADAPTER_NAME} ([\d\.]+)/)[1]
         )
       end
+
+      # Add `inherits` to the list of extracted table options
+      def extract_table_options!(options)
+        super.merge(options.extract!(:inherits))
+      end
     end
 
     ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend Adapter

data/lib/torque/postgresql/adapter/database_statements.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter

data/lib/torque/postgresql/adapter/oid.rb

@@ -17,9 +17,11 @@ module Torque
       ActiveRecord::Type.register(:circle,   OID::Circle,   adapter: :postgresql)
       ActiveRecord::Type.register(:enum,     OID::Enum,     adapter: :postgresql)
       ActiveRecord::Type.register(:enum_set, OID::EnumSet,  adapter: :postgresql)
-      ActiveRecord::Type.register(:interval, OID::Interval, adapter: :postgresql)
       ActiveRecord::Type.register(:line,     OID::Line,     adapter: :postgresql)
       ActiveRecord::Type.register(:segment,  OID::Segment,  adapter: :postgresql)
+
+      ActiveRecord::Type.register(:interval, OID::Interval, adapter: :postgresql) \
+        unless PostgreSQL::AR610
     end
   end
 end

data/lib/torque/postgresql/adapter/oid/box.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     class Box < Struct.new(:x1, :y1, :x2, :y2)

data/lib/torque/postgresql/adapter/oid/circle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     class Circle < Struct.new(:x, :y, :r)

data/lib/torque/postgresql/adapter/oid/enum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter

data/lib/torque/postgresql/adapter/oid/enum_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter

data/lib/torque/postgresql/adapter/oid/interval.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter

data/lib/torque/postgresql/adapter/oid/line.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     class Line < Struct.new(:slope, :intercept)

data/lib/torque/postgresql/adapter/oid/range.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter

data/lib/torque/postgresql/adapter/oid/segment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     class Segment < Struct.new(:point0, :point1)

data/lib/torque/postgresql/adapter/quoting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter

data/lib/torque/postgresql/adapter/schema_creation.rb

@@ -24,10 +24,17 @@ module Torque
             end)
           end
 
+          if respond_to?(:supports_check_constraints?) && supports_check_constraints?
+            statements.concat(o.check_constraints.map do |expression, options|
+              check_constraint_in_create(o.name, expression, options)
+            end)
+          end
+
           create_sql << "(#{statements.join(', ')})" \
             if statements.present? || o.inherits.present?
 
-          add_table_options!(create_sql, table_options(o))
+          options = PostgreSQL::AR610 ? o : table_options(o)
+          add_table_options!(create_sql, options)
 
           if o.inherits.present?
             tables = o.inherits.map(&method(:quote_table_name))

data/lib/torque/postgresql/adapter/schema_definitions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter

data/lib/torque/postgresql/adapter/schema_dumper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter
@@ -39,7 +41,7 @@ module Torque
 
           def tables(stream) # :nodoc:
             inherited_tables = @connection.inherited_tables
-            sorted_tables = @connection.data_sources.sort - @connection.views
+            sorted_tables = @connection.tables.sort - @connection.views
 
             stream.puts "  # These are the common tables managed"
             (sorted_tables - inherited_tables.keys).each do |table_name|

data/lib/torque/postgresql/adapter/schema_statements.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Adapter

data/lib/torque/postgresql/arel/infix_operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Arel
@@ -22,6 +24,8 @@ module Torque
       }.freeze
 
       INFLIX_OPERATION.each do |operator_name, operator|
+        next if nodes.const_defined?(operator_name)
+
         klass = Class.new(inflix)
         klass.send(:define_method, :initialize) { |*args| super(operator, *args) }
 
@@ -31,7 +35,7 @@ module Torque
         # Don't worry about quoting here, if the right side is something that
         # doesn't need quoting, it will leave it as it is
         Math.send(:define_method, operator_name.underscore) do |other|
-          klass.new(self, nodes.build_quoted(other, self))
+          klass.new(self, other)
         end
       end
 

data/lib/torque/postgresql/arel/join_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Arel

data/lib/torque/postgresql/arel/nodes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Arel

data/lib/torque/postgresql/arel/operations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Arel

data/lib/torque/postgresql/arel/select_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Arel

data/lib/torque/postgresql/arel/visitors.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Arel
       module Visitors
         # Enclose select manager with parenthesis
         # :TODO: Remove when checking the new version of Arel
-        def visit_Arel_SelectManager o, collector
+        def visit_Arel_SelectManager(o, collector)
           collector << '('
           visit(o.ast, collector) << ')'
         end
@@ -23,8 +25,9 @@ module Torque
 
         # Allow quoted arrays to get here
         def visit_Arel_Nodes_Casted(o, collector)
-          return super unless o.val.is_a?(::Enumerable)
-          quote_array(o.val, collector)
+          value = o.respond_to?(:val) ? o.val : o.value
+          return super unless value.is_a?(::Enumerable)
+          quote_array(value, collector)
         end
 
         ## TORQUE VISITORS

data/lib/torque/postgresql/associations/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Associations
@@ -19,12 +21,14 @@ module Torque
             add_id = owner[reflection.active_record_primary_key]
             record_fk = reflection.foreign_key
 
-            record[record_fk].push(add_id) unless (record[record_fk] ||= []).include?(add_id)
+            list = record[record_fk] ||= []
+            list.push(add_id) unless list.include?(add_id)
           end
 
       end
 
       ::ActiveRecord::Associations::Association.prepend(Association)
+      ::ActiveRecord::Associations::HasManyAssociation.prepend(Association)
     end
   end
 end

data/lib/torque/postgresql/associations/association_scope.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Associations

data/lib/torque/postgresql/associations/belongs_to_many_association.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'active_record/associations/collection_association'
+
 # FIXME: build, create
 module Torque
   module PostgreSQL

data/lib/torque/postgresql/associations/builder/belongs_to_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Associations

data/lib/torque/postgresql/associations/builder/has_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Associations

data/lib/torque/postgresql/associations/preloader/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Associations
@@ -38,11 +40,37 @@ module Torque
               end
             end
 
+            if PostgreSQL::AR610
+            # This is how Rails 6.1 now load the records
+              def load_records
+                return super unless connected_through_array?
+
+                @records_by_owner = {}.compare_by_identity
+                raw_records = owner_keys.empty? ? [] : records_for(owner_keys)
+
+                @preloaded_records = raw_records.select do |record|
+                  assignments = false
+
+                  ids = convert_key(record[association_key_name])
+                  owners_by_key.values_at(*ids).flat_map do |owner|
+                    entries = (@records_by_owner[owner] ||= [])
+
+                    if reflection.collection? || entries.empty?
+                      entries << record
+                      assignments = true
+                    end
+                  end
+
+                  assignments
+                end
+              end
+            end
+
             # Build correctly the constraint condition in order to get the
             # associated ids
             def records_for(ids, &block)
               return super unless connected_through_array?
-              condition = scope.arel_attribute(association_key_name)
+              condition = scope.arel_table[association_key_name]
               condition = reflection.build_id_constraint(condition, ids.flatten.uniq)
               scope.where(condition).load(&block)
             end

data/lib/torque/postgresql/attributes/builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'builder/enum'
 require_relative 'builder/period'
 

data/lib/torque/postgresql/attributes/builder/enum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Attributes
@@ -153,12 +155,12 @@ module Torque
               cast_type = subtype.name.chomp('[]')
               klass_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
                 def has_#{attribute.pluralize}(*values)                             # def has_roles(*values)
-                  attr = arel_attribute('#{attribute}')                             #   attr = arel_attribute('role')
+                  attr = arel_table['#{attribute}']                                 #   attr = arel_table['role']
                   where(attr.contains(::Arel.array(values, cast: '#{cast_type}')))  #   where(attr.contains(::Arel.array(values, cast: 'roles')))
                 end                                                                 # end
 
                 def has_any_#{attribute.pluralize}(*values)                         # def has_roles(*values)
-                  attr = arel_attribute('#{attribute}')                             #   attr = arel_attribute('role')
+                  attr = arel_table['#{attribute}']                                 #   attr = arel_table['role']
                   where(attr.overlaps(::Arel.array(values, cast: '#{cast_type}')))  #   where(attr.overlaps(::Arel.array(values, cast: 'roles')))
                 end                                                                 # end
               RUBY
@@ -184,7 +186,7 @@ module Torque
               values_methods.each do |key, (scope, ask, bang, val)|
                 klass_content += <<-RUBY
                   def #{scope}                                    # def admin
-                    attr = arel_attribute('#{attribute}')         #   attr = arel_attribute('role')
+                    attr = arel_table['#{attribute}']             #   attr = arel_table['role']
                     where(::#{enum_klass}.scope(attr, '#{val}'))  #   where(Enum::Roles.scope(attr, 'admin'))
                   end                                             # end
                 RUBY

data/lib/torque/postgresql/attributes/builder/period.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Attributes
@@ -202,7 +204,7 @@ module Torque
             end
 
             def arel_attribute
-              @arel_attribute ||= "arel_attribute(#{attribute.inspect})"
+              @arel_attribute ||= "arel_table[#{attribute.inspect}]"
             end
 
             def arel_default_sql
@@ -245,7 +247,7 @@ module Torque
             def arel_real_start_at
               return arel_start_at unless threshold.present?
               @arel_real_start_at ||= begin
-                result = "(#{arel_start_at} - #{arel_threshold_value})"
+                result = +"(#{arel_start_at} - #{arel_threshold_value})"
                 result << '.cast(:date)' if  type.eql?(:daterange)
                 result
               end
@@ -255,7 +257,7 @@ module Torque
             def arel_real_finish_at
               return arel_finish_at unless threshold.present?
               @arel_real_finish_at ||= begin
-                result = "(#{arel_finish_at} + #{arel_threshold_value})"
+                result = +"(#{arel_finish_at} + #{arel_threshold_value})"
                 result << '.cast(:date)' if  type.eql?(:daterange)
                 result
               end
@@ -276,7 +278,7 @@ module Torque
 
             # Create an arel named function
             def arel_named_function(name, *args)
-              result = "::Arel::Nodes::NamedFunction.new(#{name.to_s.inspect}"
+              result = +"::Arel::Nodes::NamedFunction.new(#{name.to_s.inspect}"
               result << ', [' << args.join(', ') << ']' if args.present?
               result << ')'
             end

data/lib/torque/postgresql/attributes/enum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Attributes
@@ -31,11 +33,6 @@ module Torque
             end
           end
 
-          # You can specify the connection name for each enum
-          def connection_specification_name
-            return self == Enum ? 'primary' : superclass.connection_specification_name
-          end
-
           # Overpass new so blank values return only nil
           def new(value)
             return Lazy.new(self, LAZY_VALUE) if value.blank?
@@ -45,9 +42,7 @@ module Torque
           # Load the list of values in a lazy way
           def values
             @values ||= self == Enum ? nil : begin
-              conn_name = connection_specification_name
-              conn = connection(conn_name)
-              conn.enum_values(type_name).freeze
+              connection.enum_values(type_name).freeze
             end
           end
 
@@ -110,8 +105,8 @@ module Torque
             end
 
             # Get a connection based on its name
-            def connection(name)
-              ActiveRecord::Base.connection_handler.retrieve_connection(name)
+            def connection
+              ::ActiveRecord::Base.connection
             end
 
         end

data/lib/torque/postgresql/attributes/enum_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Attributes

data/lib/torque/postgresql/attributes/lazy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Attributes
@@ -16,7 +18,7 @@ module Torque
         end
 
         def inspect
-          'nil'.freeze
+          'nil'
         end
 
         def __class__

data/lib/torque/postgresql/attributes/period.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Attributes

data/lib/torque/postgresql/autosave_association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module AutosaveAssociation
@@ -8,9 +10,13 @@ module Torque
           save_method = :"autosave_associated_records_for_#{reflection.name}"
           define_non_cyclic_method(save_method) { save_belongs_to_many_array(reflection) }
 
-          before_save(:before_save_collection_association)
-          after_save(:after_save_collection_association) if ::ActiveRecord::Base
-            .instance_methods.include?(:after_save_collection_association)
+          if PostgreSQL::AR610
+            around_save(:around_save_collection_association)
+          else
+            before_save(:before_save_collection_association)
+            after_save(:after_save_collection_association) if ::ActiveRecord::Base
+              .instance_methods.include?(:after_save_collection_association)
+          end
 
           before_create(save_method)
           before_update(save_method)

data/lib/torque/postgresql/auxiliary_statement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'auxiliary_statement/settings'
 
 module Torque

data/lib/torque/postgresql/auxiliary_statement/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     class AuxiliaryStatement

data/lib/torque/postgresql/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Base

data/lib/torque/postgresql/coder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Coder
@@ -8,7 +10,7 @@ module Torque
       class << self
 
         NEED_QUOTE_FOR = /[\\"(){}, \t\n\r\v\f]/m
-        DELIMITER = ','.freeze
+        DELIMITER = ','
 
         # This method replace the +read_array+ method from PG gem
         # See https://github.com/ged/ruby-pg/blob/master/ext/pg_text_decoder.c#L177
@@ -32,7 +34,7 @@ module Torque
             quoted = 0
             escaped = false
             result = []
-            part = ''
+            part = String.new
 
             # Always start getting the non-collection character, the second char
             stream.getc if stream.pos == 0
@@ -59,7 +61,7 @@ module Torque
 
                   escaped = false
                   quoted = 0
-                  part = ''
+                  part = String.new
 
                 when c == '"'
                   quoted = 1

data/lib/torque/postgresql/collector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Collector

data/lib/torque/postgresql/config.rb

@@ -1,7 +1,12 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     include ActiveSupport::Configurable
 
+    # Stores a version check for compatibility purposes
+    AR610 = (ActiveRecord.gem_version >= Gem::Version.new('6.1.0'))
+
     # Use the same logger as the Active Record one
     def self.logger
       ActiveRecord::Base.logger

data/lib/torque/postgresql/geometry_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     class GeometryBuilder < ActiveModel::Type::Value

data/lib/torque/postgresql/i18n.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module I18n

data/lib/torque/postgresql/inheritance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     InheritanceError = Class.new(ArgumentError)

data/lib/torque/postgresql/migration/command_recorder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Migration

data/lib/torque/postgresql/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     # = Torque PostgreSQL Railtie

data/lib/torque/postgresql/reflection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'reflection/abstract_reflection'
 require_relative 'reflection/association_reflection'
 require_relative 'reflection/belongs_to_many_reflection'

data/lib/torque/postgresql/reflection/abstract_reflection.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Reflection
       module AbstractReflection
         AREL_ATTR = ::Arel::Attributes::Attribute
 
-        ARR_NO_CAST = 'bigint'.freeze
-        ARR_CAST = 'bigint[]'.freeze
+        ARR_NO_CAST = 'bigint'
+        ARR_CAST = 'bigint[]'
 
         # Check if the foreign key actually exists
         def connected_through_array?
@@ -68,11 +70,18 @@ module Torque
           klass_attr.overlaps(source_attr)
         end
 
+        if PostgreSQL::AR610
+          # TODO: Deprecate this method
+          def join_keys
+            OpenStruct.new(key: join_primary_key, foreign_key: join_foreign_key)
+          end
+        end
+
         private
 
           def build_id_constraint_between(table, foreign_table)
-            klass_attr  = table[join_keys.key.to_s]
-            source_attr = foreign_table[join_keys.foreign_key.to_s]
+            klass_attr  = table[join_primary_key]
+            source_attr = foreign_table[join_foreign_key]
 
             build_id_constraint(klass_attr, source_attr)
           end
@@ -117,7 +126,6 @@ module Torque
                 valid_inverse_reflection?(reflection)
             end
           end
-
       end
 
       ::ActiveRecord::Reflection::AbstractReflection.prepend(AbstractReflection)

data/lib/torque/postgresql/reflection/association_reflection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Reflection

data/lib/torque/postgresql/reflection/belongs_to_many_reflection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Reflection

data/lib/torque/postgresql/reflection/has_many_reflection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Reflection

data/lib/torque/postgresql/reflection/runtime_reflection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Reflection

data/lib/torque/postgresql/reflection/through_reflection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Reflection

data/lib/torque/postgresql/relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'relation/distinct_on'
 require_relative 'relation/auxiliary_statement'
 require_relative 'relation/inheritance'
@@ -48,12 +50,12 @@ module Torque
           when String
             ::Arel.sql(klass.send(:sanitize_sql, item.to_s))
           when Symbol
-            base ? base.arel_attribute(item) : klass.arel_attribute(item)
+            base ? base.arel_table[item] : klass.arel_table[item]
           when Array
             resolve_column(item, base)
           when Hash
             raise ArgumentError, 'Unsupported Hash for attributes on third level' if base
-            item.map { |key, other_list| resolve_column(Array.wrap(other_list), key) }
+            item.map { |key, other_list| resolve_column(other_list, key) }
           else
             raise ArgumentError, "Unsupported argument type: #{value} (#{value.class})"
           end
@@ -65,8 +67,8 @@ module Torque
         return unless relation
 
         table = predicate_builder.send(:table)
-        if table.associated_with?(relation)
-          table.associated_table(relation).send(:klass)
+        if table.associated_with?(relation.to_s)
+          table.associated_table(relation.to_s).send(:klass)
         else
           raise ArgumentError, "Relation for #{relation} not found on #{klass}"
         end
@@ -138,14 +140,16 @@ module Torque
     ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES += %i[cast_records itself_only
       distinct_on auxiliary_statements]
 
-    Relation::SINGLE_VALUE_METHODS.each do |value|
-      ActiveRecord::QueryMethods::DEFAULT_VALUES[value] = nil \
-        if ActiveRecord::QueryMethods::DEFAULT_VALUES[value].nil?
-    end
+    unless AR610
+      Relation::SINGLE_VALUE_METHODS.each do |value|
+        ActiveRecord::QueryMethods::DEFAULT_VALUES[value] = nil \
+          if ActiveRecord::QueryMethods::DEFAULT_VALUES[value].nil?
+      end
 
-    Relation::MULTI_VALUE_METHODS.each do |value|
-      ActiveRecord::QueryMethods::DEFAULT_VALUES[value] ||= \
-        ActiveRecord::QueryMethods::FROZEN_EMPTY_ARRAY
+      Relation::MULTI_VALUE_METHODS.each do |value|
+        ActiveRecord::QueryMethods::DEFAULT_VALUES[value] ||= \
+          ActiveRecord::QueryMethods::FROZEN_EMPTY_ARRAY
+      end
     end
 
     $VERBOSE = warn_level

data/lib/torque/postgresql/relation/auxiliary_statement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation
@@ -34,7 +36,10 @@ module Torque
         # attributes as well
         def bound_attributes
           visitor = ::Arel::Visitors::PostgreSQL.new(ActiveRecord::Base.connection)
-          visitor.accept(self.arel.ast, ::Arel::Collectors::Bind.new).value
+          visitor.accept(self.arel.ast, ::Arel::Collectors::Composite.new(
+            ::Arel::Collectors::SQLString.new,
+            ::Arel::Collectors::Bind.new,
+          )).value.last
         end
 
         private

data/lib/torque/postgresql/relation/distinct_on.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation

data/lib/torque/postgresql/relation/inheritance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation

data/lib/torque/postgresql/relation/merger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Relation

data/lib/torque/postgresql/schema_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     LookupError = Class.new(ArgumentError)

data/lib/torque/postgresql/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
-    VERSION = '2.0.3'
+    VERSION = '2.0.4'
   end
 end

data/spec/schema.rb

@@ -11,7 +11,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 begin
-  version = 61
+  version = 62
 
   raise SystemExit if ActiveRecord::Migrator.current_version == version
   ActiveRecord::Schema.define(version: version) do
@@ -83,7 +83,7 @@ begin
     create_table "courses", force: :cascade do |t|
       t.string   "title",      null: false
       t.interval "duration"
-      t.enum     "types", subtype: :types, array: true, default: [:A, :B]
+      t.enum     "types", subtype: :types, array: true
       t.datetime "created_at", null: false
       t.datetime "updated_at", null: false
     end

data/spec/tests/arel_spec.rb

@@ -25,7 +25,9 @@ RSpec.describe 'Arel' do
       klass_name = operator.to_s.camelize
 
       context "##{operator}" do
-        let(:instance) { attribute.public_send(operator, value) }
+        let(:instance) do
+          attribute.public_send(operator, value.is_a?(Array) ? ::Arel.array(value) : value)
+        end
 
         context 'for attribute' do
           let(:klass) { ::Arel::Nodes.const_get(klass_name) }

data/spec/tests/enum_set_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe 'Enum' do
       expect(dump_io.string).to match checker
     end
 
-    it 'can have a default value as an array of symbols' do
+    xit 'can have a default value as an array of symbols' do
       dump_io = StringIO.new
       checker = /t\.enum +"types", +default: \[:A, :B\], +array: true, +subtype: :types/
       ActiveRecord::SchemaDumper.dump(connection, dump_io)

data/spec/tests/has_many_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe 'HasMany' do
     let(:builder) { ActiveRecord::Associations::Builder::HasMany }
 
     it 'adds the array option' do
-      expect(builder.send(:valid_options, [])).to include(:array)
+      expect(builder.send(:valid_options, {})).to include(:array)
     end
   end
 

data/spec/tests/table_inheritance_spec.rb

@@ -66,7 +66,7 @@ RSpec.describe 'TableInheritance' do
 
     it 'allows empty-body create table operation' do
       sql = connection.create_table(:activity_posts, inherits: :activities)
-      result = 'CREATE TABLE "activity_posts" ()'
+      result = "CREATE TABLE \"activity_posts\" ()"
       result << ' INHERITS ( "activities" )'
       expect(sql).to eql(result)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -333,8 +333,10 @@ test_files:
 - spec/factories/videos.rb
 - spec/tests/geometric_builder_spec.rb
 - spec/tests/range_spec.rb
+- spec/tests/table_inheritance_spec.rb
 - spec/tests/enum_spec.rb
 - spec/tests/auxiliary_statement_spec.rb
+- spec/tests/enum_set_spec.rb
 - spec/tests/coder_spec.rb
 - spec/tests/collector_spec.rb
 - spec/tests/distinct_on_spec.rb
@@ -342,12 +344,10 @@ test_files:
 - spec/tests/lazy_spec.rb
 - spec/tests/quoting_spec.rb
 - spec/tests/relation_spec.rb
-- spec/tests/arel_spec.rb
-- spec/tests/enum_set_spec.rb
 - spec/tests/belongs_to_many_spec.rb
-- spec/tests/has_many_spec.rb
 - spec/tests/period_spec.rb
-- spec/tests/table_inheritance_spec.rb
+- spec/tests/arel_spec.rb
+- spec/tests/has_many_spec.rb
 - spec/mocks/cache_query.rb
 - spec/mocks/create_table.rb
 - spec/en.yml