torque-postgresql 2.2.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcb69118c9cca1afe5ef21a9ed9b4cf98e9036108b739707a1e7f65058aaaf84
-  data.tar.gz: d7ca85705f802c0d15c0aabca99a9ec17b8403e60e912724b609d8b93cd7bd86
+  metadata.gz: d4fac19ef8680f477df0f79502331ddda06266658a54c8128321d68145a9f18b
+  data.tar.gz: 0e93ec49f80d40ec9ce9b7fcc5ef0eff65a882cad79a63e5429657ad9c66691b
 SHA512:
-  metadata.gz: 0a48ed549030276f9a3e4c845454eb89cf97b8d0bf3d00cd5431abd85a7317f6031e4f997e86ae3657012ca9d4578598d612a14c531247575f1d0496bc629f6e
-  data.tar.gz: 50a1817ef37c0c8d98a71b92500a73b420f5dc27cf9d19afc6aeb8492e3d4582b69ee9ada91b281699987cc4bb33a9d1df584219073d432299ebad53a4a29513
+  metadata.gz: 4a9abd492b544296c29e0949e1ad0ad4852a1ed0c48379551e5ffbbaad7018579cad994ac2a841231603bdddd8da4b448d7771a9086312289f818124d842d6a6
+  data.tar.gz: 8019255d20eff471ed177078e1bd6042a0a9b95752d32578bdb8ce86afdf9cffbefa8ed181caab0143f0dbbf80cfc39c99fd005cfc2b28089687b26a635268ef

data/lib/torque/postgresql/adapter/database_statements.rb

@@ -34,6 +34,15 @@ module Torque
           execute("SET SESSION IntervalStyle TO 'iso_8601'", 'SCHEMA')
         end
 
+        # Since enums create new types, type map needs to be rebooted to include
+        # the new ones, both normal and array one
+        def create_enum(name, *)
+          super
+
+          oid = query_value("SELECT #{quote(name)}::regtype::oid", "SCHEMA").to_i
+          load_additional_types([oid])
+        end
+
         # Change some of the types being mapped
         def initialize_type_map(m = type_map)
           super
@@ -54,7 +63,7 @@ module Torque
 
         # Add the composite types to be loaded too.
         def torque_load_additional_types(oids = nil)
-          filter = "AND     a.typelem::integer IN (%s)" % oids.join(", ") if oids
+          filter = ("AND     a.typelem::integer IN (%s)" % oids.join(', ')) if oids
 
           query = <<-SQL
             SELECT      a.typelem AS oid, t.typname, t.typelem,
@@ -132,7 +141,9 @@ module Torque
         # Get the list of columns, and their definition, but only from the
         # actual table, does not include columns that comes from inherited table
         def column_definitions(table_name) # :nodoc:
+          # Only affects inheritance
           local_condition = 'AND a.attislocal IS TRUE' if @_dump_mode
+
           query(<<-SQL, 'SCHEMA')
               SELECT a.attname, format_type(a.atttypid, a.atttypmod),
                      pg_get_expr(d.adbin, d.adrelid), a.attnotnull, a.atttypid, a.atttypmod,

data/lib/torque/postgresql/adapter/oid/enum_set.rb

@@ -14,7 +14,7 @@ module Torque
           end
 
           def type
-            :enum_set
+            :enum
           end
 
           def deserialize(value)

data/lib/torque/postgresql/adapter/oid.rb

