torque-postgresql 2.0.0 → 2.0.5

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'builder/enum'
 require_relative 'builder/period'
 
@@ -7,7 +9,7 @@ module Torque
       module Builder
         def self.include_on(klass, method_name, builder_klass, **extra, &block)
           klass.define_singleton_method(method_name) do |*args, **options|
-            return unless connection.table_exists?(table_name)
+            return unless table_exists?
 
             args.each do |attribute|
               begin

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/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
@@ -10,6 +12,10 @@ module Torque
           true
         end
 
+        def belongs_to?
+          true
+        end
+
         def collection?
           true
         end
@@ -19,7 +25,7 @@ module Torque
         end
 
         def foreign_key
-          @foreign_key ||= options[:primary_key] || derive_foreign_key.freeze
+          @foreign_key ||= options[:foreign_key] || derive_foreign_key.freeze
         end
 
         def association_foreign_key
@@ -27,16 +33,24 @@ module Torque
         end
 
         def active_record_primary_key
-          @active_record_primary_key ||= options[:foreign_key] || derive_primary_key
+          @active_record_primary_key ||= options[:primary_key] || derive_primary_key
+        end
+
+        def join_primary_key(*)
+          active_record_primary_key
+        end
+
+        def join_foreign_key
+          foreign_key
         end
 
         private
 
-          def derive_foreign_key
+          def derive_primary_key
             klass.primary_key
           end
 
-          def derive_primary_key
+          def derive_foreign_key
             "#{name.to_s.singularize}_ids"
           end
       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,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