torque-postgresql 1.1.7 → 2.0.4

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
@@ -211,19 +213,7 @@ module Torque
               foreign_table = ::Arel::Table.new(association.plural_name)
             end
 
-            # Add the scopes defined by the reflection
-            # Possibilities:
-            # table
-            # table, foreign_klass
-            # table, foreign_table, foreign_klass
-            if association.respond_to?(:join_scope)
-              arity = association.method(:join_scope).arity
-              args = [@query.arel_table, foreign_table, base]
-              args.delete_at(1) if arity <= 2 # Delete foreign_table
-              args.delete_at(1) if arity <= 1 # Delete base (foreign_klass)
-
-              @query.merge(association.join_scope(*args))
-            end
+            @query.merge(association.join_scope(@query.arel_table, foreign_table, base))
 
             # Add the join constraints
             constraint = association.build_join_constraint(table, foreign_table)

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,15 +1,16 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Coder
 
       # This class represents an Record to be encoded, instead of a literal Array
-      class Record < Array
-      end
+      Record = Class.new(Array)
 
       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
@@ -33,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
@@ -60,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,12 +1,11 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     include ActiveSupport::Configurable
 
     # Stores a version check for compatibility purposes
-    AR510 = (ActiveRecord.gem_version >= Gem::Version.new('5.1.0'))
-    AR520 = (ActiveRecord.gem_version >= Gem::Version.new('5.2.0'))
-    AR521 = (ActiveRecord.gem_version >= Gem::Version.new('5.2.1'))
-    AR523 = (ActiveRecord.gem_version >= Gem::Version.new('5.2.3'))
+    AR610 = (ActiveRecord.gem_version >= Gem::Version.new('6.1.0'))
 
     # Use the same logger as the Active Record one
     def self.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)
@@ -18,14 +20,7 @@ module Torque
         klass.find(self.id)
       end
 
-      private
-
-        def using_single_table_inheritance?(record) # :nodoc:
-          self.class.physically_inherited? || super
-        end
-
       module ClassMethods
-
         delegate :_auto_cast_attribute, :_record_class_attribute, to: ActiveRecord::Relation
 
         # Get a full list of all attributes from a model and all its dependents
@@ -101,9 +96,10 @@ module Torque
 
         # Get the final decorated table, regardless of any special condition
         def decorated_table_name
-          if parent < Base && !parent.abstract_class?
-            contained = parent.table_name
-            contained = contained.singularize if parent.pluralize_table_names
+          parent_class = try(:module_parent) || try(:parent)
+          if parent_class < Base && !parent_class.abstract_class?
+            contained = parent_class.table_name
+            contained = contained.singularize if parent_class.pluralize_table_names
             contained += "_"
           end
 
@@ -144,17 +140,19 @@ module Torque
 
         private
 
-          def discriminate_class_for_record(record) # :nodoc:
+          def instantiate_instance_of(klass, attributes, column_types = {}, &block)
+            return super unless klass.physically_inheritances?
+
             auto_cast = _auto_cast_attribute.to_s
             record_class = _record_class_attribute.to_s
+            return super unless attributes.key?(record_class) &&
+               attributes.delete(auto_cast) && attributes[record_class] != table_name
 
-            return super unless record.key?(record_class) &&
-              record.delete(auto_cast) && record[record_class] != table_name
+            klass = casted_dependents[attributes[record_class]]
+            raise_unable_to_cast(attributes[record_class]) if klass.nil?
+            filter_attributes_for_cast(attributes, klass)
 
-            klass = casted_dependents[record[record_class]]
-            raise_unable_to_cast(record[record_class]) if klass.nil?
-            filter_attributes_for_cast(record, klass)
-            klass
+            super(klass, attributes, column_types, &block)
           end
 
           # Filter the record attributes to be loaded to not included those from

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,39 +1,34 @@
+# 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?
           false
         end
 
-        # Monkey patching for rais 5.0
-        def torque_join_keys
-          method(:join_keys).arity.eql?(0) ? join_keys : join_keys(klass)
-        end
-
-        # Fix for rails 5.2.3 where the join_scope method is the one now
-        # responsible for building the join condition
-        if Torque::PostgreSQL::AR523
-          def join_scope(table, foreign_table, foreign_klass)
-            return super unless connected_through_array?
+        # Fix where the join_scope method is the one now responsible for
+        # building the join condition
+        def join_scope(table, foreign_table, foreign_klass)
+          return super unless connected_through_array?
 
