torque-postgresql 2.4.4 → 3.0.0

data/spec/tests/belongs_to_many_spec.rb

@@ -20,14 +20,6 @@ RSpec.describe 'BelongsToMany' do
 
       model.belongs_to_many(:tests)
     end
-
-    it 'allows setting up foreign key and primary_key as symbol' do
-      model.belongs_to_many(:tests, foreign_key: :test_ids, primary_key: :test_id)
-
-      reflection = model._reflections['tests']
-      expect(reflection.foreign_key).to be_eql('test_ids')
-      expect(reflection.active_record_primary_key).to be_eql('test_id')
-    end
   end
 
   context 'on association' do
@@ -352,7 +344,8 @@ RSpec.describe 'BelongsToMany' do
       subject.tags.concat(records)
 
       entries = Video.all
-      ActiveRecord::Associations::Preloader.new.preload(entries, :tags, Tag.all)
+      arguments = { records: entries, associations: :tags, available_records: Tag.all.to_a }
+      ActiveRecord::Associations::Preloader.new(**arguments).call
       entries = entries.load
 
       expect(entries.size).to be_eql(1)
@@ -400,94 +393,4 @@ RSpec.describe 'BelongsToMany' do
       end
     end
   end
-
-  context 'using uuid' do
-    let(:connection) { ActiveRecord::Base.connection }
-    let(:game) { Class.new(ActiveRecord::Base) }
-    let(:player) { Class.new(ActiveRecord::Base) }
-    let(:other) { player.create }
-
-    # TODO: Set as a shred example
-    before do
-      connection.create_table(:players, id: :uuid) { |t| t.string :name }
-      connection.create_table(:games, id: :uuid) { |t| t.uuid :player_ids, array: true }
-
-      options = { anonymous_class: player, foreign_key: :player_ids }
-      options[:inverse_of] = false if Torque::PostgreSQL::AR610
-
-      game.table_name = 'games'
-      player.table_name = 'players'
-      game.belongs_to_many :players, **options
-    end
-
-    subject { game.create }
-
-    it 'loads associated records' do
-      subject.update(player_ids: [other.id])
-      expect(subject.players.to_sql).to be_eql(<<-SQL.squish)
-        SELECT "players".* FROM "players" WHERE "players"."id" IN ('#{other.id}')
-      SQL
-
-      expect(subject.players.load).to be_a(ActiveRecord::Associations::CollectionProxy)
-      expect(subject.players.to_a).to be_eql([other])
-    end
-
-    it 'can preload records' do
-      records = 5.times.map { player.create }
-      subject.players.concat(records)
-
-      entries = game.all.includes(:players).load
-
-      expect(entries.size).to be_eql(1)
-      expect(entries.first.players).to be_loaded
-      expect(entries.first.players.size).to be_eql(5)
-    end
-
-    it 'can joins records' do
-      query = game.all.joins(:players)
-      expect(query.to_sql).to match(/INNER JOIN "players"/)
-      expect { query.load }.not_to raise_error
-    end
-  end
-
-  context 'using custom keys' do
-    let(:connection) { ActiveRecord::Base.connection }
-    let(:post) { Post }
-    let(:tag) { Tag }
-    let(:tags) { %w[a b c].map { |id| create(:tag, friendly_id: id) } }
-
-    subject { create(:post) }
-
-    before do
-      connection.add_column(:tags, :friendly_id, :string)
-      connection.add_column(:posts, :friendly_tag_ids, :string, array: true)
-      post.belongs_to_many(:tags, foreign_key: :friendly_tag_ids, primary_key: :friendly_id)
-      post.reset_column_information
-      tag.reset_column_information
-    end
-
-    after do
-      tag.reset_column_information
-      post.reset_column_information
-      post._reflections.delete(:tags)
-    end
-
-    it 'loads associated records' do
-      subject.update(friendly_tag_ids: tags.pluck(:friendly_id))
-
-      expect(subject.tags.to_sql).to be_eql(<<-SQL.squish)
-        SELECT "tags".* FROM "tags" WHERE "tags"."friendly_id" IN ('a', 'b', 'c')
-      SQL
-
-      expect(subject.tags.load).to be_a(ActiveRecord::Associations::CollectionProxy)
-      expect(subject.tags.to_a).to be_eql(tags)
-    end
-
-    it 'can properly assign tags' do
-      expect(subject.friendly_tag_ids).to be_blank
-
-      subject.tags = tags
-      expect(subject.friendly_tag_ids).to be_eql(%w[a b c])
-    end
-  end
 end

data/spec/tests/distinct_on_spec.rb

@@ -40,7 +40,7 @@ RSpec.describe 'DistinctOn' do
     end
 
     it 'raises with invalid relation' do
-      expect { subject.distinct_on(supervisors: :name).to_sql }.to \
+      expect { subject.distinct_on(tags: :name).to_sql }.to \
         raise_error(ArgumentError, /Relation for/)
     end
 

data/spec/tests/enum_set_spec.rb

@@ -31,7 +31,8 @@ RSpec.describe 'Enum' do
     it 'can be defined as an array' do
       subject.enum(:content_status, array: true, enum_type: :content_status)
       expect(subject['content_status'].name).to be_eql('content_status')
-      expect(subject['content_status'].type).to be_eql(:content_status)
+      expect(subject['content_status'].type).to be_eql(:enum)
+      expect(subject['content_status'].options[:enum_type]).to be_eql(:content_status)
 
       array = subject['content_status'].respond_to?(:options) \
         ? subject['content_status'].options[:array] \
@@ -42,19 +43,18 @@ RSpec.describe 'Enum' do
   end
 
   context 'on schema' do
-    let(:dump_result) do
-      ActiveRecord::SchemaDumper.dump(connection, (dump_result = StringIO.new))
-      dump_result.string
-    end
-
     it 'can be used on tables' do
-      checker = /t\.enum +"conflicts", +array: true, +enum_type: :conflicts/
-      expect(dump_result).to match checker
+      dump_io = StringIO.new
+      checker = /t\.enum +"conflicts", +array: true, +enum_type: "conflicts"/
+      ActiveRecord::SchemaDumper.dump(connection, dump_io)
+      expect(dump_io.string).to match checker
     end
 
     xit 'can have a default value as an array of symbols' do
-      checker = /t\.enum +"types", +default: \[:A, :B\], +array: true, +enum_type: :types/
-      expect(dump_result).to match checker
+      dump_io = StringIO.new
+      checker = /t\.enum +"types", +default: \[:A, :B\], +array: true, +enum_type: "types"/
+      ActiveRecord::SchemaDumper.dump(connection, dump_io)
+      expect(dump_io.string).to match checker
     end
   end
 

data/spec/tests/enum_spec.rb

@@ -26,12 +26,6 @@ RSpec.describe 'Enum' do
   end
 
   context 'on migration' do
-    it 'can be created' do
-      connection.create_enum(:status, %i(foo bar))
-      expect(connection.type_exists?(:status)).to be_truthy
-      expect(connection.enum_values(:status)).to be_eql(['foo', 'bar'])
-    end
-
     it 'can be deleted' do
       connection.create_enum(:status, %i(foo bar))
       expect(connection.type_exists?(:status)).to be_truthy
@@ -46,16 +40,6 @@ RSpec.describe 'Enum' do
       expect(connection.type_exists?(:status)).to be_truthy
     end
 
-    it 'can have prefix' do
-      connection.create_enum(:status, %i(foo bar), prefix: true)
-      expect(connection.enum_values(:status)).to be_eql(['status_foo', 'status_bar'])
-    end
-
-    it 'can have suffix' do
-      connection.create_enum(:status, %i(foo bar), suffix: 'tst')
-      expect(connection.enum_values(:status)).to be_eql(['foo_tst', 'bar_tst'])
-    end
-
     it 'inserts values at the end' do
       connection.create_enum(:status, %i(foo bar))
       connection.add_enum_values(:status, %i(baz qux))
@@ -85,80 +69,6 @@ RSpec.describe 'Enum' do
     end
   end
 
-  context 'on table definition' do
-    subject { table_definition.new(connection, 'articles') }
-
-    it 'has the enum method' do
-      expect(subject).to respond_to(:enum)
-    end
-
-    it 'can be used in a single form' do
-      subject.enum('content_status')
-      expect(subject['content_status'].name).to be_eql('content_status')
-      expect(subject['content_status'].type).to be_eql(:content_status)
-    end
-
-    it 'can be used in a multiple form' do
-      subject.enum('foo', 'bar', 'baz', enum_type: :content_status)
-      expect(subject['foo'].type).to be_eql(:content_status)
-      expect(subject['bar'].type).to be_eql(:content_status)
-      expect(subject['baz'].type).to be_eql(:content_status)
-    end
-
-    it 'can have custom type' do
-      subject.enum('foo', enum_type: :content_status)
-      expect(subject['foo'].name).to be_eql('foo')
-      expect(subject['foo'].type).to be_eql(:content_status)
-    end
-
-    it 'can use the deprecated subtype option' do
-      subject.enum('foo', subtype: :content_status)
-      expect(subject['foo'].name).to be_eql('foo')
-      expect(subject['foo'].type).to be_eql(:content_status)
-    end
-
-    it 'raises StatementInvalid when type isn\'t defined' do
-      subject.enum('foo')
-      creation = connection.send(:schema_creation).accept subject
-      expect{ connection.execute creation }.to raise_error(ActiveRecord::StatementInvalid)
-    end
-  end
-
-  context 'on schema' do
-    it 'dumps when has it' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      expect(dump_io.string).to match /create_enum \"content_status\", \[/
-    end
-
-    it 'sorts the enum entries to better consistency' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      items = dump_io.string.scan(/create_enum "(\w+)"/).flatten
-      expect(items).to be_eql(items.sort)
-    end
-
-    it 'do not dump when has none' do
-      connection.drop_type(:content_status, force: :cascade)
-
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      expect(dump_io.string).not_to match /create_enum \"content_status\", \[/
-    end
-
-    it 'can be used on tables too' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      expect(dump_io.string).to match /t\.enum +"status", +enum_type: :content_status/
-    end
-
-    it 'can have a default value as symbol' do
-      dump_io = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, dump_io)
-      expect(dump_io.string).to match /t\.enum +"role", +default: :visitor, +enum_type: :roles/
-    end
-  end
-
   context 'on value' do
     subject { Enum::ContentStatus }
     let(:values) { %w(created draft published archived) }