@@ -19,9 +19,6 @@ module Torque
       ActiveRecord::Type.register(:enum_set, OID::EnumSet,  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/quoting.rb

@@ -6,6 +6,8 @@ module Torque
       module Quoting
 
         Name = ActiveRecord::ConnectionAdapters::PostgreSQL::Name
+        Column = ActiveRecord::ConnectionAdapters::PostgreSQL::Column
+        ColumnDefinition = ActiveRecord::ConnectionAdapters::ColumnDefinition
 
         # Quotes type names for use in SQL queries.
         def quote_type_name(string, schema = nil)
@@ -20,26 +22,19 @@ module Torque
         end
 
         def quote_default_expression(value, column)
-          if column.options.try(:[], :array) && value.class <= Array
-            quote(value) + '::' + column.sql_type
-          else
-            super
-          end
+          return super unless value.class <= Array || value.class <= Set
+
+          type =
+            if column.is_a?(ColumnDefinition) && column.options.try(:[], :array)
+              # This is the general way
+              lookup_cast_type(column.sql_type)
+            elsif column.is_a?(Column) && column.array?
+              # When using +change_column_default+
+              lookup_cast_type_from_column(column)
+            end
+
+          type.nil? ? super : quote(type.serialize(value.to_a))
         end
-
-        private
-
-          def _quote(value)
-            return super unless value.is_a?(Array)
-
-            values = value.map(&method(:quote))
-            "ARRAY[#{values.join(','.freeze)}]"
-          end
-
-          def _type_cast(value)
-            return super unless value.is_a?(Array)
-            value.map(&method(:quote)).join(','.freeze)
-          end
       end
     end
   end

data/lib/torque/postgresql/adapter/schema_creation.rb

@@ -33,8 +33,7 @@ module Torque
           create_sql << "(#{statements.join(', ')})" \
             if statements.present? || o.inherits.present?
 
-          options = PostgreSQL::AR610 ? o : table_options(o)
-          add_table_options!(create_sql, options)
+          add_table_options!(create_sql, o)
 
           if o.inherits.present?
             tables = o.inherits.map(&method(:quote_table_name))

data/lib/torque/postgresql/adapter/schema_definitions.rb

@@ -3,35 +3,7 @@
 module Torque
   module PostgreSQL
     module Adapter
-      module ColumnMethods
-
-        # Creates a column with an interval type, allowing span of times and
-        # dates to be stored without having to store a seconds-based integer
-        # or any sort of other approach
-        def interval(*args, **options)
-          args.each { |name| column(name, :interval, **options) }
-        end
-
-        # Creates a column with an enum type, needing to specify the subtype,
-        # which is basically the name of the type defined prior creating the
-        # column
-        def enum(*args, **options)
-          subtype = options.delete(:subtype)
-          args.each { |name| column(name, (subtype || name), **options) }
-        end
-
-        # Creates a column with an enum array type, needing to specify the
-        # subtype, which is basically the name of the type defined prior
-        # creating the column
-        def enum_set(*args, **options)
-          super(*args, **options.merge(array: true))
-        end
-
-      end
-
       module TableDefinition
-        include ColumnMethods
-
         attr_reader :inherits
 
         def initialize(*args, **options)
@@ -42,16 +14,7 @@ module Torque
         end
       end
 
-      ActiveRecord::ConnectionAdapters::PostgreSQL::Table.include ColumnMethods
       ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.include TableDefinition
-
-      if ActiveRecord::ConnectionAdapters::PostgreSQL.const_defined?('ColumnDefinition')
-        module ColumnDefinition
-          attr_accessor :subtype
-        end
-
-        ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDefinition.include ColumnDefinition
-      end
     end
   end
 end

data/lib/torque/postgresql/adapter/schema_dumper.rb

@@ -12,33 +12,13 @@ module Torque
           stream
         end
 
-        def extensions(stream) # :nodoc:
-          super
-          user_defined_types(stream)
-        end
-
         # Translate +:enum_set+ into +:enum+
         def schema_type(column)
           column.type == :enum_set ? :enum : super
         end
 
-        # Adds +:subtype+ option to the default set
-        def prepare_column_options(column)
-          spec = super
-
-          if subtype = schema_subtype(column)
-            spec[:subtype] = subtype
-          end
-
-          spec
-        end
-
         private
 
-          def schema_subtype(column)
-            column.sql_type.to_sym.inspect if column.type == :enum || column.type == :enum_set
-          end
-
           def tables(stream) # :nodoc:
             inherited_tables = @connection.inherited_tables
             sorted_tables = @connection.tables.sort - @connection.views
@@ -83,26 +63,6 @@ module Torque
             functions(stream) if defined?(::Fx::SchemaDumper::Function)
             triggers(stream) if defined?(::Fx::SchemaDumper::Trigger)
           end
-
-          # Dump user defined types like enum
-          def user_defined_types(stream)
-            types = @connection.user_defined_types('e')
-            return unless types.any?
-
-            stream.puts "  # These are user-defined types used on this database"
-            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}"
-            stream.puts "#   #{e.message}"
-            stream.puts
-          end
-
-          # Dump enum custom type
-          def enum(name, stream)
-            values = @connection.enum_values(name).map { |v| "\"#{v}\"" }
-            stream.puts "  create_enum \"#{name}\", [#{values.join(', ')}], force: :cascade"
-          end
       end
 
       ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend SchemaDumper

