torque-postgresql 2.0.2 → 2.1.0

data/spec/tests/enum_set_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe 'Enum' do
       expect(dump_io.string).to match checker
     end
 
-    it 'can have a default value as an array of symbols' do
+    xit 'can have a default value as an array of symbols' do
       dump_io = StringIO.new
       checker = /t\.enum +"types", +default: \[:A, :B\], +array: true, +subtype: :types/
       ActiveRecord::SchemaDumper.dump(connection, dump_io)

data/spec/tests/has_many_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe 'HasMany' do
     let(:builder) { ActiveRecord::Associations::Builder::HasMany }
 
     it 'adds the array option' do
-      expect(builder.send(:valid_options, [])).to include(:array)
+      expect(builder.send(:valid_options, {})).to include(:array)
     end
   end
 
@@ -21,6 +21,11 @@ RSpec.describe 'HasMany' do
       expect(subject._reflections).to include('texts')
     end
 
+    it 'has correct foreign key' do
+      item = subject._reflections['texts']
+      expect(item.foreign_key).to be_eql('user_id')
+    end
+
     it 'loads associated records' do
       expect(subject.texts.to_sql).to match(Regexp.new(<<-SQL.squish))
         SELECT "texts"\\.\\* FROM "texts" WHERE \\(?"texts"\\."user_id" = #{subject.id}\\)?
@@ -210,6 +215,11 @@ RSpec.describe 'HasMany' do
       expect(subject._reflections).to include('videos')
     end
 
+    it 'has correct foreign key' do
+      item = subject._reflections['videos']
+      expect(item.foreign_key).to be_eql('tag_ids')
+    end
+
     it 'loads associated records' do
       expect(subject.videos.to_sql).to match(Regexp.new(<<-SQL.squish))
         SELECT "videos"\\.\\* FROM "videos"
@@ -281,6 +291,20 @@ RSpec.describe 'HasMany' do
       expect(record.tag_ids).to be_eql([subject.id])
     end
 
+    it 'can perist after accessed in after_create' do
+      other.belongs_to_many(:tags)
+      other.after_create { self.tags.to_a }
+
+      video = FactoryBot.create(:video)
+      subject.videos << video
+
+      expect(subject.reload.videos.size).to eql(1)
+      expect(video.reload.tags.size).to eql(1)
+
+      other.reset_callbacks(:create)
+      other._reflections = {}
+    end
+
     it 'can concat records' do
       FactoryBot.create(:video, tag_ids: [subject.id])
       expect(subject.videos.size).to be_eql(1)

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

data/spec/tests/table_inheritance_spec.rb

@@ -66,7 +66,7 @@ RSpec.describe 'TableInheritance' do
 
     it 'allows empty-body create table operation' do
       sql = connection.create_table(:activity_posts, inherits: :activities)
-      result = 'CREATE TABLE "activity_posts" ()'
+      result = "CREATE TABLE \"activity_posts\" ()"
       result << ' INHERITS ( "activities" )'
       expect(sql).to eql(result)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Carlos Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 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
@@ -333,8 +335,10 @@ test_files:
 - spec/factories/videos.rb
 - 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/auxiliary_statement_spec.rb
+- spec/tests/period_spec.rb
 - spec/tests/coder_spec.rb
 - spec/tests/collector_spec.rb
 - spec/tests/distinct_on_spec.rb
@@ -342,11 +346,10 @@ test_files:
 - spec/tests/lazy_spec.rb
 - spec/tests/quoting_spec.rb
 - spec/tests/relation_spec.rb
-- spec/tests/arel_spec.rb
+- spec/tests/auxiliary_statement_spec.rb
 - spec/tests/enum_set_spec.rb
-- spec/tests/belongs_to_many_spec.rb
 - spec/tests/has_many_spec.rb
-- spec/tests/period_spec.rb
+- spec/tests/belongs_to_many_spec.rb
 - spec/tests/table_inheritance_spec.rb
 - spec/mocks/cache_query.rb
 - spec/mocks/create_table.rb