torque-postgresql 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e9379e388022831a9441cb6b3b646ff8bdea7340cba61f0dd197bcdbf589f72
-  data.tar.gz: cfb88b94086027202e92a2120ad8ba1a5e939ef089aea5dcdfd85e05a7d122ea
+  metadata.gz: 95fa82a4869d180b12518b184191e6877b9e6cf3108fb5e68e55d6a836809389
+  data.tar.gz: 45c6e24a30b3782ec26ff5caafe01430c24f137c460eb19b6f2a49e0b6609142
 SHA512:
-  metadata.gz: 809642eb8f6ee574e7b3b9557590baa58624fec54d1c69b6f341999dfc4217aea5010abc1b438119b3213f958918ce00ddd1af1df3a4714321b1f6153f8ee57d
-  data.tar.gz: e81cf089a977d964326548144b14dd4ab7ce4be0612f2e923e34add1aa951aa2e5467daaa544da42ac17773fb2cc047335a297f3807a1e72f8dc1942f1df4195
+  metadata.gz: cd7e925ab13b8ae3eb6f0d92fbb994f12c6c121998792263b0752eb9647c0d2e4f72dec8d3973c6e0365fe0c5194a2af5fba9189189743c5bca7b06a4e6dfa41
+  data.tar.gz: 470bb4e8b0816318ca5ee1b99e1896a8a4f3297af46e653de4ddac5347cf40a781b530a4e2531cf41eae38f7205332e52ced09e5b857a618f965851a6d9d7162

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

@@ -12,16 +12,16 @@ module Torque
           args.each { |name| column(name, :interval, **options) }
         end
 
-        # Creates a column with an enum type, needing to specify the subtype,
+        # Creates a column with an enum type, needing to specify the enum_type,
         # which is basically the name of the type defined prior creating the
         # column
         def enum(*args, **options)
-          subtype = options.delete(:subtype)
-          args.each { |name| column(name, (subtype || name), **options) }
+          enum_type = [options.delete(:subtype), options.delete(:enum_type)].compact.first
+          args.each { |name| column(name, (enum_type || name), **options) }
         end
 
         # Creates a column with an enum array type, needing to specify the
-        # subtype, which is basically the name of the type defined prior
+        # enum_type, which is basically the name of the type defined prior
         # creating the column
         def enum_set(*args, **options)
           super(*args, **options.merge(array: true))
@@ -47,7 +47,7 @@ module Torque
 
       if ActiveRecord::ConnectionAdapters::PostgreSQL.const_defined?('ColumnDefinition')
         module ColumnDefinition
-          attr_accessor :subtype
+          attr_accessor :subtype, :enum_type
         end
 
         ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDefinition.include ColumnDefinition

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

@@ -22,12 +22,12 @@ module Torque
           column.type == :enum_set ? :enum : super
         end
 
-        # Adds +:subtype+ option to the default set
+        # Adds +:enum_type+ option to the default set
         def prepare_column_options(column)
           spec = super
 
-          if subtype = schema_subtype(column)
-            spec[:subtype] = subtype
+          if enum_type = schema_enum_type(column)
+            spec[:enum_type] = enum_type
           end
 
           spec
@@ -35,7 +35,7 @@ module Torque
 
         private
 
-          def schema_subtype(column)
+          def schema_enum_type(column)
             column.sql_type.to_sym.inspect if column.type == :enum || column.type == :enum_set
           end
 
@@ -89,7 +89,8 @@ module Torque
             types = @connection.user_defined_types('e')
             return unless types.any?
 
-            stream.puts "  # These are user-defined types used on this database"
+            stream.puts "  # Custom types defined in this database."
+            stream.puts "  # Note that some types may not work with other database engines. Be careful if changing database."
             types.sort_by(&:first).each { |(name, type)| send(type.to_sym, name, stream) }
             stream.puts
           rescue => e

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

@@ -6,9 +6,6 @@ module Torque
       module AbstractReflection
         AREL_ATTR = ::Arel::Attributes::Attribute
 
-        ARR_NO_CAST = 'bigint'
-        ARR_CAST = 'bigint[]'
-
         # Check if the foreign key actually exists
         def connected_through_array?
           false
@@ -40,34 +37,29 @@ module Torque
           result
         end
 
-        # Build the id constraint checking if both types are perfect matching
+        # Build the id constraint checking if both types are perfect matching.
+        # The klass attribute (left side) will always be a column attribute
         def build_id_constraint(klass_attr, source_attr)
           return klass_attr.eq(source_attr) unless connected_through_array?
 
           # Klass and key are associated with the reflection Class
           klass_type = klass.columns_hash[join_keys.key.to_s]
