torque-postgresql 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09e539b25b952fb4d48bd092a90bae032ad8c26f1584cc5a704cdf96985b1e7e'
-  data.tar.gz: d79aa047ac44dc47a25979f71a0b46dfcbdc573f28d18bfcccbcb59b0a693c7b
+  metadata.gz: cb3d81538edfb988d8566295fac7d055208e399d552b619d9d8b3b9234254686
+  data.tar.gz: 7c7c62bec966085eccbdc351041a94d04788e40f84b1120d88c1673c9d0e3b3c
 SHA512:
-  metadata.gz: e2f75f66a5e0bed5f14006ff4ffd8e32f96bbe17f18ff4603c0706301c87114a1880b1a8f7bd530501d95c8f6dc10c563af6da5a2ba5f4414a31115c5510ca0f
-  data.tar.gz: 930b6381e8e920a274c411c2ba8abfe96a5b8462227c51dbf5ee9f2a41ac88b6f3a3946d4e49cab0017bb271c176d58c37690e5e646b8536476b83a1cba5c62b
+  metadata.gz: 93cf49b971a0013d3f10263917437b7a552632e62f462d43b91aaad86ec66ba10b20a014bf2bbcaa883f1c6801df423fd3d98dd8d9546bd849920bb98b743e6c
+  data.tar.gz: 88cf63c02e13e80e48b5dfbe66e9157a52ecc8cc11410f0688e97a6c28e7f25a03adc9c7b71a45ffe9384a81debbf1a29d55363145a4ae6568c82cc9f7207a30

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

@@ -42,6 +42,8 @@ module Torque
           m.register_type 'interval', OID::Interval.new
           m.register_type 'line',     OID::Line.new
           m.register_type 'segment',  OID::Segment.new
+
+          m.alias_type 'regclass', 'varchar'
         end
 
         # :nodoc:

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

@@ -20,7 +20,7 @@ module Torque
         end
 
         def quote_default_expression(value, column)
-          if value.class <= Array
+          if column.dig(:options, :array) && value.class <= Array
             quote(value) + '::' + column.sql_type
           else
             super

data/lib/torque/postgresql/adapter.rb

@@ -15,7 +15,14 @@ module Torque
       include DatabaseStatements
       include SchemaStatements
 
-      INJECT_WHERE_REGEX = /(DO UPDATE SET.*excluded\.[^ ]+) RETURNING/.freeze
+      # :nodoc:
+      class DeduplicatableArray < ::Array
+        def deduplicate
+          map { |value| -value }
+        end
+
+        alias :-@ :deduplicate
+      end
 
       # Get the current PostgreSQL version as a Gem Version.
       def version
@@ -29,19 +36,28 @@ module Torque
         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
+      # 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")
+              sql.sub!(' RETURNING ', " WHERE #{insert.where} RETURNING ")
             else
               sql << " WHERE #{insert.where}"
             end
           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/preloader/association.rb

@@ -41,8 +41,8 @@ module Torque
               end
             end
 
-            if PostgreSQL::AR610
-            # This is how Rails 6.1 now load the records
+            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?
 

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

@@ -452,12 +452,8 @@ module Torque
             def instance_current_on?
               attr_value = threshold.present? ? method_names[:real] : attribute
               default_value = default.inspect
-              [
-                "return #{default_value} if #{attr_value}.nil?",
-                "return #{default_value} if #{attr_value}.min.try(:infinite?)",
-                "return #{default_value} if #{attr_value}.max.try(:infinite?)",
-                "#{attr_value}.min < value && #{attr_value}.max > value",
-              ].join("\n")
+
+              "#{attr_value}.nil? ? #{default_value} : #{attr_value}.include?(value)"
             end
 
             def instance_start

data/lib/torque/postgresql/config.rb

@@ -5,6 +5,7 @@ module Torque
     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
@@ -25,6 +26,11 @@ 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)

data/lib/torque/postgresql/inheritance.rb

@@ -146,7 +146,7 @@ module Torque
             auto_cast = _auto_cast_attribute.to_s
             record_class = _record_class_attribute.to_s
             return super unless attributes.key?(record_class) &&
-               attributes.delete(auto_cast) && attributes[record_class] != table_name
+              attributes.delete(auto_cast) && attributes[record_class] != table_name
 
             klass = casted_dependents[attributes[record_class]]
             raise_unable_to_cast(attributes[record_class]) if klass.nil?

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

@@ -56,8 +56,10 @@ module Torque
       end
 
       ::ActiveRecord::Reflection.const_set(:BelongsToManyReflection, BelongsToManyReflection)
-      ::ActiveRecord::Reflection::AssociationReflection::VALID_AUTOMATIC_INVERSE_MACROS
-        .push(:belongs_to_many)
+
+      reflection_class = ::ActiveRecord::Reflection::AssociationReflection
+      reflection_class::VALID_AUTOMATIC_INVERSE_MACROS.push(:belongs_to_many) \
+        if reflection_class.const_defined?('VALID_AUTOMATIC_INVERSE_MACROS')
     end
   end
 end

