torque-postgresql 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd2096d27cb0b11fd4cd2048627bf0b12dcd905d4240ea0251366f580a0afcf2
-  data.tar.gz: c6d948dd77768feff3d85284bc838b8fb03c91233cc33ecdc8b3c22e463038c3
+  metadata.gz: cb3d81538edfb988d8566295fac7d055208e399d552b619d9d8b3b9234254686
+  data.tar.gz: 7c7c62bec966085eccbdc351041a94d04788e40f84b1120d88c1673c9d0e3b3c
 SHA512:
-  metadata.gz: 3f61ba4bf68f2519090bb23b259cf9d8fa2c59f5a9935c867fe0dd2629eeeddd21e7a9f68a0e168550f696564d9613a4617ed6619ac4fe1f3d7660bf3fd1fc9c
-  data.tar.gz: dbb298a6df589aa9368fb70f933b5ece9984bfc3661d667c7e42b989e2bdda6159aafbf78a303f9926f3b17dbc762473454f4646e91e976a21a0fd439a57c9f9
+  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:
@@ -123,7 +125,7 @@ module Torque
           SQL
 
           tables.map do |(table, refs)|
-            [table, Coder.decode(refs)]
+            [table, PG::TextDecoder::Array.new.decode(refs)]
           end.to_h
         end
 
@@ -147,20 +149,6 @@ module Torque
           SQL
         end
 
-        # Extracts the value from a PostgreSQL column default definition.
-        def extract_value_from_default(default)
-          case default
-            # Array elements
-          when /\AARRAY\[(.*)\]\z/
-            # TODO: Improve this since it's not the most safe approach
-            eval(default.gsub(/ARRAY|::\w+(\[\])?/, ''))
-          else
-            super
-          end
-        rescue SyntaxError
-          # If somethin goes wrong with the eval, just return nil
-        end
-
       end
     end
   end

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/schema_dumper.rb

@@ -43,13 +43,13 @@ module Torque
             inherited_tables = @connection.inherited_tables
             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)
 

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

@@ -70,7 +70,11 @@ module Torque
 
         # Returns all values that an enum type can have.
         def enum_values(name)
-          select_values("SELECT unnest(enum_range(NULL::#{name}))", 'SCHEMA')
+          select_values(<<-SQL.squish, 'SCHEMA')
+            SELECT enumlabel FROM pg_enum
+            WHERE enumtypid = #{quote(name)}::regtype::oid
+            ORDER BY enumsortorder
+          SQL
         end
 
         # Rewrite the method that creates tables to easily accept extra options

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/belongs_to_many_association.rb

@@ -60,9 +60,11 @@ module Torque
           target
         end
 
-        def build_changes
+        def build_changes(from_target = false)
+          return yield if defined?(@_building_changes) && @_building_changes
+
           @_building_changes = true
-          yield.tap { ids_writer(ids_reader) }
+          yield.tap { ids_writer(from_target ? ids_reader : stale_state) }
         ensure
           @_building_changes = nil
         end
@@ -111,7 +113,7 @@ module Torque
         end
 
         def insert_record(record, *)
-          super.tap do |saved|
+          (record.persisted? || super).tap do |saved|
             ids_rewriter(record.read_attribute(klass_attr), :<<) if saved
           end
         end
@@ -192,15 +194,15 @@ module Torque
 
           ## HAS MANY
           def replace_records(*)
-            build_changes { super }
+            build_changes(true) { super }
           end
 
           def concat_records(*)
-            build_changes { super }
+            build_changes(true) { super }
           end
 
           def delete_or_destroy(*)
-            build_changes { super }
+            build_changes(true) { super }
           end
 
           def difference(a, b)

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/enum.rb

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

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/attributes/enum.rb

@@ -29,7 +29,7 @@ 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.klass
             end
           end
 

data/lib/torque/postgresql/attributes/enum_set.rb

@@ -32,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/base.rb

@@ -40,7 +40,7 @@ module Torque
 
             pg_class = ::Arel::Table.new('pg_class')
             source = ::Arel::Table.new(subclass.table_name, as: 'source')
-            quoted_id = ::Arel::Nodes::Quoted.new(self.class.connection.quote(id))
+            quoted_id = ::Arel::Nodes::Quoted.new(id)
 
             query = ::Arel::SelectManager.new(pg_class)
             query.join(source).on(pg_class['oid'].eq(source['tableoid']))

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.0'
+    VERSION = '2.2.0'
   end
 end

data/lib/torque/postgresql.rb

@@ -23,7 +23,6 @@ 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'
 require 'torque/postgresql/reflection'

data/lib/torque/range.rb

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

data/spec/factories/item.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :item do
+    name { Faker::Lorem.sentence }
+  end
+end

