torque-postgresql 2.0.3 → 2.1.1

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Associations
@@ -55,12 +57,9 @@ module Torque
               end
             end
 
-            unless reflection.counter_cache_column
-              model.after_create callback.call(:saved_changes), if: :saved_changes?
-              model.after_destroy callback.call(:changes_to_save)
-            end
-
+            model.after_create callback.call(:saved_changes), if: :saved_changes?
             model.after_update callback.call(:saved_changes), if: :saved_changes?
+            model.after_destroy callback.call(:changes_to_save)
             model.after_touch callback.call(:changes_to_save)
           end
 
@@ -95,6 +94,10 @@ module Torque
             end
           end
 
+          def self.add_destroy_callbacks(model, reflection)
+            model.after_destroy lambda { |o| o.association(reflection.name).handle_dependency }
+          end
+
           def self.define_validations(model, reflection)
             if reflection.options.key?(:required)
               reflection.options[:optional] = !reflection.options.delete(:required)

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
@@ -33,16 +35,43 @@ module Torque
                 ids.each { |id| records[id].concat(Array.wrap(record)) }
               end
 
+              records.default_proc = nil
               owners.each do |owner|
                 associate_records_to_owner(owner, records[owner[owner_key_name]] || [])
               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'
 
@@ -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
@@ -31,13 +33,13 @@ module Torque
           def values_methods
             return @values_methods if defined?(@values_methods)
 
-            prefix = options.fetch(:prefix, nil).try(:<<, '_')
-            suffix = options.fetch(:suffix, nil).try(:prepend, '_')
+            prefix = options.fetch(:prefix, nil)
+            suffix = options.fetch(:suffix, nil)
 
-            prefix = attribute + '_' if prefix == true
-            suffix = '_' + attribute if suffix == true
+            prefix = attribute if prefix == true
+            suffix = attribute if suffix == true
 
-            base   = "#{prefix}%s#{suffix}"
+            base   = [prefix, '%s', suffix].compact.join('_')
 
             @values_methods = begin
               values.map do |val|
@@ -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
@@ -27,15 +29,10 @@ module Torque
           def include_on(klass, method_name = nil)
             method_name ||= Torque::PostgreSQL.config.enum.base_method
             Builder.include_on(klass, method_name, Builder::Enum) do |builder|
-              defined_enums[builder.attribute.to_sym] = builder.subtype
+              defined_enums[builder.attribute.to_s] = builder.subtype
             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
@@ -30,7 +32,7 @@ module Torque
           def include_on(klass, method_name = nil)
             method_name ||= Torque::PostgreSQL.config.enum.set_method
             Builder.include_on(klass, method_name, Builder::Enum, set_features: true) do |builder|
-              defined_enums[builder.attribute.to_sym] = builder.subtype
+              defined_enums[builder.attribute.to_s] = builder.subtype
             end
           end
 

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,35 +1,38 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module AutosaveAssociation
       module ClassMethods
+        # Since belongs to many is a collection, the callback would normally go
+        # to +after_create+. However, since it is a +belongs_to+ kind of
+        # association, it neds to be executed +before_save+
         def add_autosave_association_callbacks(reflection)
           return super unless reflection.macro.eql?(:belongs_to_many)
 
           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)
+          define_non_cyclic_method(save_method) do
+            save_belongs_to_many_association(reflection)
+          end
 
-          before_create(save_method)
-          before_update(save_method)
+          before_save(save_method)
 
           define_autosave_validation_callbacks(reflection)
         end
       end
 
-      def save_belongs_to_many_array(reflection)
-        save_collection_association(reflection)
+      # Ensure the right way to execute +save_collection_association+ and also
+      # keep it as a single change using +build_changes+
+      def save_belongs_to_many_association(reflection)
+        previously_new_record_before_save = (@new_record_before_save ||= false)
+        @new_record_before_save = new_record?
 
         association = association_instance_get(reflection.name)
-        return unless association
-
-        klass_attr = reflection.active_record_primary_key
-        source_attr = reflection.foreign_key
-
-        records = association.target.each_with_object(klass_attr)
-        write_attribute(source_attr, records.map(&:read_attribute).compact)
+        association&.build_changes { save_collection_association(reflection) }
+      rescue ::ActiveRecord::RecordInvalid
+        throw(:abort)
+      ensure
+        @new_record_before_save = previously_new_record_before_save
       end
     end
 

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
@@ -198,11 +200,18 @@ module Torque
         #   belongs_to_many :tags, dependent: :nullify
         #   belongs_to_many :tags, required: true, touch: true
         #   belongs_to_many :tags, default: -> { Tag.default }
-        def belongs_to_many(name, scope = nil, **options)
-          reflection = Associations::Builder::BelongsToMany.build(self, name, scope, options)
+        def belongs_to_many(name, scope = nil, **options, &extension)
+          klass = Associations::Builder::BelongsToMany
+          reflection = klass.build(self, name, scope, options, &extension)
           ::ActiveRecord::Reflection.add_reflection(self, name, reflection)
         end
 
+        # Allow extra keyword arguments to be sent to +InsertAll+
+        def upsert_all(attributes, **xargs)
+          xargs = xargs.merge(on_duplicate: :update)
+          ::ActiveRecord::InsertAll.new(self, attributes, **xargs).execute
+        end
+
         protected
 
           # Allow optional select attributes to be loaded manually when they are

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)