-          # active_record and foreign_key are associated with the source Class
-          source_type = active_record.columns_hash[join_keys.foreign_key.to_s]
 
-          # If both are attributes but the left side is not an array, and the
-          # right side is, use the ANY operation
-          any_operation = arel_array_to_any(klass_attr, source_attr, klass_type, source_type)
-          return klass_attr.eq(any_operation) if any_operation
+          # Apply an ANY operation which checks if the single value on the left
+          # side exists in the array on the right side
+          if source_attr.is_a?(AREL_ATTR)
+            any_value = [klass_attr, source_attr]
+            any_value.reverse! if klass_type.try(:array?)
+            return any_value.shift.eq(::Arel::Nodes::NamedFunction.new('ANY', any_value))
+          end
 
           # If the left side is not an array, just use the IN condition
           return klass_attr.in(source_attr) unless klass_type.try(:array)
 
-          # Decide if should apply a cast to ensure same type comparision
-          should_cast = klass_type.type.eql?(:integer) && source_type.type.eql?(:integer)
-          should_cast &= !klass_type.sql_type.eql?(source_type.sql_type)
-          should_cast |= !(klass_attr.is_a?(AREL_ATTR) && source_attr.is_a?(AREL_ATTR))
-
-          # Apply necessary transformations to values
-          klass_attr = cast_constraint_to_array(klass_type, klass_attr, should_cast)
-          source_attr = cast_constraint_to_array(source_type, source_attr, should_cast)
-
-          # Return the overlap condition
-          klass_attr.overlaps(source_attr)
+          # Build the overlap condition (array && array) ensuring that the right
+          # side has the same type as the left side
+          source_attr = ::Arel::Nodes.build_quoted(Array.wrap(source_attr))
+          klass_attr.overlaps(source_attr.cast(klass_type.sql_type_metadata.sql_type))
         end
 
         if PostgreSQL::AR610
@@ -85,24 +77,6 @@ module Torque
 
             build_id_constraint(klass_attr, source_attr)
           end
-
-          # Prepare a value for an array constraint overlap condition
-          def cast_constraint_to_array(type, value, should_cast)
-            base_ready = type.try(:array) && value.is_a?(AREL_ATTR)
-            return value if base_ready && (type.sql_type.eql?(ARR_NO_CAST) || !should_cast)
-
-            value = ::Arel::Nodes.build_quoted(Array.wrap(value)) unless base_ready
-            value = value.cast(ARR_CAST) if should_cast
-            value
-          end
-
-          # Check if it's possible to turn both attributes into an ANY condition
-          def arel_array_to_any(klass_attr, source_attr, klass_type, source_type)
-            return unless !klass_type.try(:array) && source_type.try(:array) &&
-              klass_attr.is_a?(AREL_ATTR) && source_attr.is_a?(AREL_ATTR)
-
-            ::Arel::Nodes::NamedFunction.new('ANY', [source_attr])
-          end
       end
 
       ::ActiveRecord::Reflection::AbstractReflection.prepend(AbstractReflection)

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '2.2.3'
+    VERSION = '2.2.4'
   end
 end

data/spec/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-version = 77
+version = 2
 
 return if ActiveRecord::Migrator.current_version == version
 ActiveRecord::Schema.define(version: version) do
@@ -20,7 +20,8 @@ ActiveRecord::Schema.define(version: version) do
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
-  # These are user-defined types used on this database
+  # Custom types defined in this database.
+  # Note that some types may not work with other database engines. Be careful if changing database.
   create_enum "content_status", ["created", "draft", "published", "archived"], force: :cascade
   create_enum "specialties", ["books", "movies", "plays"], force: :cascade
   create_enum "roles", ["visitor", "assistant", "manager", "admin"], force: :cascade
@@ -53,8 +54,8 @@ ActiveRecord::Schema.define(version: version) do
     t.bigint   "tag_ids", array: true
     t.string   "title"
     t.string   "url"
-    t.enum     "type", subtype: :types
-    t.enum     "conflicts", subtype: :conflicts, array: true
+    t.enum     "type", enum_type: :types
+    t.enum     "conflicts", enum_type: :conflicts, array: true
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
@@ -62,13 +63,13 @@ ActiveRecord::Schema.define(version: version) do
   create_table "authors", force: :cascade do |t|
     t.string   "name"
     t.string   "type"
-    t.enum     "specialty", subtype: :specialties
+    t.enum     "specialty", enum_type: :specialties
   end
 
   create_table "texts", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "content"
