torque-postgresql 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd314ab034c3d38a227829faf2d706b13625a5e4cc6393004f6dbe2890e784a8
-  data.tar.gz: 035b0fc92e1ea2aedb507c18094e66025c0fe98838f8553f3abc64764a0b2f03
+  metadata.gz: cd2096d27cb0b11fd4cd2048627bf0b12dcd905d4240ea0251366f580a0afcf2
+  data.tar.gz: c6d948dd77768feff3d85284bc838b8fb03c91233cc33ecdc8b3c22e463038c3
 SHA512:
-  metadata.gz: 6eeaffde8209891fee13de7518acea135cfe5f35ecbc5aa59124faad208ed0545a24c2ffb993f10eb5e306c2ccb96036e1dbc812a11177ecdda5e3ead62e0dd7
-  data.tar.gz: ad55cf8b8a5e9de71575c12e8452d440439529258752ceceb95da17111991b8a9ad90101806ab328d5993d328bec69a71feb4cc6b85431c9802d0c225557dbb5
+  metadata.gz: 3f61ba4bf68f2519090bb23b259cf9d8fa2c59f5a9935c867fe0dd2629eeeddd21e7a9f68a0e168550f696564d9613a4617ed6619ac4fe1f3d7660bf3fd1fc9c
+  data.tar.gz: dbb298a6df589aa9368fb70f933b5ece9984bfc3661d667c7e42b989e2bdda6159aafbf78a303f9926f3b17dbc762473454f4646e91e976a21a0fd439a57c9f9

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

@@ -15,6 +15,8 @@ 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(
@@ -26,6 +28,20 @@ module Torque
       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/associations/belongs_to_many_association.rb

@@ -16,15 +16,16 @@ module Torque
           elsif !target.empty?
             load_target.pluck(reflection.association_primary_key)
           else
-            stale_state
+            stale_state || column_default_value
           end
         end
 
         def ids_writer(ids)
-          owner.write_attribute(source_attr, ids.presence)
+          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.presence)
+          owner.update_attribute(source_attr, ids)
         end
 
         def size
@@ -179,12 +180,16 @@ module Torque
           def ids_rewriter(ids, operator)
             list = owner[source_attr] ||= []
             list = list.public_send(operator, ids)
-            owner[source_attr] = list.uniq.compact.presence
+            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 { super }

data/lib/torque/postgresql/base.rb

@@ -206,6 +206,12 @@ module Torque
           ::ActiveRecord::Reflection.add_reflection(self, name, reflection)
         end
 
+        # Allow extra keyword arguments to be sent to +InsertAll+
+        def upsert_all(attributes, **xargs)
+          xargs = xargs.merge(on_duplicate: :update)
+          ::ActiveRecord::InsertAll.new(self, attributes, **xargs).execute
+        end
+
         protected
 
           # Allow optional select attributes to be loaded manually when they are

data/lib/torque/postgresql/insert_all.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Torque
+  module PostgreSQL
+    module InsertAll
+      attr_reader :where
+
+      def initialize(*args, where: nil, **xargs)
+        super(*args, **xargs)
+
+        @where = where
+      end
+    end
+
+    module InsertAll::Builder
+      delegate :where, to: :insert_all
+
+      def where_condition?
+        !where.nil?
+      end
+    end
+
+    ActiveRecord::InsertAll.prepend InsertAll
+    ActiveRecord::InsertAll::Builder.include InsertAll::Builder
+  end
+end

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '2.0.6'
+    VERSION = '2.1.0'
   end
 end

data/spec/tests/belongs_to_many_spec.rb

@@ -318,7 +318,36 @@ RSpec.describe 'BelongsToMany' do
       expect { query.load }.not_to raise_error
     end
 
-    context "When record is not persisted" do
+    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
+
+      it 'will always return the column default value' do
+        expect(subject.tag_ids).to be_a(Array)
+        expect(subject.tag_ids).to be_empty
+      end
+
+      it 'will keep the value as an array even when the association is cleared' do
+        records = FactoryBot.create_list(:tag, 5)
+        subject.tags.concat(records)
+
+        subject.reload
+        expect(subject.tag_ids).to be_a(Array)
+        expect(subject.tag_ids).not_to be_empty
+
+        subject.tags.clear
+        subject.reload
+        expect(subject.tag_ids).to be_a(Array)
+        expect(subject.tag_ids).to be_empty
+      end
+    end
+
+    context 'When record is not persisted' do
       let(:initial) { FactoryBot.create(:tag) }
 
       subject { Video.new(title: 'A', tags: [initial]) }

data/spec/tests/insert_all_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+RSpec.describe 'InsertAll' do
+  context 'on executing' do
+    before do
+      ActiveRecord::InsertAll.send(:public, :to_sql)
+      allow_any_instance_of(ActiveRecord::InsertAll).to receive(:execute, &:to_sql)
+    end
+
+    subject { Tag }
+
+    let(:entries) { [{ name: 'A' }, { name: 'B' }] }
+
+    it 'does not mess with insert_all' do
+      result = subject.insert_all(entries)
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT  DO NOTHING RETURNING "id"
+      SQL
+
+      result = subject.insert_all(entries, returning: %i[name])
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT  DO NOTHING RETURNING "name"
+      SQL
+
+      result = subject.insert_all(entries, returning: %i[id name])
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT  DO NOTHING RETURNING "id","name"
+      SQL
+    end
+
+    it 'does not mess with insert_all!' do
+      result = subject.insert_all!(entries)
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B') RETURNING "id"
+      SQL
+
+      result = subject.insert_all!(entries, returning: %i[name])
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B') RETURNING "name"
+      SQL
+    end
+
+    it 'does not mess with upsert without where' do
+      result = subject.upsert_all(entries)
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT ("id") DO UPDATE SET "name"=excluded."name"
+        RETURNING "id"
+      SQL
+
+      result = subject.upsert_all(entries, returning: %i[name])
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT ("id") DO UPDATE SET "name"=excluded."name"
+        RETURNING "name"
+      SQL
+    end
+
+    it 'does add the where condition without the returning clause' do
+      result = subject.upsert_all(entries, returning: false, where: '1=1')
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT ("id") DO UPDATE SET "name"=excluded."name"
+        WHERE 1=1
+      SQL
+    end
+
+    it 'does add the where condition with the returning clause' do
+      result = subject.upsert_all(entries, where: '1=1')
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT ("id") DO UPDATE SET "name"=excluded."name"
+        WHERE 1=1 RETURNING "id"
+      SQL
+    end
+
+    xit 'dows work with model-based where clause' do
+      result = subject.upsert_all(entries, where: Tag.where(name: 'C'))
+      expect(result.squish).to be_eql(<<~SQL.squish)
+        INSERT INTO "tags" ("name") VALUES ('A'), ('B')
+        ON CONFLICT ("id") DO UPDATE SET "name"=excluded."name"
+        WHERE "tags"."name" = 'C' RETURNING "id"
+      SQL
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -221,6 +221,7 @@ files:
 - lib/torque/postgresql/geometry_builder.rb
 - lib/torque/postgresql/i18n.rb
 - lib/torque/postgresql/inheritance.rb
+- lib/torque/postgresql/insert_all.rb
 - lib/torque/postgresql/migration.rb
 - lib/torque/postgresql/migration/command_recorder.rb
 - lib/torque/postgresql/railtie.rb
@@ -277,6 +278,7 @@ files:
 - spec/tests/enum_spec.rb
 - spec/tests/geometric_builder_spec.rb
 - spec/tests/has_many_spec.rb
+- spec/tests/insert_all_spec.rb
 - spec/tests/interval_spec.rb
 - spec/tests/lazy_spec.rb
 - spec/tests/period_spec.rb
@@ -334,6 +336,7 @@ test_files:
 - spec/tests/geometric_builder_spec.rb
 - spec/tests/range_spec.rb
 - spec/tests/arel_spec.rb
+- spec/tests/insert_all_spec.rb
 - spec/tests/enum_spec.rb
 - spec/tests/period_spec.rb
 - spec/tests/coder_spec.rb