data/spec/models/item.rb

@@ -0,0 +1,3 @@
+class Item < ActiveRecord::Base
+  belongs_to_many :tags
+end

data/spec/models/question.rb

@@ -0,0 +1,3 @@
+class Question < ActiveRecord::Base
+  self.implicit_order_column = 'created_at'
+end

data/spec/models/question_select.rb

@@ -0,0 +1,2 @@
+class QuestionSelect < Question
+end

data/spec/schema.rb

@@ -11,13 +11,14 @@
 # It's strongly recommended that you check this file into your version control system.
 
 begin
-  version = 63
+  version = 73
 
   raise SystemExit if ActiveRecord::Migrator.current_version == version
   ActiveRecord::Schema.define(version: version) do
     self.verbose = false
 
     # These are extensions that must be enabled in order to support this database
+    enable_extension "pgcrypto"
     enable_extension "plpgsql"
 
     # These are user-defined types used on this database
@@ -102,6 +103,13 @@ begin
       t.index ["author_id"], name: "index_posts_on_author_id", using: :btree
     end
 
+    create_table "items", force: :cascade do |t|
+      t.string   "name"
+      t.bigint   "tag_ids", array: true, default: "{1}"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+
     create_table "users", force: :cascade do |t|
       t.string   "name",       null: false
       t.enum     "role",                    subtype: :roles, default: :visitor
@@ -118,6 +126,12 @@ begin
       t.datetime "updated_at", null: false
     end
 
+    create_table "questions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+      t.string   "title"
+      t.datetime "created_at", null: false
+      t.datetime "updated_at", null: false
+    end
+
     create_table "activity_books", force: :cascade, inherits: :activities do |t|
       t.text     "description"
       t.string   "url"
@@ -132,6 +146,10 @@ begin
 
     create_table "activity_post_samples", force: :cascade, inherits: :activity_posts
 
+    create_table "question_selects", force: :cascade, inherits: :questions do |t|
+      t.string  "options", array: true
+    end
+
     # create_table "activity_blanks", force: :cascade, inherits: :activities
 
     # create_table "activity_images", force: :cascade, inherits: [:activities, :images]

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/belongs_to_many_spec.rb

@@ -147,6 +147,22 @@ RSpec.describe 'BelongsToMany' do
       expect(record.tags.count).to be_eql(5)
     end
 
+    it 'does not trigger after commit on the associated record' do
+      called = false
+
+      tag = FactoryBot.create(:tag)
+      Tag.after_commit { called = true }
+
+      expect(called).to be_falsey
+
+      subject.tags << tag
+
+      expect(subject.tag_ids).to be_eql([tag.id])
+      expect(called).to be_falsey
+
+      Tag.reset_callbacks(:commit)
+    end
+
     it 'can build an associated record' do
       record = subject.tags.build(name: 'Test')
       expect(record).to be_a(other)
@@ -225,6 +241,17 @@ RSpec.describe 'BelongsToMany' do
       expect(subject.tags.size).to be_eql(0)
     end
 
+    it 'can clear the array' do
+      record = Video.create(title: 'B', tags: [initial])
+      expect(record.tags.size).to be_eql(1)
+
+      record.update(tag_ids: [])
+      record.reload
+
+      expect(record.tag_ids).to be_nil
+      expect(record.tags.size).to be_eql(0)
+    end
+
     it 'can have sum operations' do
       records = FactoryBot.create_list(:tag, 5)
       subject.tags.concat(records)
@@ -319,17 +346,11 @@ RSpec.describe 'BelongsToMany' do
     end
 
     context 'When the attribute has a default value' do
-      after(:all) { Video.reset_column_information }
-      let(:sql) { %{ALTER TABLE "videos" ALTER COLUMN "tag_ids" SET DEFAULT '{}'::bigint[]} }
-
-      before do
-        Video.connection.execute(sql)
-        Video.reset_column_information
-      end
+      subject { FactoryBot.create(:item) }
 
       it 'will always return the column default value' do
         expect(subject.tag_ids).to be_a(Array)
-        expect(subject.tag_ids).to be_empty
+        expect(subject.tag_ids).to be_eql([1])
       end
 
       it 'will keep the value as an array even when the association is cleared' do
@@ -338,12 +359,12 @@ RSpec.describe 'BelongsToMany' do
 
         subject.reload
         expect(subject.tag_ids).to be_a(Array)
-        expect(subject.tag_ids).not_to be_empty
+        expect(subject.tag_ids).not_to be_eql([1, *records.map(&:id)])
 
         subject.tags.clear
         subject.reload
         expect(subject.tag_ids).to be_a(Array)
-        expect(subject.tag_ids).to be_empty
+        expect(subject.tag_ids).to be_eql([1])
       end
     end
 

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