torque-postgresql 2.0.0 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5076bbdf3cee649de6955a308c0a51425755f5c87a2e83ee4b028a5009f6960f
-  data.tar.gz: ba7308a8927428a6496ef04b9edbd09270c303d43d0d10a9528033734a86fe2f
+  metadata.gz: fe8259f8bb0f4c8c67c32919ec2bc2ca448c5372857670ed5fbd4d932e3160d6
+  data.tar.gz: 3786a17977e0d4ffd81c1521c9e469fd411b6d15b413866941adc911beb8c2dd
 SHA512:
-  metadata.gz: 4898d7f63ec4a7df180d3c4dcb80aab3d7269bcede0eab54a03f0c3591d314ddc025e45f755a9ae60a914d6cc4ecc8ca42011c44afbb62ec3432693a1abf8be0
-  data.tar.gz: a4621ea2a37aa566fcb33db4cdcaaf83b4539d96ed30628f81fda79f0b02c2c2ab1b197ef6e0448cbcdc43b584e53293ca110f3d299a0c6b13b89ff4f34aefcb
+  metadata.gz: f35b0eb94b260cc5c5c9d08a47dcba841d9044c9acc52d30b0ad13b1e0a6ecbe2ef10ca940828870fbf5f04b387827b9c56db43523e0585f77f950a72e368b51
+  data.tar.gz: a3b899a4c7a26f9ff9a6a9af7f0d41a6ed193e96a76d96ae17a2423eb0b4bc6ea59138684cd324a28ccfad7374528c1cb72d4ae89a0ad710ce66655d3e355e50

data/lib/torque/postgresql.rb

@@ -18,7 +18,6 @@ require 'torque/postgresql/arel'
 require 'torque/postgresql/adapter'
 require 'torque/postgresql/associations'
 require 'torque/postgresql/attributes'
-require 'torque/postgresql/autosave_association'
 require 'torque/postgresql/auxiliary_statement'
 require 'torque/postgresql/base'
 require 'torque/postgresql/inheritance'

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|
@@ -49,30 +51,33 @@ module Torque
             if inherited_tables.present?
               stream.puts "  # These are tables that has inheritance"
               inherited_tables.each do |table_name, inherits|
-                unless ignored?(table_name)
-                  sub_stream = StringIO.new
-                  table(table_name, sub_stream)
-
-                  # Add the inherits setting
-                  sub_stream.rewind
-                  inherits.map!(&:to_sym)
-                  inherits = inherits.first if inherits.size === 1
-                  inherits = ", inherits: #{inherits.inspect} do |t|"
-                  table_dump = sub_stream.read.gsub(/ do \|t\|$/, inherits)
-
-                  # Ensure bodyless definitions
-                  table_dump.gsub!(/do \|t\|\n  end/, '')
-                  stream.print table_dump
-                end
+                next if ignored?(table_name)
+
+                sub_stream = StringIO.new
+                table(table_name, sub_stream)
+
+                # Add the inherits setting
+                sub_stream.rewind
+                inherits.map!(&:to_sym)
+                inherits = inherits.first if inherits.size === 1
+                inherits = ", inherits: #{inherits.inspect} do |t|"
+                table_dump = sub_stream.read.gsub(/ do \|t\|$/, inherits)
+
+                # Ensure bodyless definitions
+                table_dump.gsub!(/do \|t\|\n  end/, '')
+                stream.print table_dump
               end
             end
 
-            # dump foreign keys at the end to make sure all dependent tables exist.
+            # Dump foreign keys at the end to make sure all dependent tables exist.
             if @connection.supports_foreign_keys?
               sorted_tables.each do |tbl|
                 foreign_keys(tbl, stream) unless ignored?(tbl)
               end
             end
+
+            # Scenic integration
+            views(stream) if defined?(::Scenic)
           end
 
           # Dump user defined types like enum
@@ -81,7 +86,7 @@ module Torque
             return unless types.any?
 
             stream.puts "  # These are user-defined types used on this database"
-            types.each { |name, type| send(type.to_sym, name, stream) }
+            types.sort_by(&:first).each { |(name, type)| send(type.to_sym, name, stream) }
             stream.puts
           rescue => e
             stream.puts "# Could not dump user-defined types because of following #{e.class}"

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
@@ -11,6 +13,10 @@ module Torque
           @inversed = self.target.present?
         end
 
+        def skip_statement_cache?(*)
+          super || reflection.connected_through_array?
+        end
+
         private
 
           def set_owner_attributes(record)
@@ -19,12 +25,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
@@ -28,11 +31,11 @@ module Torque
         end
 
         def ids_reader
-          owner[reflection.active_record_primary_key]
+          owner[source_attr]
         end
 
         def ids_writer(new_ids)
-          column = reflection.active_record_primary_key
+          column = source_attr
           command = owner.persisted? ? :update_column : :write_attribute
           owner.public_send(command, column, new_ids.presence)
           @association_scope = nil
@@ -41,8 +44,8 @@ module Torque
         def insert_record(record, *)
           super
 
-          attribute = (ids_reader || owner[reflection.active_record_primary_key] = [])
-          attribute.push(record[klass_fk])
+          attribute = (ids_reader || owner[source_attr] = [])
+          attribute.push(record[klass_attr])
           record
         end
 
@@ -51,8 +54,8 @@ module Torque
         end
 
         def include?(record)
-          list = owner[reflection.active_record_primary_key]
-          ids_reader && ids_reader.include?(record[klass_fk])
+          list = owner[source_attr]
+          ids_reader && ids_reader.include?(record[klass_attr])
         end
 
         private
@@ -66,7 +69,7 @@ module Torque
           # When the idea is to nulligy the association, then just set the owner
           # +primary_key+ as empty
           def delete_count(method, scope, ids = nil)
-            ids ||= scope.pluck(klass_fk)
+            ids ||= scope.pluck(klass_attr)
             scope.delete_all if method == :delete_all
             remove_stash_records(ids)
           end
@@ -77,13 +80,13 @@ module Torque
 
           # Deletes the records according to the <tt>:dependent</tt> option.
           def delete_records(records, method)
-            ids = Array.wrap(records).each_with_object(klass_fk).map(&:[])
+            ids = Array.wrap(records).each_with_object(klass_attr).map(&:[])
 
             if method == :destroy
               records.each(&:destroy!)
               remove_stash_records(ids)
             else
-              scope = self.scope.where(klass_fk => records)
+              scope = self.scope.where(klass_attr => records)
               delete_count(method, scope, ids)
             end
           end
@@ -99,10 +102,14 @@ module Torque
             ids_writer(ids_reader - Array.wrap(ids))
           end
 
-          def klass_fk
+          def source_attr
             reflection.foreign_key
           end
 
+          def klass_attr
+            reflection.active_record_primary_key
+          end
+
           def difference(a, b)
             a - b
           end

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
@@ -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