data/lib/torque/postgresql/relation/inheritance.rb

@@ -5,6 +5,8 @@ module Torque
     module Relation
       module Inheritance
 
+        # REGCLASS = ::Arel.sql('tableoid').cast('regclass')
+
         # :nodoc:
         def cast_records_value; get_value(:cast_records); end
         # :nodoc:
@@ -44,14 +46,8 @@ module Torque
 
         # Like #cast_records, but modifies relation in place
         def cast_records!(*types, **options)
-          record_class = self.class._record_class_attribute
-
-          with!(record_class)
-          if options[:filter]
-            table = record_class.to_s.camelize.underscore
-            where!(table => { record_class => types.map(&:table_name) })
-          end
-
+          where!(regclass.cast(:varchar).in(types.map(&:table_name))) if options[:filter]
+          self.select_extra_values += [regclass.as(_record_class_attribute.to_s)]
           self.cast_records_value = (types.present? ? types : model.casted_dependents.values)
           self
         end
@@ -109,13 +105,12 @@ module Torque
           end
 
           def build_auto_caster_marker(arel, types)
-            types = types.map(&:table_name)
-            type_attribute = self.class._record_class_attribute.to_s
-            auto_cast_attribute = self.class._auto_cast_attribute.to_s
+            attribute = regclass.cast(:varchar).in(types.map(&:table_name))
+            attribute.as(self.class._auto_cast_attribute.to_s)
+          end
 
-            table = ::Arel::Table.new(type_attribute.camelize.underscore)
-            column = table[type_attribute].in(types)
-            ::Arel.sql(column.to_sql).as(auto_cast_attribute)
+          def regclass
+            arel_table['tableoid'].cast(:regclass)
           end
 
       end

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '2.1.3'
+    VERSION = '2.2.0'
   end
 end

data/lib/torque/range.rb

@@ -17,6 +17,4 @@ module Torque
     end
     alias_method :|, :union
   end
-
-  ::Range.include(Range)
 end

data/spec/tests/arel_spec.rb

@@ -48,6 +48,36 @@ RSpec.describe 'Arel' do
     end
   end
 
+  context 'on default value' do
+    let(:connection) { ActiveRecord::Base.connection }
+
+    before(:context) { Torque::PostgreSQL.config.use_extended_defaults = true }
+    after(:context) { Torque::PostgreSQL.config.use_extended_defaults = false }
+    after { Author.reset_column_information }
+
+    it 'does not break jsonb' do
+      expect { connection.add_column(:authors, :profile, :jsonb, default: []) }.not_to raise_error
+      expect(Author.columns_hash['profile'].default).to eq('[]')
+    end
+
+    it 'works properly when column is an array' do
+      expect { connection.add_column(:authors, :tag_ids, :bigint, array: true, default: []) }.not_to raise_error
+      expect(Author.columns_hash['tag_ids'].default).to eq([])
+    end
+
+    it 'works with an array with enum values' do
+      value = ['visitor', 'assistant']
+      expect { connection.add_column(:authors, :roles, :roles, array: true, default: value) }.not_to raise_error
+      expect(Author.columns_hash['roles'].default).to eq(value)
+    end
+
+    it 'works with multi dimentional array' do
+      value = [['1', '2'], ['3', '4']]
+      expect { connection.add_column(:authors, :tag_ids, :string, array: true, default: value) }.not_to raise_error
+      expect(Author.columns_hash['tag_ids'].default).to eq(value)
+    end
+  end
+
   context 'on cast' do
     it 'provides an array method' do
       sample1 = ::Arel.array(1, 2, 3, 4)

data/spec/tests/period_spec.rb

@@ -266,6 +266,15 @@ RSpec.describe 'Period' do
 
         instance.period = 4.hour.from_now.utc..6.hour.from_now.utc
         expect(instance).not_to be_current_period
+
+        instance.period = [nil, 4.hours.ago.utc]
+        expect(instance).not_to be_current_period
+
+        instance.period = [4.hours.from_now.utc, nil]
+        expect(instance).not_to be_current_period
+
+        instance.period = [nil, nil]
+        expect(instance).to be_current_period
       end
 
       it 'checks fro current based on a value' do

data/spec/tests/range_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe 'Range' do
+RSpec.xdescribe 'Range' do
   let(:sample) { (5..15) }
 
   it 'has intersection' do

data/spec/tests/table_inheritance_spec.rb

@@ -292,14 +292,12 @@ RSpec.describe 'TableInheritance' do
       end
 
       it 'adds all statements to load all the necessary records' do
-        result = 'WITH "record_class" AS (SELECT "pg_class"."oid", "pg_class"."relname" AS _record_class FROM "pg_class")'
-        result << ' SELECT "activities".*, "record_class"."_record_class", "i_0"."description"'
+        result = 'SELECT "activities".*, "activities"."tableoid"::regclass AS _record_class, "i_0"."description"'
         result << ', COALESCE("i_0"."url", "i_1"."url", "i_2"."url") AS url, "i_0"."activated" AS activity_books__activated'
         result << ', "i_1"."activated" AS activity_posts__activated, "i_2"."activated" AS activity_post_samples__activated'
         result << ', COALESCE("i_1"."file", "i_2"."file") AS file, COALESCE("i_1"."post_id", "i_2"."post_id") AS post_id'
