torque-postgresql 4.0.1 → 4.1.1

data/sig/torque/postgresql/versioned_commands/command_migration.rbs

@@ -0,0 +1,54 @@
+module Torque
+  module PostgreSQL
+    module VersionedCommands
+      module Migration
+        @command: CommandMigration
+        @description: [String, String]
+        @connection: connection?
+        @execution_strategy: untyped
+
+        def initialize: (*untyped args) -> void
+        def migrate: (:up | :down direction) -> untyped
+        def exec_migration: (connection conn, :up | :down direction) -> untyped
+        def announce: (String message) -> untyped
+        def description_for: (:up | :down direction) -> [String, String]
+        def execute: (String command) -> untyped
+      end
+
+      class CommandMigration < ::Struct[untyped]
+        @migration: ActiveRecord::Migration?
+
+        def filename: () -> String
+        def filename=: (String value) -> String
+        def version: () -> Integer
+        def version=: (Integer value) -> Integer
+        def op: () -> String
+        def op=: (String value) -> String
+        def type: () -> String
+        def type=: (String value) -> String
+        def object_name: () -> String
+        def object_name=: (String value) -> String
+        def op_version: () -> Integer
+        def op_version=: (Integer value) -> Integer
+        def scope: () -> String?
+        def scope=: (String? value) -> String?
+
+        def execute: (String command) -> untyped
+        def initialize: (String filename, *untyped args) -> void
+        def name: () -> String
+        def disable_ddl_transaction: () -> false
+        def migrate: (:up | :down direction) -> untyped
+        def up: () -> untyped
+        def down: () -> untyped
+        def drop: () -> untyped
+
+        private
+
+        def drop_function: () -> untyped
+        def drop_type: () -> untyped
+        def drop_trigger: () -> untyped
+        def drop_view: () -> untyped
+      end
+    end
+  end
+end

data/sig/torque/postgresql/versioned_commands/generator.rbs

@@ -0,0 +1,17 @@
+module Torque
+  module PostgreSQL
+    module VersionedCommands
+      module Generator
+        TEMPLATES_PATH: String
+
+        attr_reader file_name: String?
+
+        def self.included: (singleton(Rails::Generators::Base) base) -> untyped
+        def type: () -> String
+        def create_migration_file: () -> untyped
+        def count_object_entries: () -> Integer
+        def validate_file_name!: () -> nil
+      end
+    end
+  end
+end

data/sig/torque/postgresql/versioned_commands/migration_context.rbs

