torque-postgresql 2.0.3 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e426686cf04fcf990d84b945abe3b3435168237f1ff24c6f23ac3b4941bbc4e
-  data.tar.gz: 2f936f5676f80804e4766bc9bf64b81d70ddbd08e9409b373b0d59d7d20e8bf1
+  metadata.gz: 1f5815c2fe0a3682db3ccb907a29aa171382bfa6d70ffcb58ef7e7bdbb840f65
+  data.tar.gz: 32ae2c431e089c2c83d6c73be202ae86e79c129f1a79a08ca596ff87ffb231f6
 SHA512:
-  metadata.gz: 373d085090e02e76eb2523f7c2d5a32434c002f712cf892aa38f81bc9935a51f2426054c97bb5df534c47e23fd1800d84b670b9443266908e2f076f20928e7a2
-  data.tar.gz: f0441cc66de2ed015d0b8dbb13ae88dc4074a54c8477fc7a31fc1d51e2bfd7cb57ab0e3de529dcbd4feb3fa72dd1fc8894738868e8bfa36ad9490badc3d1c990
+  metadata.gz: 78c8d75e7b3534570caa48fe0a607417431813b04d842fb60b292d252d7ab0cb73ac16df488ba71242238f160ad746fe21ea162a988da0e11809c962e988b2d7
+  data.tar.gz: a9450b4271ddf00be01ef4fb1a45365970310887d0179c457928f8ab36d0be9378e9738befe3797380ace0cbb66181f973f4d966cd39cd3fff7eceef7afb8082

data/lib/torque/postgresql.rb

@@ -22,6 +22,7 @@ require 'torque/postgresql/autosave_association'
 require 'torque/postgresql/auxiliary_statement'
 require 'torque/postgresql/base'
 require 'torque/postgresql/inheritance'
+require 'torque/postgresql/insert_all'
 require 'torque/postgresql/coder'
 require 'torque/postgresql/migration'
 require 'torque/postgresql/relation'

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'
@@ -13,12 +15,33 @@ module Torque
       include DatabaseStatements
       include SchemaStatements
 