data/spec/tests/has_many_spec.rb

@@ -411,50 +411,4 @@ RSpec.describe 'HasMany' do
       expect { query.load }.not_to raise_error
     end
   end
-
-  context 'using uuid' do
-    let(:connection) { ActiveRecord::Base.connection }
-    let(:game) { Class.new(ActiveRecord::Base) }
-    let(:player) { Class.new(ActiveRecord::Base) }
-
-    # TODO: Set as a shred example
-    before do
-      connection.create_table(:players, id: :uuid) { |t| t.string :name }
-      connection.create_table(:games, id: :uuid) { |t| t.uuid :player_ids, array: true }
-
-      options = { anonymous_class: game, foreign_key: :player_ids }
-      options[:inverse_of] = false if Torque::PostgreSQL::AR610
-
-      game.table_name = 'games'
-      player.table_name = 'players'
-      player.has_many :games, array: true, **options
-    end
-
-    subject { player.create }
-
-    it 'loads associated records' do
-      expect(subject.games.to_sql).to match(Regexp.new(<<-SQL.squish))
-        SELECT "games"\\.\\* FROM "games"
-        WHERE \\(?"games"\\."player_ids" && ARRAY\\['#{subject.id}'\\]::uuid\\[\\]\\)?
-      SQL
-
-      expect(subject.games.load).to be_a(ActiveRecord::Associations::CollectionProxy)
-      expect(subject.games.to_a).to be_eql([])
-    end
-
-    it 'can preload records' do
-      5.times { game.create(player_ids: [subject.id]) }
-      entries = player.all.includes(:games).load
-
-      expect(entries.size).to be_eql(1)
-      expect(entries.first.games).to be_loaded
-      expect(entries.first.games.size).to be_eql(5)
-    end
-
-    it 'can joins records' do
-      query = player.all.joins(:games)
-      expect(query.to_sql).to match(/INNER JOIN "games"/)
-      expect { query.load }.not_to raise_error
-    end
-  end
 end

data/spec/tests/relation_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe 'Relation', type: :helper do
     end
 
     it 'raises on relation not present' do
-      check = [supervisors: :name]
+      check = [tags: :name]
       expect{ subject.call(check) }.to raise_error(ArgumentError, /Relation for/)
     end
 

data/spec/tests/table_inheritance_spec.rb

@@ -73,33 +73,37 @@ RSpec.describe 'TableInheritance' do
   end
 
   context 'on schema' do
-    let(:dump_result) do
-      ActiveRecord::SchemaDumper.dump(connection, (dump_result = StringIO.new))
-      dump_result.string
-    end
-
     it 'dumps single inheritance with body' do
+      dump_io = StringIO.new
+      ActiveRecord::SchemaDumper.dump(connection, dump_io)
+
       parts = '"activity_books"'
       parts << ', id: false'
       parts << ', force: :cascade'