@@ -0,0 +1,30 @@
+module Torque
+  module PostgreSQL
+    class IllegalCommandTypeError < ActiveRecord::MigrationError
+      def initialize: (String file) -> void
+    end
+
+    module VersionedCommands
+      module MigrationContext
+        type status = [String, String, String]
+
+        InvalidMigrationTimestampError: untyped
+        PGAdapter: singleton(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+
+        def migrations: () -> Array[untyped]
+        def migrations_status: () -> Array[status]
+        def migration_commands: () -> Array[CommandMigration]
+
+        private
+
+        def running_for_pg?: () -> bool
+        def command_files: () -> Array[String]
+        def parse_command_filename: (String filename) -> Array[String?]?
+      end
+    end
+  end
+end
+
+class ActiveRecord::MigrationContext
+  prepend Torque::PostgreSQL::VersionedCommands::MigrationContext
+end

data/sig/torque/postgresql/versioned_commands/migrator.rbs

@@ -0,0 +1,19 @@
+module Torque
+  module PostgreSQL
+    module VersionedCommands
+      module Migrator
+        @versioned_command: CommandMigration | false
+        @versioned_table: SchemaTable
+        @versioned_counter: Integer
+
+        def execute_migration_in_transaction: (untyped migration) -> untyped
+        def record_version_state_after_migrating: (Integer version) -> untyped
+        def versioned_command?: (untyped migration) -> bool
+      end
+    end
+  end
+end
+
+class ActiveRecord::Migrator
+  prepend Torque::PostgreSQL::VersionedCommands::Migrator
+end

data/sig/torque/postgresql/versioned_commands/schema_table.rbs

@@ -0,0 +1,23 @@
+module Torque
+  module PostgreSQL
+    module VersionedCommands
+      class SchemaTable
+        attr_reader arel_table: arel_table
+
+        @pool: pool
+
+        def initialize: (pool pool) -> void
+        def create_version: (CommandMigration command) -> untyped
+        def delete_version: (CommandMigration command) -> Integer
+        def primary_key: () -> String
+        def name: () -> String
+        def table_name: () -> String
+        def create_table: () -> untyped
+        def drop_table: () -> untyped
+        def count: () -> Integer
+        def table_exists?: () -> bool
+        def versions_of: (Symbol | String type) -> Array[[String, Integer]]
+      end
+    end
+  end
+end

data/sig/torque/postgresql/versioned_commands.rbs

@@ -0,0 +1,25 @@
+module Torque
+  module PostgreSQL
+    module VersionedCommands
+      type command_type = :function | :type | :view | :trigger
+      type dirs = String | Array[String]
+
+      RAILS_APP: untyped
+      NAME_MATCH: String
+
+      @filename_regexp: Regexp
+
+      def self.valid_type?: (Symbol | String type) -> bool
+      def self.validate!: (Symbol | String type, String content, String name) -> nil
+      def self.fetch_command: (dirs dirs, Symbol | String type, String name, Integer | String version) -> String
+      def self.filename_regexp: () -> Regexp
+
+      private
+
+      def self.validate_function!: (String content, String name) -> nil
+      def self.validate_type!: (String content, String name) -> nil
+      def self.validate_trigger!: (String content, String name) -> nil
+      def self.validate_view!: (String content, String name) -> nil
+    end
+  end
+end

data/sig/torque/postgresql.rbs

@@ -0,0 +1,26 @@
+module Torque
+  module PostgreSQL
+    type model = singleton(ActiveRecord::Base)
+    type record = ActiveRecord::Base
+    type relation = ActiveRecord::Relation
+    type connection = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+    type pool = ActiveRecord::ConnectionAdapters::ConnectionPool
+    type reflection = ActiveRecord::Reflection::AssociationReflection
+    type any_reflection = ActiveRecord::Reflection::AbstractReflection
+    type column = ActiveRecord::ConnectionAdapters::PostgreSQL::Column
+    type type_caster = ActiveModel::Type::Value
+    type column_ref = String | Symbol
+    type table_ref = String | Symbol | ActiveRecord::ConnectionAdapters::PostgreSQL::Name
+    type arel_table = ::Arel::Table
+    type arel_attribute = ::Arel::Attributes::Attribute
+    type arel_node = ::Arel::Nodes::Node | ::Arel::Nodes::SqlLiteral | arel_attribute
+    type collector = ::Arel::Collectors::SQLString | ::Arel::Collectors::Composite | ::Arel::Collectors::Bind | ::Arel::Collectors::SubstituteBinds
+    type stream = IO | StringIO
+    type table_node = arel_table | ::Arel::Nodes::TableAlias
+    type path_key = column_ref | Integer
+
+    interface _Callable
+      def call: (*untyped) -> untyped
+    end
+  end
+end

data/skills/torque-postgresql/SKILL.md

@@ -0,0 +1,70 @@
+---
+name: torque-postgresql
+description: PostgreSQL features in Rails through the torque-postgresql gem. Use when writing models, migrations, or queries in an app whose Gemfile has torque-postgresql, or when a task needs a PostgreSQL type (enum, enum set, jsonb document, composite, ltree, range, interval, geometry) or query feature (CTE, DISTINCT ON, FILTER aggregates, width_bucket, generate_series, full-text search, array associations, table inheritance).
+---
+
+# torque-postgresql
+
+The gem exposes PostgreSQL features through the regular Rails DSL: migration methods that dump
+to `schema.rb`, model macros, and relation methods. Reach for it before raw SQL.
+
+## Steps
+
+1. Locate the installed gem with `bundle info torque-postgresql`. Done when you know its version
+   and path.
+2. Read the app's `Torque::PostgreSQL.configure` block (search `config/` for it). Done when you
+   know which features are off and which macros are renamed: every `base_method` key renames a
+   macro, and `versioned_commands` and `cross_join` stay off unless enabled there.
+3. Pick the feature from the table below and read its docs page before writing code. Done when
+   the migration, the model macro, and the query you plan all appear on that page.
+4. Check exact signatures in `<gem path>/sig/`, when the installed release ships one. Methods
+   generated per attribute (`admin?`, period scopes, `full_text_search`) are named on the docs
+   page, never in `sig/`.
+5. Write the migration with the gem's DSL, run it, and confirm `db/schema.rb` dumps it.
+
+## Features
+
+Docs live at `https://torque.dev/postgresql/<page>/`. The index is
+`https://torque.dev/postgresql/llms.txt`, and every page in one file is
+`https://torque.dev/postgresql/llms-full.txt`.
+
+| Need | Migration | Model or query | Page |
+|---|---|---|---|
+| Fixed list of values | `create_enum`, `t.enum enum_type:` | `torque_enum :role`, `Enum::Roles` | `data-types/enum` |
+| Several values of one enum | `t.enum enum_type:, array: true` | `torque_enum_set :perms` | `data-types/enum-set` |
+| Typed jsonb document | `t.jsonb` | `struct_for :settings, Klass` | `data-types/struct` |
+| Database composite type | `create_composite_type`, `t.composite composite_type:` | `Composite::Address` | `data-types/composite` |
+| Tree paths | `enable_extension 'ltree'`, `t.ltree`, `t.lquery` | `where(path: ...)` | `data-types/ltree` |
+| Time windows | `t.tsrange`, `t.daterange` | `period_for :period` | `data-types/date-time-range` |
+| Durations | `t.interval` | `ActiveSupport::Duration` values | `data-types/interval` |
+| Geometry | `t.box`, `t.circle`, `t.line`, `t.segment` | value objects | `data-types/box` and siblings |
+| Array of foreign keys | `t.bigint :tag_ids, array: true` | `belongs_to_many :tags`, `has_many :videos, array: true` | `modeling/belongs-to-many`, `modeling/has-many` |
+| Table inheritance | `create_table :child, inherits: :parent` | `expand_records` | `modeling/inherited-tables` |
+| Value computed on demand | | `dynamic_attribute(:name) { }` | `modeling/dynamic-attributes` |
+| Conditional upsert | | `upsert_all(rows, where: ...)` | `modeling/insert-all` |
+| CTE | | `auxiliary_statement :name`, `.with(:name)` | `querying/auxiliary-statements` |
+| First row per group | | `distinct_on(:col)` | `querying/distinct-on` |
+| Histogram | | `buckets(:col, range_or_list)` | `querying/buckets` |
+| Several filtered aggregates | | `segments(name: condition).count` | `querying/segments` |
+| Report rows with no data | | `join_series(range, with: :col)` | `querying/join-series` |
+| Full-text search | `t.search_vector columns:` | `torque_search_for :col`, `.full_text_search` | `querying/full-text-search` |
+| Regexp and array conditions | | `where(title: /x/)` | `querying/predicate-builder` |
+| SQL functions and operators | | `FN.*`, Arel infix methods | `querying/arel` |
+| Several schemas | `create_schema` | `self.schema =` | `experimental/multiple-schemas` |
+| Versioned views, functions, triggers, types | `rails g torque:view` and siblings | | `experimental/versioned-commands` |
+| Join a function, subquery, or row list | | `cross_join(source, as:)` | `experimental/cross-join` |
+
+## Rules
+
+- **Enum types** come from Rails' own `create_enum`. Adding values with `add_enum_values` may
+  need `disable_ddl_transaction!` in that migration.
+- **Struct classes** subclass `Torque::PostgreSQL::Struct` and are strict by default. Only `jsonb`
+  columns can be queried by property. Encrypt properties, never the whole column.
+- **Inherited records** reached through an association come back partial and read-only. Load
+  them with `expand_records` before writing to them.
+- **ltree labels** accept dashes only on PostgreSQL 16+. The `ltree.sanitize` setting rewrites
+  them, which matters for UUID labels.
+- **`FN`** is `Torque::PostgreSQL::FN`. The app may expose it under a shorter name through
+  `arel.expose_function_helper_on`, which the docs write as `PG::Fn`.
+- **Array conditions** use `ANY` and overlaps only when `predicate_builder.handle_array_attributes`
+  is on. It is off by default.

data/spec/fixtures/migrations/20250101000008_create_trigger_audit_users_v1.sql

@@ -0,0 +1,3 @@
+CREATE OR REPLACE TRIGGER audit_users
+  BEFORE INSERT ON users
+  FOR EACH ROW EXECUTE FUNCTION count_users();

data/spec/initialize.rb

@@ -4,20 +4,32 @@ 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/attributes/ltree'
+require_relative '../lib/torque/postgresql/attributes/lquery'
 
 require_relative '../lib/torque/postgresql/relation/auxiliary_statement'
 require_relative '../lib/torque/postgresql/relation/join_series'
 require_relative '../lib/torque/postgresql/relation/buckets'
+require_relative '../lib/torque/postgresql/relation/segments'
+require_relative '../lib/torque/postgresql/relation/cross_join'
 
 require_relative '../lib/torque/postgresql/versioned_commands'
 
@@ -28,11 +40,17 @@ 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)
     Relation.include(Relation::JoinSeries)
     Relation.include(Relation::Buckets)
+    Relation.include(Relation::Segments)
+    Relation.include(Relation::CrossJoin)
+
+    config.cross_join.enabled = true
+    ActiveRecord::Base.singleton_class.delegate(:cross_join, to: :all)
 
     config.versioned_commands.enabled = true
     ActiveRecord::Schema::Definition.include(Adapter::Definition)
@@ -40,6 +58,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 +73,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 +84,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,12 +15,24 @@ 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
 
       original_method = ActiveRecord::Base.connection.method(:raw_execute)
       original_method.receiver.define_singleton_method(:raw_execute) do |*args, **xargs, &block|
-        result ||= [args.first, args.third]
+        result ||= [args.first, args.third] unless %w[SCHEMA TRANSACTION].include?(args.second)
         super(*args, **xargs, &block)
       end
 

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/rbs_helper.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+ENV['RBS_TEST_TARGET'] ||= 'Torque::PostgreSQL::*,Torque::Generators::*'
+ENV['RBS_TEST_SKIP'] ||= '::Torque::PostgreSQL::Attributes::Lazy,::Torque::PostgreSQL::Adapter::OID::Range::Comparison'
+ENV['RBS_TEST_OPT'] ||= '-I sig'
+ENV['RBS_TEST_LOGLEVEL'] ||= 'warn'
+
+require 'rbs/test/setup'

data/spec/schema.rb

@@ -10,13 +10,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-version = 7
-
-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,9 @@ 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 }
+    t.lquery   "pattern"
+    t.lquery   "patterns", array: true
   end
 
   create_table "texts", force: :cascade do |t|
@@ -128,6 +158,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/spec_helper.rb

@@ -1,3 +1,4 @@
+require_relative 'rbs_helper' if ENV['RBS_TEST']
 require 'torque-postgresql'
 require 'database_cleaner'
 require 'factory_bot'

data/spec/tests/arel_spec.rb

@@ -56,7 +56,7 @@ 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')
+      expect(Author.new.enabled).to be(true)
     end
 
     it 'does not break jsonb' do
@@ -145,12 +145,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

data/spec/tests/auxiliary_statement_spec.rb

@@ -101,6 +101,18 @@ RSpec.describe 'AuxiliaryStatement' do
       expect(query.send(:bound_attributes).map(&:value_before_type_cast)).to eql([1, 2])
     end
 
+    it 'collects the bound attributes without a permanent connection' do
+      klass.send(:auxiliary_statement, :comments) do |cte|
+        cte.query Comment.where(id: 1)
+        cte.attributes content: :comment_content
+      end
+
+      expect(ActiveRecord::Base).not_to receive(:connection)
+
+      query = subject.where(id: 2).with(:comments)
+      expect(query.send(:bound_attributes).map(&:value_before_type_cast)).to eql([1, 2])
+    end
+
     it 'accepts string as attributes' do
       klass.send(:auxiliary_statement, :comments) do |cte|
         cte.query Comment.all