-            predicate_builder = predicate_builder(table)
-            scope_chain_items = join_scopes(table, predicate_builder)
-            klass_scope       = klass_join_scope(table, predicate_builder)
+          predicate_builder = predicate_builder(table)
+          scope_chain_items = join_scopes(table, predicate_builder)
+          klass_scope       = klass_join_scope(table, predicate_builder)
 
-            klass_scope.where!(build_id_constraint_between(table, foreign_table))
-            klass_scope.where!(type => foreign_klass.polymorphic_name) if type
-            klass_scope.where!(klass.send(:type_condition, table)) \
-              if klass.finder_needs_type_condition?
+          klass_scope.where!(build_id_constraint_between(table, foreign_table))
+          klass_scope.where!(type => foreign_klass.polymorphic_name) if type
+          klass_scope.where!(klass.send(:type_condition, table)) \
+            if klass.finder_needs_type_condition?
 
-            scope_chain_items.inject(klass_scope, &:merge!)
-          end
+          scope_chain_items.inject(klass_scope, &:merge!)
         end
 
         # Manually build the join constraint
@@ -50,9 +45,9 @@ module Torque
           return klass_attr.eq(source_attr) unless connected_through_array?
 
           # Klass and key are associated with the reflection Class
-          klass_type = klass.columns_hash[torque_join_keys.key.to_s]
+          klass_type = klass.columns_hash[join_keys.key.to_s]
           # active_record and foreign_key are associated with the source Class
-          source_type = active_record.columns_hash[torque_join_keys.foreign_key.to_s]
+          source_type = active_record.columns_hash[join_keys.foreign_key.to_s]
 
           # If both are attributes but the left side is not an array, and the
           # right side is, use the ANY operation
@@ -75,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[torque_join_keys.key.to_s]
-            source_attr = foreign_table[torque_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
@@ -105,6 +107,7 @@ module Torque
           # returns either +nil+ or the inverse association name that it finds.
           def automatic_inverse_of
             return super unless connected_through_array?
+
             if can_find_inverse_of_automatically?(self)
               inverse_name = options[:as] || active_record.name.demodulize
               inverse_name = ActiveSupport::Inflector.underscore(inverse_name)
@@ -123,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
@@ -34,38 +36,16 @@ module Torque
           @active_record_primary_key ||= options[:primary_key] || derive_primary_key
         end
 
-        unless PostgreSQL::AR510
-          def join_keys(*)
-            JoinKeys.new(join_pk, join_fk)
-          end
+        def join_primary_key(*)
+          active_record_primary_key
         end
 
-        if PostgreSQL::AR520
-          def join_primary_key(*)
-            active_record_primary_key
-          end
-
-          def join_foreign_key
-            foreign_key
-          end
-        else
-          def join_id_for(owner)
-            owner[foreign_key]
-          end
+        def join_foreign_key
+          foreign_key
         end
 
         private
 
-          unless PostgreSQL::AR520
-            def join_pk(*)
-              active_record_primary_key
-            end
-
-            def join_fk
-              foreign_key
-            end
-          end
-
           def derive_primary_key
             klass.primary_key
           end

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,15 +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 do |key, other_list|
-              other_list = [other_list] unless other_list.kind_of? Enumerable
-              resolve_column(other_list, key)
-            end
+            raise ArgumentError, 'Unsupported Hash for attributes on third level' if base
+            item.map { |key, other_list| resolve_column(other_list, key) }
           else
             raise ArgumentError, "Unsupported argument type: #{value} (#{value.class})"
           end
@@ -68,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,10 +137,10 @@ module Torque
     ActiveRecord::Relation::SINGLE_VALUE_METHODS       += Relation::SINGLE_VALUE_METHODS
     ActiveRecord::Relation::MULTI_VALUE_METHODS        += Relation::MULTI_VALUE_METHODS
     ActiveRecord::Relation::VALUE_METHODS              += Relation::VALUE_METHODS
-    ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES += [:cast_records, :itself_only,
-      :distinct_on, :auxiliary_statements]
+    ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES += %i[cast_records itself_only
+      distinct_on auxiliary_statements]
 
-    if ActiveRecord::QueryMethods.const_defined?('DEFAULT_VALUES')
+    unless AR610
       Relation::SINGLE_VALUE_METHODS.each do |value|
         ActiveRecord::QueryMethods::DEFAULT_VALUES[value] = nil \
           if ActiveRecord::QueryMethods::DEFAULT_VALUES[value].nil?