-      parts << ', inherits: "activities"'
-      expect(dump_result).to match(/create_table #{parts} do /)
+      parts << ', inherits: :activities'
+      expect(dump_io.string).to match(/create_table #{parts} do /)
     end
 
     it 'dumps single inheritance without body' do
+      dump_io = StringIO.new
+      ActiveRecord::SchemaDumper.dump(connection, dump_io)
+
       parts = '"activity_post_samples"'
       parts << ', id: false'
       parts << ', force: :cascade'
-      parts << ', inherits: "activity_posts"'
-      expect(dump_result).to match(/create_table #{parts}(?! do \|t\|)/)
+      parts << ', inherits: :activity_posts'
+      expect(dump_io.string).to match(/create_table #{parts}(?! do \|t\|)/)
     end
 
     it 'dumps multiple inheritance' do
+      dump_io = StringIO.new
+      ActiveRecord::SchemaDumper.dump(connection, dump_io)
+
       parts = '"activity_posts"'
       parts << ', id: false'
       parts << ', force: :cascade'
-      parts << ', inherits: (\["images", "activities"\]|\["activities", "images"\])'
-      expect(dump_result).to match(/create_table #{parts}/)
+      parts << ', inherits: (\[:images, :activities\]|\[:activities, :images\])'
+      expect(dump_io.string).to match(/create_table #{parts}/)
     end
   end
 

metadata

@@ -1,23 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Carlos Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
   type: :runtime
@@ -25,9 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
 - !ruby/object:Gem::Dependency
@@ -134,9 +128,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.2.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -147,9 +138,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.2.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +155,7 @@ dependencies:
 description: Add support to complex resources of PostgreSQL, like data types, array
   associations, and auxiliary statements (CTE)
 email:
-- me@carlosfsilva.com
+- carlinhus.fsilva@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -201,14 +189,15 @@ files:
 - lib/torque/postgresql/arel/select_manager.rb
 - lib/torque/postgresql/arel/visitors.rb
 - lib/torque/postgresql/associations.rb
-- lib/torque/postgresql/associations/association.rb
 - lib/torque/postgresql/associations/association_scope.rb
 - lib/torque/postgresql/associations/belongs_to_many_association.rb
 - lib/torque/postgresql/associations/builder.rb
 - lib/torque/postgresql/associations/builder/belongs_to_many.rb
 - lib/torque/postgresql/associations/builder/has_many.rb
+- lib/torque/postgresql/associations/foreign_association.rb
 - lib/torque/postgresql/associations/preloader.rb
 - lib/torque/postgresql/associations/preloader/association.rb
+- lib/torque/postgresql/associations/preloader/loader_query.rb
 - lib/torque/postgresql/attributes.rb
 - lib/torque/postgresql/attributes/builder.rb
 - lib/torque/postgresql/attributes/builder/enum.rb
@@ -219,7 +208,6 @@ files:
 - lib/torque/postgresql/attributes/period.rb
 - lib/torque/postgresql/autosave_association.rb
 - lib/torque/postgresql/auxiliary_statement.rb
-- lib/torque/postgresql/auxiliary_statement/recursive.rb
 - lib/torque/postgresql/auxiliary_statement/settings.rb
 - lib/torque/postgresql/base.rb
 - lib/torque/postgresql/collector.rb
@@ -244,9 +232,7 @@ files:
 - lib/torque/postgresql/relation/inheritance.rb
 - lib/torque/postgresql/relation/merger.rb
 - lib/torque/postgresql/schema_cache.rb
-- lib/torque/postgresql/table_name.rb
 - lib/torque/postgresql/version.rb
-- lib/torque/range.rb
 - spec/en.yml
 - spec/factories/authors.rb
 - spec/factories/comments.rb
@@ -264,12 +250,10 @@ files:
 - spec/models/activity_post/sample.rb
 - spec/models/author.rb
 - spec/models/author_journalist.rb
-- spec/models/category.rb
 - spec/models/comment.rb
 - spec/models/course.rb
 - spec/models/geometry.rb
 - spec/models/guest_comment.rb
-- spec/models/internal/user.rb
 - spec/models/item.rb
 - spec/models/post.rb
 - spec/models/question.rb
@@ -295,27 +279,21 @@ files:
 - spec/tests/lazy_spec.rb
 - spec/tests/period_spec.rb
 - spec/tests/quoting_spec.rb
-- spec/tests/range_spec.rb
 - spec/tests/relation_spec.rb
-- spec/tests/schema_spec.rb
 - spec/tests/table_inheritance_spec.rb
 homepage: https://github.com/crashtech/torque-postgresql
 licenses:
 - MIT
-metadata:
-  source_code_uri: https://github.com/crashtech/torque-postgresql
-  bug_tracker_uri: https://github.com/crashtech/torque-postgresql/issues
-post_install_message: 
-rdoc_options:
-- "--title"
-- Torque PostgreSQL
+metadata: {}
+post_install_message:
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -323,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubygems_version: 3.2.15
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ActiveRecord extension to access PostgreSQL advanced resources
 test_files:
@@ -344,12 +322,10 @@ test_files:
 - spec/models/activity_post.rb
 - spec/models/author.rb
 - spec/models/author_journalist.rb
-- spec/models/category.rb
 - spec/models/comment.rb
 - spec/models/course.rb
 - spec/models/geometry.rb
 - spec/models/guest_comment.rb
-- spec/models/internal/user.rb
 - spec/models/item.rb
 - spec/models/post.rb
 - spec/models/question.rb
@@ -375,7 +351,5 @@ test_files:
 - spec/tests/lazy_spec.rb
 - spec/tests/period_spec.rb
 - spec/tests/quoting_spec.rb
-- spec/tests/range_spec.rb
 - spec/tests/relation_spec.rb
-- spec/tests/schema_spec.rb
 - spec/tests/table_inheritance_spec.rb