+      INJECT_WHERE_REGEX = /(DO UPDATE SET.*excluded\.[^ ]+) RETURNING/.freeze
+
       # Get the current PostgreSQL version as a Gem Version.
       def version
         @version ||= Gem::Version.new(
           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
+
+      # Allow filtered bulk insert by adding the where clause. This method is only used by
+      # +InsertAll+, so it somewhat safe to override it
+      def build_insert_sql(insert)
+        super.tap do |sql|
+          if insert.update_duplicates? && insert.where_condition?
+            if insert.returning
+              sql.gsub!(INJECT_WHERE_REGEX, "\\1 WHERE #{insert.where} RETURNING")
+            else
+              sql << " WHERE #{insert.where}"
+            end
+          end
+        end
+      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
@@ -6,6 +8,9 @@ module Torque
 
           attr_reader :name, :klass, :set_klass, :enum_klass
 
+          # Delegate all Hash-like methods to the enum class
+          delegate *(Array.public_instance_methods - Object.public_methods), to: :@klass
+
           def self.create(row, type_map)
             name    = row['typname']
             oid     = row['oid'].to_i

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,15 +41,15 @@ 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"
+            stream.puts "  # These are the common tables"
             (sorted_tables - inherited_tables.keys).each do |table_name|
               table(table_name, stream) unless ignored?(table_name)
             end
 
             if inherited_tables.present?
-              stream.puts "  # These are tables that has inheritance"
+              stream.puts "  # These are tables that have inheritance"
               inherited_tables.each do |table_name, inherits|
                 next if ignored?(table_name)
 
@@ -76,6 +78,10 @@ module Torque
 
             # Scenic integration
             views(stream) if defined?(::Scenic)
+
+            # FX integration
+            functions(stream) if defined?(::Fx::SchemaDumper::Function)
+            triggers(stream) if defined?(::Fx::SchemaDumper::Trigger)
           end
 
           # Dump user defined types like enum

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,8 +1,12 @@
+# frozen_string_literal: true
+
 module Torque
   module PostgreSQL
     module Associations
       module Association
 
+        # There is no problem of adding temporary items on target because
+        # CollectionProxy will handle memory and persisted relationship
         def inversed_from(record)
           return super unless reflection.connected_through_array?
 
@@ -11,20 +15,27 @@ module Torque
           @inversed = self.target.present?
         end
 
+        # The binds and the cache are getting mixed and caching the wrong query
+        def skip_statement_cache?(*)
+          super || reflection.connected_through_array?
+        end
+
         private
 
+          # This is mainly for the has many when connect through an array to add
+          # its id to the list of the inverse belongs to many association
           def set_owner_attributes(record)
             return super unless reflection.connected_through_array?
 
             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[reflection.foreign_key] ||= []
+            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
@@ -6,10 +9,71 @@ module Torque
       class BelongsToManyAssociation < ::ActiveRecord::Associations::CollectionAssociation
         include ::ActiveRecord::Associations::ForeignAssociation
 
+        ## CUSTOM
+        def ids_reader
+          if loaded?
+            target.pluck(reflection.association_primary_key)
+          elsif !target.empty?
+            load_target.pluck(reflection.association_primary_key)
+          else
+            stale_state || column_default_value
+          end
+        end
+
+        def ids_writer(ids)
+          ids = ids.presence || column_default_value
+          owner.write_attribute(source_attr, ids)
+          return unless owner.persisted? && owner.attribute_changed?(source_attr)
+
+          owner.update_attribute(source_attr, ids)
+        end
+
+        def size
+          if loaded?
+            target.size
+          elsif !target.empty?
+            unsaved_records = target.select(&:new_record?)
+            unsaved_records.size + stale_state.size
+          else
+            stale_state&.size || 0
+          end
+        end
+
+        def empty?
+          size.zero?
+        end
+
+        def include?(record)
+          return false unless record.is_a?(reflection.klass)
+          return include_in_memory?(record) if record.new_record?
+
+          (!target.empty? && target.include?(record)) ||
+            stale_state&.include?(record.read_attribute(klass_attr))
+        end
+
+        def load_target
+          if stale_target? || find_target?
+            @target = merge_target_lists(find_target, target)
+          end
+
+          loaded!
+          target
+        end
+
+        def build_changes(from_target = false)
+          return yield if defined?(@_building_changes) && @_building_changes
+
+          @_building_changes = true
+          yield.tap { ids_writer(from_target ? ids_reader : stale_state) }
+        ensure
+          @_building_changes = nil
+        end
+
+        ## HAS MANY
         def handle_dependency
           case options[:dependent]
           when :restrict_with_exception
-            raise ::ActiveRecord::DeleteRestrictionError.new(reflection.name) unless empty?
+            raise ActiveRecord::DeleteRestrictionError.new(reflection.name) unless empty?
 
           when :restrict_with_error
             unless empty?
@@ -19,86 +83,89 @@ module Torque
             end
 
           when :destroy
-            # No point in executing the counter update since we're going to destroy the parent anyway
             load_target.each { |t| t.destroyed_by_association = reflection }
             destroy_all
+          when :destroy_async
+            load_target.each do |t|
+              t.destroyed_by_association = reflection
+            end
+
+            unless target.empty?
+              association_class = target.first.class
+              primary_key_column = association_class.primary_key.to_sym
+
+              ids = target.collect do |assoc|
+                assoc.public_send(primary_key_column)
+              end
+
+              enqueue_destroy_association(
+                owner_model_name: owner.class.to_s,
+                owner_id: owner.id,
+                association_class: association_class.to_s,
+                association_ids: ids,
+                association_primary_key_column: primary_key_column,
+                ensuring_owner_was_method: options.fetch(:ensuring_owner_was, nil)
+              )
+            end
           else
             delete_all
           end
         end
 
-        def ids_reader
-          owner[source_attr]
-        end
-
-        def ids_writer(new_ids)
-          column = source_attr
-          command = owner.persisted? ? :update_column : :write_attribute
-          owner.public_send(command, column, new_ids.presence)
-          @association_scope = nil
-        end
-
         def insert_record(record, *)
-          super
-
-          attribute = (ids_reader || owner[source_attr] = [])
-          attribute.push(record[klass_attr])
-          record
-        end
-
-        def empty?
-          size.zero?
+          super.tap do |saved|
+            ids_rewriter(record.read_attribute(klass_attr), :<<) if saved
+          end
         end
 
-        def include?(record)
-          list = owner[source_attr]
-          ids_reader && ids_reader.include?(record[klass_attr])
+        ## BELONGS TO
+        def default(&block)
+          writer(owner.instance_exec(&block)) if reader.nil?
         end
 
         private
 
-          # Returns the number of records in this collection, which basically
-          # means count the number of entries in the +primary_key+
-          def count_records
-            ids_reader&.size || (@target ||= []).size
+          ## CUSTOM
+          def _create_record(attributes, raises = false, &block)
+            if attributes.is_a?(Array)
+              attributes.collect { |attr| _create_record(attr, raises, &block) }
+            else
+              build_record(attributes, &block).tap do |record|
+                transaction do
+                  result = nil
+                  add_to_target(record) do
+                    result = insert_record(record, true, raises) { @_was_loaded = loaded? }
+                  end
+                  raise ActiveRecord::Rollback unless result
+                end
+              end
+            end
           end
 
-          # When the idea is to nulligy the association, then just set the owner
+          # When the idea is to nullify the association, then just set the owner
           # +primary_key+ as empty
-          def delete_count(method, scope, ids = nil)
-            ids ||= scope.pluck(klass_attr)
-            scope.delete_all if method == :delete_all
-            remove_stash_records(ids)
+          def delete_count(method, scope, ids)
+            size_cache = scope.delete_all if method == :delete_all
+            (size_cache || ids.size).tap { ids_rewriter(ids, :-) }
           end
 
           def delete_or_nullify_all_records(method)
-            delete_count(method, scope)
+            delete_count(method, scope, ids_reader)
           end
 
           # Deletes the records according to the <tt>:dependent</tt> option.
           def delete_records(records, method)
-            ids = Array.wrap(records).each_with_object(klass_attr).map(&:[])
+            ids = read_records_ids(records)
 
             if method == :destroy
               records.each(&:destroy!)
-              remove_stash_records(ids)
+              ids_rewriter(ids, :-)
             else
               scope = self.scope.where(klass_attr => records)
               delete_count(method, scope, ids)
             end
           end
 
-          def concat_records(*)
-            result = super
-            ids_writer(ids_reader)
-            result
-          end
-
-          def remove_stash_records(ids)
-            return if ids_reader.nil?
-            ids_writer(ids_reader - Array.wrap(ids))
-          end
-
           def source_attr
             reflection.foreign_key
           end
@@ -107,6 +174,37 @@ module Torque
             reflection.active_record_primary_key
           end
 
+          def read_records_ids(records)
+            return unless records.present?
+            Array.wrap(records).each_with_object(klass_attr).map(&:read_attribute).presence
+          end
+
+          def ids_rewriter(ids, operator)
+            list = owner[source_attr] ||= []
+            list = list.public_send(operator, ids)
+            owner[source_attr] = list.uniq.compact.presence || column_default_value
+
+            return if @_building_changes || !owner.persisted?
+            owner.update_attribute(source_attr, list)
+          end
+
+          def column_default_value
+            owner.class.columns_hash[source_attr].default
+          end
+
+          ## HAS MANY
+          def replace_records(*)
+            build_changes(true) { super }
+          end
+
+          def concat_records(*)
+            build_changes(true) { super }
+          end
+
+          def delete_or_destroy(*)
+            build_changes(true) { super }
+          end
+
           def difference(a, b)
             a - b
           end
@@ -114,6 +212,28 @@ module Torque
           def intersection(a, b)
             a & b
           end
+
+          ## BELONGS TO
+          def scope_for_create
+            super.except!(klass.primary_key)
+          end
+
+          def find_target?
+            !loaded? && foreign_key_present? && klass
+          end
+
+          def foreign_key_present?
+            stale_state.present?
+          end
+
+          def invertible_for?(record)
+            inverse = inverse_reflection_for(record)
+            inverse && (inverse.has_many? && inverse.connected_through_array?)
+          end
+
+          def stale_state
+            owner.read_attribute(source_attr)
+          end
       end
 
       ::ActiveRecord::Associations.const_set(:BelongsToManyAssociation, BelongsToManyAssociation)