-        result << ", \"record_class\".\"_record_class\" IN ('activity_books', 'activity_posts', 'activity_post_samples') AS _auto_cast"
+        result << ", \"activities\".\"tableoid\"::regclass::varchar IN ('activity_books', 'activity_posts', 'activity_post_samples') AS _auto_cast"
         result << ' FROM "activities"'
-        result << ' INNER JOIN "record_class" ON "record_class"."oid" = "activities"."tableoid"'
         result << ' LEFT OUTER JOIN "activity_books" "i_0" ON "activities"."id" = "i_0"."id"'
         result << ' LEFT OUTER JOIN "activity_posts" "i_1" ON "activities"."id" = "i_1"."id"'
         result << ' LEFT OUTER JOIN "activity_post_samples" "i_2" ON "activities"."id" = "i_2"."id"'
@@ -307,33 +305,27 @@ RSpec.describe 'TableInheritance' do
       end
 
       it 'can be have simplefied joins' do
-        result = 'WITH "record_class" AS (SELECT "pg_class"."oid", "pg_class"."relname" AS _record_class FROM "pg_class")'
-        result << ' SELECT "activities".*, "record_class"."_record_class"'
+        result = 'SELECT "activities".*, "activities"."tableoid"::regclass AS _record_class'
         result << ', "i_0"."description", "i_0"."url", "i_0"."activated"'
-        result << ", \"record_class\".\"_record_class\" IN ('activity_books') AS _auto_cast"
+        result << ", \"activities\".\"tableoid\"::regclass::varchar IN ('activity_books') AS _auto_cast"
         result << ' FROM "activities"'
-        result << ' INNER JOIN "record_class" ON "record_class"."oid" = "activities"."tableoid"'
         result << ' LEFT OUTER JOIN "activity_books" "i_0" ON "activities"."id" = "i_0"."id"'
         expect(base.cast_records(child).all.to_sql).to eql(result)
       end
 
       it 'can be filtered by record type' do
-        result = 'WITH "record_class" AS (SELECT "pg_class"."oid", "pg_class"."relname" AS _record_class FROM "pg_class")'
-        result << ' SELECT "activities".*, "record_class"."_record_class"'
+        result = 'SELECT "activities".*, "activities"."tableoid"::regclass AS _record_class'
         result << ', "i_0"."description", "i_0"."url", "i_0"."activated"'
-        result << ", \"record_class\".\"_record_class\" IN ('activity_books') AS _auto_cast"
+        result << ", \"activities\".\"tableoid\"::regclass::varchar IN ('activity_books') AS _auto_cast"
         result << ' FROM "activities"'
-        result << ' INNER JOIN "record_class" ON "record_class"."oid" = "activities"."tableoid"'
         result << ' LEFT OUTER JOIN "activity_books" "i_0" ON "activities"."id" = "i_0"."id"'
-        result << " WHERE \"record_class\".\"_record_class\" = 'activity_books'"
+        result << " WHERE \"activities\".\"tableoid\"::regclass::varchar IN ('activity_books')"
         expect(base.cast_records(child, filter: true).all.to_sql).to eql(result)
       end
 
       it 'works with count and does not add extra columns' do
-        result = 'WITH "record_class" AS (SELECT "pg_class"."oid", "pg_class"."relname" AS _record_class FROM "pg_class")'
-        result << ' SELECT COUNT(*)'
+        result = 'SELECT COUNT(*)'
         result << ' FROM "activities"'
-        result << ' INNER JOIN "record_class" ON "record_class"."oid" = "activities"."tableoid"'
         result << ' LEFT OUTER JOIN "activity_books" "i_0" ON "activities"."id" = "i_0"."id"'
         result << ' LEFT OUTER JOIN "activity_posts" "i_1" ON "activities"."id" = "i_1"."id"'
         result << ' LEFT OUTER JOIN "activity_post_samples" "i_2" ON "activities"."id" = "i_2"."id"'
@@ -342,10 +334,8 @@ RSpec.describe 'TableInheritance' do
       end
 
       it 'works with sum and does not add extra columns' do
-        result = 'WITH "record_class" AS (SELECT "pg_class"."oid", "pg_class"."relname" AS _record_class FROM "pg_class")'
-        result << ' SELECT SUM("activities"."id")'
+        result = 'SELECT SUM("activities"."id")'
         result << ' FROM "activities"'
-        result << ' INNER JOIN "record_class" ON "record_class"."oid" = "activities"."tableoid"'
         result << ' LEFT OUTER JOIN "activity_books" "i_0" ON "activities"."id" = "i_0"."id"'
         result << ' LEFT OUTER JOIN "activity_posts" "i_1" ON "activities"."id" = "i_1"."id"'
         result << ' LEFT OUTER JOIN "activity_post_samples" "i_2" ON "activities"."id" = "i_2"."id"'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails