torque-postgresql 4.0.0 → 4.1.0

data/lib/torque/postgresql/relation/merger.rb

@@ -35,7 +35,7 @@ module Torque
 
           # Merge auxiliary statements activated by +with+
           def merge_auxiliary_statements
-            return unless relation.is_a?(Relation::AuxiliaryStatement)
+            return unless defined?(Relation::AuxiliaryStatement) && relation.is_a?(Relation::AuxiliaryStatement)
             return if other.auxiliary_statements_values.blank?
 
             current = relation.auxiliary_statements_values.map{ |cte| cte.class }
@@ -46,21 +46,37 @@ module Torque
             end
           end
 
-          # Merge settings related to inheritance tables
+          # Merge settings related to inheritance tables, going through the
+          # public operations so that their conflicts are still detected
           def merge_inheritance
             return unless relation.is_a?(Relation::Inheritance)
 
-            relation.itself_only_value = true if other.itself_only_value.present?
+            relation.itself_only! if other.itself_only_value.present?
 
-            if other.cast_records_values.present?
-              relation.cast_records_values += other.cast_records_values
-              relation.cast_records_values.uniq!
+            return if other.expand_records_values.blank?
+
+            if relation.model == other.model
+              types = (relation.expand_records_values + other.expand_records_values).uniq
+              relation.expand_records!(*types, eager_load: other.expand_records_eager_load_value)
+            else
+              raise_eager_load_conflict! if other.expand_records_eager_load_value
+
+              relation.expand_records_scoped_value = relation.expand_records_scoped_value
+                .merge(other.model => other.expand_records_values) { |_, a, b| (a + b).uniq }
             end
           end
 
+          def raise_eager_load_conflict!
+            raise InheritanceError.new(<<~MSG.squish)
+              Expanding the records of a different model happens through a
+              preload, which has no query to eager load the inherited tables
+              into, so the two cannot be merged.
+            MSG
+          end
+
           # Merge settings related to buckets
           def merge_buckets
-            return unless relation.is_a?(Relation::Buckets)
+            return unless defined?(Relation::Buckets) && relation.is_a?(Relation::Buckets)
             return if other.buckets_value.blank?
 
             relation.buckets_value = other.buckets_value

data/lib/torque/postgresql/relation.rb

@@ -13,9 +13,9 @@ module Torque
       include DistinctOn
       include Inheritance
 
-      SINGLE_VALUE_METHODS = %i[itself_only buckets]
+      SINGLE_VALUE_METHODS = %i[itself_only buckets expand_records_eager_load expand_records_scoped]
       MULTI_VALUE_METHODS = %i[
-        select_extra distinct_on auxiliary_statements cast_records
+        select_extra distinct_on auxiliary_statements expand_records
       ]
 
       VALUE_METHODS = SINGLE_VALUE_METHODS + MULTI_VALUE_METHODS
@@ -76,7 +76,8 @@ module Torque
         return unless relation
 
         table = predicate_builder.send(:table)
-        if table.associated_with?(relation.to_s)
+        associated = AR810 ? table.associated_with(relation.to_s) : table.associated_with?(relation.to_s)
+        if associated
           table.associated_table(relation.to_s).send(:klass)
         else
           raise ArgumentError, "Relation for #{relation} not found on #{klass}"
@@ -87,7 +88,7 @@ module Torque
       # the given column
       def cast_for_condition(column, value)
         column = columns_hash[column.to_s] unless column.is_a?(ARColumn)
-        caster = connection.lookup_cast_type_from_column(column)
+        caster = connection.lookup_cast_type_for_column(column)
         connection.type_cast(caster.serialize(value))
       end
 
@@ -107,11 +108,10 @@ module Torque
             .inheritance.record_class_column_name.to_sym
         end
 
-        # Easy and storable way to access the name used to get the indicate of
-        # auto casting inherited records
-        def _auto_cast_attribute
-          @@auto_cast ||= Torque::PostgreSQL.config
-            .inheritance.auto_cast_column_name.to_sym
+        # The same name as a string, which is how it arrives on every single
+        # row that has to be discriminated
+        def _record_class_column_name
+          @@record_class_column_name ||= _record_class_attribute.to_s.freeze
         end
       end
 
@@ -138,12 +138,13 @@ module Torque
     # the operation of ActiveRecord Relation
     ActiveRecord::Relation.include Relation
     ActiveRecord::Relation.prepend Relation::Initializer
+    ActiveRecord::Relation.prepend Relation::Inheritance::Expansion
 
     ActiveRecord::Relation::SINGLE_VALUE_METHODS.concat(Relation::SINGLE_VALUE_METHODS)
     ActiveRecord::Relation::MULTI_VALUE_METHODS.concat(Relation::MULTI_VALUE_METHODS)
     ActiveRecord::Relation::VALUE_METHODS.concat(Relation::VALUE_METHODS)
-    ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES.merge(%i[cast_records itself_only
-      distinct_on auxiliary_statements buckets])
+    ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES.merge(%i[expand_records itself_only
+      expand_records_eager_load expand_records_scoped distinct_on auxiliary_statements buckets])
 
   end
 end

data/lib/torque/postgresql/schema_cache.rb

@@ -74,6 +74,7 @@ module Torque
         @data_sources_model_names.delete name
         @inheritance_dependencies.delete name
         @inheritance_associations.delete name
+        @inheritance_loaded = false
       end
 
       def marshal_dump # :nodoc:

data/lib/torque/postgresql/validations.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Torque
+  module PostgreSQL
+    module Validations
+
+      # Checks if the objects nested into an attribute are valid, adding a
+      # single error to the attribute when any of them is not. It takes the
+      # regular +allow_nil+ and +allow_blank+ options, which is how values that
+      # are merely absent are left out of it
+      #
+      # Example:
+      #   validates :home, nested: true
+      #   validates :settings, nested: true, allow_blank: true
+      class NestedValidator < ActiveModel::EachValidator
+        def validate_each(record, attribute, value)
+          invalid = Array.wrap(value).any? do |item|
+            item.respond_to?(:invalid?) && item.invalid?
+          end
+
+          record.errors.add(attribute, :invalid) if invalid
+        end
+      end
+
+    end
+
+    ::ActiveRecord::Base.include(Validations)
+  end
+end

data/lib/torque/postgresql/version.rb

@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '4.0.0'
+    VERSION = '4.1.0'
   end
 end

data/lib/torque/postgresql/versioned_commands/command_migration.rb

@@ -62,7 +62,7 @@ module Torque
         end
       end
 
-      CommandMigration = Struct.new(*%i[filename version op type object_name op_version scope]) do
+      CommandMigration = ::Struct.new(*%i[filename version op type object_name op_version scope]) do
         delegate :execute, to: '@migration'
 
         def initialize(filename, *args)

data/lib/torque/postgresql.rb

@@ -1,9 +1,11 @@
 require 'i18n'
 require 'ostruct'
+require 'monitor'
 require 'active_model'
 require 'active_record'
 require 'active_support'
 
+require 'active_support/ordered_options'
 require 'active_support/core_ext/date/acts_like'
 require 'active_support/core_ext/time/zones'
 require 'active_record/connection_adapters/postgresql_adapter'
@@ -12,6 +14,9 @@ require 'torque/postgresql/config'
 require 'torque/postgresql/version'
 require 'torque/postgresql/collector'
 require 'torque/postgresql/geometry_builder'
+require 'torque/postgresql/attributes/ltree'
+require 'torque/postgresql/attributes/lquery'
+require 'torque/postgresql/predicate_table'
 require 'torque/postgresql/predicate_builder'
 
 require 'torque/postgresql/i18n'
@@ -29,5 +34,6 @@ require 'torque/postgresql/reflection'
 require 'torque/postgresql/schema_cache'
 require 'torque/postgresql/table_name'
 require 'torque/postgresql/function'
+require 'torque/postgresql/validations'
 
 require 'torque/postgresql/railtie' if defined?(Rails)

data/spec/initialize.rb

@@ -4,15 +4,23 @@ require_relative '../lib/torque/postgresql/adapter/schema_overrides'
 
 require_relative '../lib/torque/postgresql/adapter/oid/box'
 require_relative '../lib/torque/postgresql/adapter/oid/circle'
+require_relative '../lib/torque/postgresql/adapter/oid/composite'
 require_relative '../lib/torque/postgresql/adapter/oid/enum'
 require_relative '../lib/torque/postgresql/adapter/oid/enum_set'
 require_relative '../lib/torque/postgresql/adapter/oid/interval'
 require_relative '../lib/torque/postgresql/adapter/oid/line'
+require_relative '../lib/torque/postgresql/adapter/oid/lquery'
+require_relative '../lib/torque/postgresql/adapter/oid/ltree'
 require_relative '../lib/torque/postgresql/adapter/oid/segment'
+require_relative '../lib/torque/postgresql/adapter/oid/struct'
+require_relative '../lib/torque/postgresql/adapter/oid/struct_list'
+require_relative '../lib/torque/postgresql/adapter/oid/struct_set'
 
+require_relative '../lib/torque/postgresql/attributes/composite'
 require_relative '../lib/torque/postgresql/attributes/enum'
 require_relative '../lib/torque/postgresql/attributes/enum_set'
 require_relative '../lib/torque/postgresql/attributes/period'
+require_relative '../lib/torque/postgresql/attributes/struct'
 require_relative '../lib/torque/postgresql/attributes/full_text_search'
 
 require_relative '../lib/torque/postgresql/relation/auxiliary_statement'
@@ -28,6 +36,7 @@ module Torque
     Attributes::Enum.include_on(ActiveRecord::Base)
     Attributes::EnumSet.include_on(ActiveRecord::Base)
     Attributes::Period.include_on(ActiveRecord::Base)
+    Attributes::Struct.include_on(ActiveRecord::Base)
     Attributes::FullTextSearch.include_on(ActiveRecord::Base)
 
     Relation.include(Relation::AuxiliaryStatement)
@@ -40,6 +49,11 @@ module Torque
     ::Object.const_set('TorqueCTE', AuxiliaryStatement)
     ::Object.const_set('TorqueRecursiveCTE', AuxiliaryStatement::Recursive)
 
+    config.composite.namespace = ::Object.const_set('Composite', Module.new)
+    config.composite.namespace.define_singleton_method(:const_missing) do |name|
+      Attributes::Composite.lookup(name)
+    end
+
     config.enum.namespace = ::Object.const_set('Enum', Module.new)
     config.enum.namespace.define_singleton_method(:const_missing) do |name|
       Attributes::Enum.lookup(name)
@@ -50,8 +64,9 @@ module Torque
     end
 
     ar_type = ActiveRecord::Type
-    ar_type.register(:enum,     Adapter::OID::Enum,     adapter: :postgresql)
-    ar_type.register(:enum_set, Adapter::OID::EnumSet,  adapter: :postgresql)
+    ar_type.register(:enum,      Adapter::OID::Enum,      adapter: :postgresql)
+    ar_type.register(:enum_set,  Adapter::OID::EnumSet,   adapter: :postgresql)
+    ar_type.register(:composite, Adapter::OID::Composite, adapter: :postgresql)
 
     ar_type.register(:box,      Adapter::OID::Box,      adapter: :postgresql)
     ar_type.register(:circle,   Adapter::OID::Circle,   adapter: :postgresql)
@@ -60,6 +75,9 @@ module Torque
 
     ar_type.register(:interval, Adapter::OID::Interval, adapter: :postgresql)
 
+    ar_type.register(:ltree,    Adapter::OID::Ltree,    adapter: :postgresql)
+    ar_type.register(:lquery,   Adapter::OID::Lquery,   adapter: :postgresql)
+
     Arel.build_operations(config.arel.infix_operators)
 
     ActiveRecord::Base.connection.torque_load_additional_types

data/spec/mocks/cache_query.rb

@@ -15,6 +15,18 @@ module Mocks
       result
     end
 
+    def capture_executed_queries
+      queries = []
+      subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*, payload|
+        queries << payload[:sql] unless payload[:name] == 'SCHEMA' || payload[:cached]
+      end
+
+      yield
+      queries
+    ensure
+      ActiveSupport::Notifications.unsubscribe(subscriber)
+    end
+
     def get_query_with_binds(&block)
       result = nil
 

data/spec/models/author.rb

@@ -1,4 +1,4 @@
 class Author < ActiveRecord::Base
-  has_many :activities, -> { cast_records }
+  has_many :activities, dependent: :destroy
   has_many :posts
 end

data/spec/models/comment.rb

@@ -1,3 +1,5 @@
 class Comment < ActiveRecord::Base
   belongs_to :user
+  belongs_to :commentable, polymorphic: true, foreign_key: :video_id,
+    foreign_type: :kind, optional: true
 end

data/spec/models/place.rb

@@ -0,0 +1,2 @@
+class Place < ActiveRecord::Base
+end

data/spec/models/profile.rb

@@ -0,0 +1,31 @@
+class Profile < ActiveRecord::Base
+  class Settings < Torque::PostgreSQL::Attributes::Struct
+    attribute :theme, :string, default: 'light'
+    attribute :notifications, :boolean, default: true
+    attribute :tags
+
+    validates :theme, inclusion: { in: %w[light dark] }, allow_nil: true
+  end
+
+  class Bio < Torque::PostgreSQL::Attributes::Struct
+    attribute :headline, :string
+    attribute :website, :string
+  end
+
+  class Preview < Torque::PostgreSQL::Attributes::Struct
+    attribute :label, :string
+    attribute :url, :string
+
+    validates :url, presence: true
+  end
+
+  class Snippet < Torque::PostgreSQL::Attributes::Struct
+    attribute :title, :string
+    attribute :body, :string
+  end
+
+  struct_for :settings, Settings, delegate: %i[theme]
+  struct_for :bio, Bio
+  struct_for :previews, Preview, array: true
+  struct_for :snippets, Snippet
+end

data/spec/schema.rb

@@ -10,13 +10,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-version = 6
-
-return if ActiveRecord::Migrator.current_version == version
-ActiveRecord::Schema.define(version: version) do
+ActiveRecord::Schema.define do
   self.verbose = false
 
   # These are extensions that must be enabled in order to support this database
+  enable_extension "ltree"
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
@@ -31,6 +29,27 @@ ActiveRecord::Schema.define(version: version) do
   create_enum "conflicts", ["valid", "invalid", "untrusted"]
   create_enum "types", ["A", "B", "C", "D"]
 
+  create_composite_type "address", force: :cascade do |t|
+    t.string  "street"
+    t.string  "city"
+    t.integer "number"
+    t.enum    "category", enum_type: :types
+  end
+
+  create_composite_type "full_address", force: :cascade do |t|
+    t.composite "base", composite_type: :address
+    t.string    "country"
+    t.date      "since"
+    t.decimal   "rate", precision: 8, scale: 2
+  end
+
+  create_table "places", force: :cascade do |t|
+    t.string    "name"
+    t.composite "home", composite_type: :address
+    t.composite "offices", composite_type: :address, array: true
+    t.composite "location", composite_type: :full_address
+  end
+
   create_table "geometries", force: :cascade do |t|
     t.point   "point"
     t.line    "line"
@@ -65,6 +84,14 @@ ActiveRecord::Schema.define(version: version) do
     t.datetime "updated_at", null: false
   end
 
+  create_table "profiles", force: :cascade do |t|
+    t.string "name"
+    t.jsonb  "settings"
+    t.json   "bio"
+    t.jsonb  "previews"
+    t.jsonb  "snippets", array: true
+  end
+
   create_table "authors", force: :cascade do |t|
     t.string   "name"
     t.string   "type"
@@ -74,6 +101,7 @@ ActiveRecord::Schema.define(version: version) do
   create_table "categories", force: :cascade do |t|
     t.integer  "parent_id"
     t.string   "title"
+    t.ltree    "path", index: { using: :gist }
   end
 
   create_table "texts", force: :cascade do |t|
@@ -99,6 +127,7 @@ ActiveRecord::Schema.define(version: version) do
     t.enum            "types", enum_type: :types, array: true
     t.search_language "lang", null: false, default: 'english'
     t.search_vector   "search_vector", columns: :title, language: :lang
+    t.tsvector        "unhandled"
     t.datetime        "created_at", null: false
     t.datetime        "updated_at", null: false
   end
@@ -127,6 +156,7 @@ ActiveRecord::Schema.define(version: version) do
   create_table "users", force: :cascade do |t|
     t.string   "name", null: false
     t.enum     "role", enum_type: :roles, default: :visitor
+    t.ltree    "permissions", array: true
     t.integer  "age"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false

data/spec/tests/arel_spec.rb

@@ -56,7 +56,9 @@ RSpec.describe 'Arel' do
     it 'does not break the change column default value method' do
       connection.add_column(:authors, :enabled, :boolean)
       expect { connection.change_column_default(:authors, :enabled, { from: nil, to: true }) }.not_to raise_error
-      expect(Author.columns_hash['enabled'].default).to eq('true')
+      # Rails 8.1 type casts column defaults, so it is no longer a string
+      expected = Torque::PostgreSQL::AR810 ? true : 'true'
+      expect(Author.columns_hash['enabled'].default).to eq(expected)
     end
 
     it 'does not break jsonb' do
@@ -145,12 +147,12 @@ RSpec.describe 'Arel' do
       condition = Video.arel_table[:tag_ids].contains([1,2]).cast(:bigint, :array)
       query = Video.all.where(condition).to_sql
 
-      expect(query).to include('WHERE "videos"."tag_ids" @> ARRAY[1, 2]::bigint[]')
+      expect(query).to include(%{WHERE "videos"."tag_ids" @> '{1,2}'::bigint[]})
 
       condition = QuestionSelect.arel_table[:options].overlaps(%w[a b]).cast(:string, :array)
       query = QuestionSelect.all.where(condition).to_sql
 
-      expect(query).to include('"options" && ARRAY[\'a\', \'b\']::string[]')
+      expect(query).to include(%{"options" && '{a,b}'::string[]})
     end
   end
 end