data/lib/torque/postgresql/adapter/schema_statements.rb

@@ -25,21 +25,6 @@ module Torque
           SQL
         end
 
-        # Creates a new PostgreSQL enumerator type
-        #
-        # Example:
-        #   create_enum 'status', ['foo', 'bar']
-        #   create_enum 'status', ['foo', 'bar'], prefix: true
-        #   create_enum 'status', ['foo', 'bar'], suffix: 'test'
-        #   create_enum 'status', ['foo', 'bar'], force: true
-        def create_enum(name, values, options = {})
-          drop_type(name, options) if options[:force]
-          execute <<-SQL.squish
-            CREATE TYPE #{quote_type_name(name, options[:schema])} AS ENUM
-            (#{quote_enum_values(name, values, options).join(', ')})
-          SQL
-        end
-
         # Changes the enumerator by adding new values
         #
         # Example:

data/lib/torque/postgresql/adapter.rb

@@ -49,15 +49,6 @@ module Torque
           end
         end
       end
-
-      # Extend the extract default value to support array
-      def extract_value_from_default(default)
-        return super unless Torque::PostgreSQL.config.use_extended_defaults
-        return super unless default&.match(/ARRAY\[(.*?)\](?:::"?([\w. ]+)"?(?:\[\])+)?$/)
-
-        arr = $1.split(/(?!\B\[[^\]]*), ?(?![^\[]*\]\B)/)
-        DeduplicatableArray.new(arr.map(&method(:extract_value_from_default)))
-      end
     end
 
     ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend Adapter

data/lib/torque/postgresql/associations/belongs_to_many_association.rb

@@ -53,7 +53,8 @@ module Torque
 
         def load_target
           if stale_target? || find_target?
-            @target = merge_target_lists(find_target, target)
+            persisted_records = (find_target || []) + target.extract!(&:persisted?)
+            @target = merge_target_lists(persisted_records, target)
           end
 
           loaded!
@@ -227,8 +228,9 @@ module Torque
           end
 
           def invertible_for?(record)
-            inverse = inverse_reflection_for(record)
-            inverse && (inverse.has_many? && inverse.connected_through_array?)
+            return unless (inverse = inverse_reflection_for(record))
+            collection_class = ::ActiveRecord::Associations::HasManyAssociation
+            inverse.is_a?(collection_class) && inverse.connected_through_array?
           end
 
           def stale_state

data/lib/torque/postgresql/associations/{association.rb → foreign_association.rb}

@@ -3,7 +3,7 @@
 module Torque
   module PostgreSQL
     module Associations
-      module Association
+      module ForeignAssociation
 
         # There is no problem of adding temporary items on target because
         # CollectionProxy will handle memory and persisted relationship
@@ -33,9 +33,6 @@ module Torque
           end
 
       end
-
-      ::ActiveRecord::Associations::Association.prepend(Association)
-      ::ActiveRecord::Associations::HasManyAssociation.prepend(Association)
     end
   end
 end

data/lib/torque/postgresql/associations/preloader/association.rb

@@ -11,8 +11,61 @@ module Torque
           # For reflections connected through an array, make sure to properly
           # decuple the list of ids and set them as associated with the owner
           def run
+            return self if run?
             return super unless connected_through_array?
+
+            @run = true
             send("run_array_for_#{@reflection.macro}")
+            self
+          end
+
+          # Correctly correlate records when they are connected theough an array
+          def set_inverse(record)
+            return super unless connected_through_array? && @reflection.macro == :has_many
+
+            # Only the first owner is associated following the same instruction
+            # on the original implementation
+            convert_key(record[association_key_name])&.each do |key|
+              if owners = owners_by_key[key]
+                association = owners.first.association(reflection.name)
+                association.set_inverse_instance(record)
+              end
+            end
+          end
+
+          # Requires a slight change when running on has many since the value
+          # of the foreign key being an array
+          def load_records(raw_records = nil)
+            return super unless connected_through_array? && @reflection.macro == :has_many
+
+            @records_by_owner = {}.compare_by_identity
+            raw_records ||= loader_query.records_for([self])
+
+            @preloaded_records = raw_records.select do |record|
+              assignments = false
+
+              keys = convert_key(record[association_key_name]) || []
+              owners_by_key.values_at(*keys).each do |owner|
+                entries = (@records_by_owner[owner] ||= [])
+
+                if reflection.collection? || entries.empty?
+                  entries << record
+                  assignments = true
+                end
+              end
+
+              assignments
+            end
+          end
+
+          # Make sure to change the process when connected through an array
+          def owners_by_key
+            return super unless connected_through_array?
+            @owners_by_key ||= owners.each_with_object({}) do |owner, result|
+              Array.wrap(convert_key(owner[owner_key_name])).each do |key|
+                (result[key] ||= []) << owner
+              end
+            end
           end
 
           private
@@ -41,32 +94,6 @@ module Torque
               end
             end
 
-            if PostgreSQL::AR604
-            # This is how Rails 6.0.4 and 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)

data/lib/torque/postgresql/associations/preloader/loader_query.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Torque
+  module PostgreSQL
+    module Associations
+      module Preloader
+        module LoaderQuery
+          def foreign_column
+            @foreign_column ||= scope.columns_hash[association_key_name]
+          end
+
+          def load_records_for_keys(keys, &block)
+            condition = query_condition_for(keys)
+            scope.where(condition).load(&block)
+          end
+
+          def query_condition_for(keys)
+            if connected_through_array?
+              value = scope.cast_for_condition(foreign_column, keys.to_a)
+              scope.table[association_key_name].overlaps(value)
+            else
+              { association_key_name => keys }
+            end
+          end
+
+          def connected_through_array?
+            foreign_column.array?
+          end
+        end
+
+        ::ActiveRecord::Associations::Preloader::Association::LoaderQuery
+          .prepend(LoaderQuery)
+      end
+    end
+  end
+end

data/lib/torque/postgresql/associations/preloader.rb

@@ -1 +1,2 @@
 require_relative 'preloader/association'
+require_relative 'preloader/loader_query'

data/lib/torque/postgresql/associations.rb

@@ -1,5 +1,10 @@
-require_relative 'associations/association'
 require_relative 'associations/association_scope'
 require_relative 'associations/belongs_to_many_association'
+require_relative 'associations/foreign_association'
+
 require_relative 'associations/builder'
 require_relative 'associations/preloader'
+
+association_mod = Torque::PostgreSQL::Associations::ForeignAssociation
+::ActiveRecord::Associations::HasManyAssociation.prepend(association_mod)
+::ActiveRecord::Associations::BelongsToManyAssociation.prepend(association_mod)

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

@@ -220,7 +220,7 @@ module Torque
               @arel_threshold_value ||= begin
                 case threshold
                 when Symbol, String
-                  "arel_attribute('#{threshold}')"
+                  "arel_table['#{threshold}']"
                 when ActiveSupport::Duration
                   value = "'#{threshold.to_i} seconds'"
                   "::Arel.sql(\"#{value}\").cast(:interval)"
@@ -453,7 +453,11 @@ module Torque
               attr_value = threshold.present? ? method_names[:real] : attribute
               default_value = default.inspect
 
-              "#{attr_value}.nil? ? #{default_value} : #{attr_value}.include?(value)"
+              [
+                "return #{default_value} if #{attr_value}.nil?",
+                "(#{attr_value}.min.try(:infinite?) || #{attr_value}.min <= value) &&",
+                "  (#{attr_value}.max.try(:infinite?) || #{attr_value}.max > value)",
+              ].join("\n")
             end
 
             def instance_start

data/lib/torque/postgresql/config.rb

@@ -4,10 +4,6 @@ module Torque
   module PostgreSQL
     include ActiveSupport::Configurable
 
-    # Stores a version check for compatibility purposes
-    AR604 = (ActiveRecord.gem_version >= Gem::Version.new('6.0.4'))
-    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
@@ -26,11 +22,6 @@ module Torque
     # same configuration is set to true
     config.eager_load = false
 
-    # This allows default values to have extended values like arrays and casted
-    # values. Extended defaults are still experimental, so enable and test it
-    # before using it in prod
-    config.use_extended_defaults = false
-
     # Set a list of irregular model name when associated with table names
     config.irregular_models = {}
     def config.irregular_models=(hash)
@@ -66,11 +57,11 @@ module Torque
 
       # The name of the method to be used on any ActiveRecord::Base to
       # initialize model-based enum features
-      enum.base_method = :enum
+      enum.base_method = :torque_enum
 
       # The name of the method to be used on any ActiveRecord::Base to
       # initialize model-based enum set features
-      enum.set_method = :enum_set
+      enum.set_method = :torque_enum_set
 
       # Indicates if bang methods like 'disabled!' should update the record on
       # database or not

data/lib/torque/postgresql/reflection/abstract_reflection.rb

@@ -45,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[join_keys.key.to_s]
+          klass_type = klass.columns_hash[join_primary_key.to_s]
           # active_record and foreign_key are associated with the source Class
-          source_type = active_record.columns_hash[join_keys.foreign_key.to_s]
+          source_type = active_record.columns_hash[join_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
@@ -70,11 +70,9 @@ 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
+        # TODO: Deprecate this method
+        def join_keys
+          OpenStruct.new(key: join_primary_key, foreign_key: join_foreign_key)
         end
 
         private

data/lib/torque/postgresql/relation.rb

@@ -19,6 +19,8 @@ module Torque
       MULTI_VALUE_METHODS = [:distinct_on, :auxiliary_statements, :cast_records, :select_extra]
       VALUE_METHODS = SINGLE_VALUE_METHODS + MULTI_VALUE_METHODS
 
+      ARColumn = ::ActiveRecord::ConnectionAdapters::PostgreSQL::Column
+
       # :nodoc:
       def select_extra_values; get_value(:select_extra); end
       # :nodoc:
@@ -74,6 +76,14 @@ module Torque
         end
       end
 
+      # Serialize the given value so it can be used in a condition tha involves
+      # the given column
+      def cast_for_condition(column, value)
+        column = columns_hash[column.to_s] unless column.is_a?(ARColumn)
+        caster = connection.lookup_cast_type_from_column(column)
+        connection.type_cast(caster.serialize(value))
+      end
+
       private
 
         def build_arel(*)
@@ -140,18 +150,6 @@ module Torque
     ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES += %i[cast_records itself_only
       distinct_on auxiliary_statements]
 
-    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
-      end
-    end
-
     $VERBOSE = warn_level
   end
 end

data/lib/torque/postgresql/schema_cache.rb

@@ -109,6 +109,7 @@ module Torque
 
       # Try to find a model based on a given table
       def lookup_model(table_name, scoped_class = '')
+        # byebug if table_name == 'activities'
         scoped_class = scoped_class.name if scoped_class.is_a?(Class)
         return @data_sources_model_names[table_name] \
           if @data_sources_model_names.key?(table_name)
@@ -123,7 +124,7 @@ module Torque
 
         # Test all the possible names against all the possible scopes
         until scopes.size == 0
-          scope = scopes.join.safe_constantize
+          scope = scopes.join.chomp('::').safe_constantize
           model = find_model(max_name, table_name, scope) unless scope.nil?
           return @data_sources_model_names[table_name] = model unless model.nil?
           scopes.pop

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '2.2.1'
+    VERSION = '3.0.0'
   end
 end

data/lib/torque-postgresql.rb

@@ -1,2 +1 @@
 require 'torque/postgresql'
-require 'torque/range'

data/spec/models/question_select.rb

@@ -1,2 +1,4 @@
+require_relative 'question'
+
 class QuestionSelect < Question
 end