-    t.enum     "conflict",  subtype: :conflicts
+    t.enum     "conflict",  enum_type: :conflicts
   end
 
   create_table "comments", force: :cascade do |t|
@@ -84,7 +85,7 @@ ActiveRecord::Schema.define(version: version) do
   create_table "courses", force: :cascade do |t|
     t.string   "title",      null: false
     t.interval "duration"
-    t.enum     "types", subtype: :types, array: true
+    t.enum     "types", enum_type: :types, array: true
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
@@ -98,7 +99,7 @@ ActiveRecord::Schema.define(version: version) do
     t.integer  "activity_id"
     t.string   "title"
     t.text     "content"
-    t.enum     "status",    subtype: :content_status
+    t.enum     "status",    enum_type: :content_status
     t.index ["author_id"], name: "index_posts_on_author_id", using: :btree
   end
 
@@ -111,7 +112,7 @@ ActiveRecord::Schema.define(version: version) do
 
   create_table "users", force: :cascade do |t|
     t.string   "name",       null: false
-    t.enum     "role",                    subtype: :roles, default: :visitor
+    t.enum     "role",                    enum_type: :roles, default: :visitor
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
@@ -120,7 +121,7 @@ ActiveRecord::Schema.define(version: version) do
     t.integer  "author_id"
     t.string   "title"
     t.boolean  "active"
-    t.enum     "kind",                    subtype: :types
+    t.enum     "kind",                    enum_type: :types
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end

data/spec/spec_helper.rb

@@ -39,6 +39,7 @@ RSpec.configure do |config|
 
   # Handles acton before rspec initialize
   config.before(:suite) do
+    ActiveSupport::Deprecation.silenced = true
     DatabaseCleaner.clean_with(:truncation)
   end
 
@@ -46,10 +47,6 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each, js: true) do
-    DatabaseCleaner.strategy = :truncation
-  end
-
   config.before(:each) do
     DatabaseCleaner.start
   end

data/spec/tests/arel_spec.rb

@@ -68,26 +68,37 @@ RSpec.describe 'Arel' do
 
     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([])
+      expect(Author.new.tag_ids).to eq([])
     end
 
-    it 'works with an array with enum values' do
+    it 'works with an array with enum values for a new enum' do
+      value = ['a', 'b']
+
+      expect do
+        connection.create_enum(:samples, %i[a b c d])
+        connection.add_column(:authors, :samples, :samples, array: true, default: value)
+      end.not_to raise_error
+
+      expect(Author.new.samples).to eq(value)
+    end
+
+    it 'works with an array with enum values for an existing enum' 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)
+      expect(Author.new.roles).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)
+      expect(Author.new.tag_ids).to eq(value)
     end
 
     it 'works with change column default value' do
       value = ['2', '3']
       connection.add_column(:authors, :tag_ids, :string, array: true)
       expect { connection.change_column_default(:authors, :tag_ids, { from: nil, to: value }) }.not_to raise_error
-      expect(Author.columns_hash['tag_ids'].default).to eq(value)
+      expect(Author.new.tag_ids).to eq(value)
     end
   end
 

data/spec/tests/belongs_to_many_spec.rb

@@ -392,4 +392,53 @@ 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
 end

data/spec/tests/enum_set_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe 'Enum' do
     subject { table_definition.new(connection, 'articles') }
 
     it 'can be defined as an array' do
-      subject.enum(:content_status, array: true)
+      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)
 
@@ -44,14 +44,14 @@ RSpec.describe 'Enum' do
   context 'on schema' do
     it 'can be used on tables' do
       dump_io = StringIO.new
-      checker = /t\.enum +"conflicts", +array: true, +subtype: :conflicts/
+      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
       dump_io = StringIO.new
-      checker = /t\.enum +"types", +default: \[:A, :B\], +array: true, +subtype: :types/
+      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

data/spec/tests/enum_spec.rb

@@ -99,13 +99,19 @@ RSpec.describe 'Enum' do
     end
 
     it 'can be used in a multiple form' do
-      subject.enum('foo', 'bar', 'baz', subtype: :content_status)
+      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)
@@ -143,13 +149,13 @@ RSpec.describe 'Enum' do
     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", +subtype: :content_status/
+      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, +subtype: :roles/
+      expect(dump_io.string).to match /t\.enum +"role", +default: :visitor, +enum_type: :roles/
     end
   end
 

data/spec/tests/has_many_spec.rb

@@ -411,4 +411,50 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torque-postgresql
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Carlos Silva
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails