activerecord-clickhouse-adapter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f16a02cdd51358de67461ac920dcecdb2dcec096b7c47898a91e2d555b5f0b0
-  data.tar.gz: 49fdee335e90e3bdae9a28a5bce316d024f2161b45758128cdd7c424611da7d8
+  metadata.gz: 961d1de0d406b53d1244395ce2159a5629a335eda4f74e71b5bcdbf489c3ed01
+  data.tar.gz: e7022e7db80a7520c083c88fd058d98ddb79d0c4d8450628ba954304a104dbaf
 SHA512:
-  metadata.gz: f13d3bcfce5f752f6e6c2b2ba4a559bfdae3b192d04ac27034e2d49b1151a4c659d392d005a44e53dc03d997a8cbc9631650a5d80756bb23bb4f416bd8ddffdb
-  data.tar.gz: 2be555427541cf9329053c10acd00265e46780b6dd401b8309333e8d606b4d7a235fb18a35aacb4331c56abccbe48b725664dab2ceb91f81910d16b3fe314b90
+  metadata.gz: 3b8e3c624094591a222e1fc8bdc0f74abf8a8681bc9732c08b1c587b68a57f89273dbd1fb7f551e40d6ac8aa6f890cc98e531a329c4be45fa2b7a0db1efd458f
+  data.tar.gz: 2598a56859fd5b5c1882da961b8d333fe32e8131abea8173c176a0765cb7df49e733b3a037781cae349c0bc24fa191c50b5a2e5eaf55bb7f15dba8b0ee14cf57

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.2.1 (2026-07-24)
+
+Fixed:
+
+- Fixed comment hoisting corrupting `INSERT ... VALUES` when a string value contains an
+  unclosed `/*` (e.g. a request path of `/*`). The trailing-comment scan is now
+  string-literal aware, so a `/*` inside a value is never taken for the start of a trailing
+  sqlcommenter tag. Previously such a value mangled the statement and the server rejected the
+  whole batch with a `SYNTAX_ERROR`, dropping every row in it
+
 # 0.2.0 (2026-07-23)
 
 Breaking-ish (schema diff noise, not data changes):

data/README.md

@@ -8,6 +8,7 @@ A fully featured Active Record adapter for [ClickHouse](https://clickhouse.com)
 - OLAP query surface: `FINAL`, `PREWHERE`, `SAMPLE`, `LIMIT BY`, time bucketing, approximate aggregates
 - Real instrumentation: rows read, bytes read, and server elapsed time on every query
 - Fast wire: RowBinary reads and chunked streaming inserts
+- Multi-replica failover and server-enforced read-only connections
 
 Tested against a live ClickHouse server only — no mocked responses, ever.
 
@@ -80,6 +81,8 @@ end
 
 Columns are non-nullable by default, matching ClickHouse. Use `null: true` for `Nullable(...)`.
 
+`t.datetime` defaults to precision 6 (microseconds, Rails' convention); pass `precision: nil` for the second-precision base `DateTime`. `t.binary`/`t.blob` map to `String` — ClickHouse strings are arbitrary byte sequences.
+
 Rails-style id tables also work — `id: :bigint` (plain Int64, no autoincrement) or `id: :uuid` creates the pk column as its own sorting key, ids arrive client-generated, and models auto-detect the primary key:
 
 ```ruby
@@ -298,6 +301,26 @@ clickhouse:
 - **Mutation counts are best-effort.** `update_all`/`delete_all` return a pre-mutation `SELECT count()` — ClickHouse reports no affected-row counts.
 - **Eventual merges.** `ReplacingMergeTree` deduplicates at merge time; read with `.final` when you need collapsed rows.
 - **Failover never replays a request.** With `hosts:`, only connect-phase failures (refused, unreachable, open timeout) move to the next replica — those cannot have executed anything. A mid-flight failure (read timeout, reset) raises, because the statement may already have run.
+- **Read-only is server-enforced.** `read_only: true` stamps `readonly=2` on every request; the server's refusal (code 164) raises `ActiveRecord::ReadOnlyError` — the same class Rails' `while_preventing_writes` uses — including for server-configured readonly users. Grant refusals (code 497) raise `ClickHouse::AccessDenied`.
+- **`matches` renders `ILIKE`.** ClickHouse `LIKE` is case-sensitive (unlike MySQL), so Arel's case-insensitive `matches`/`does_not_match` use native `ILIKE`.
+- **No row locks.** Reads are isolated snapshots of parts, so `FOR UPDATE` renders as nothing and shared `lock`/`with_lock` code runs instead of dying. Optimistic locking via `lock_version` works end-to-end.
+
+## Migrating from clickhouse-activerecord
+
+This gem registers the same `"clickhouse"` adapter name as [clickhouse-activerecord](https://github.com/PNixx/clickhouse-activerecord) and accepts its `database.yml` shape — swap the gem and the config carries over. The two gems cannot be loaded at once.
+
+Schema-version bookkeeping does not carry over. The incumbent records applied versions in a `(version, active, ver)` ReplacingMergeTree with `active = 0` tombstones; this adapter uses Rails' plain `schema_migrations` table and does not read that shape, so a sink migrated by the incumbent reports zero applied versions.
+
+Never re-run migrations over a live sink to fix that — replaying DDL over final-state tables can corrupt data (enum narrowing, for one). Adopt the version state once instead:
+
+```ruby
+versions = connection.select_values("SELECT version FROM schema_migrations FINAL WHERE active = 1")
+connection.execute("RENAME TABLE schema_migrations TO schema_migrations_legacy")
+pool.schema_migration.create_table
+versions.each { |v| pool.schema_migration.create_version(v) }
+```
+
+Pending migrations run normally afterwards. To roll back the adoption, drop the new `schema_migrations` table and rename the legacy one back.
 
 ## Development
 
@@ -317,7 +340,7 @@ RAILS_SOURCE=edge bundle install
 RAILS_SOURCE=edge bundle exec rspec
 ```
 
-The suite includes a Rails compatibility harness that runs vendored upstream Active Record test suites (~4,500 tests) against the adapter. See `spec/rails_compat/`.
+The suite includes a Rails compatibility harness that runs vendored upstream Active Record test suites (~5,600 tests — 5,558 runs, 447 skips, each skip documenting the dialect truth behind it) against the adapter. See `spec/rails_compat/`.
 
 ## History
 

data/lib/active_record/connection_adapters/clickhouse/database_statements.rb

@@ -295,24 +295,45 @@ module ActiveRecord
           end
         end
 
-        TRAILING_COMMENTS = %r{(?:\s*/\*(?:[^*]|\*(?!/))*\*/)+\s*\z}
+        COMMENT = %r{/\*(?:[^*]|\*(?!/))*\*/}m
         INSERT_STATEMENT = /\A\s*INSERT\b/i
-        private_constant :TRAILING_COMMENTS, :INSERT_STATEMENT
-
-        # ClickHouse reads everything after VALUES with the Values input format, which
-        # rejects trailing comments (probed 2026-07-13), so sqlcommenter tags appended
-        # by Rails' QueryLogs are hoisted to the front of INSERT statements.
-        def hoist_trailing_comments(sql)
-          # ClickHouse strings are byte sequences; SQL carrying invalid UTF-8 must reach
-          # the server rather than die in these regexes, so it drops to binary (the
-          # patterns are pure ASCII and match byte-wise).
+        # Data outside strings/comments: any non-space run, but a `/` only when it doesn't open a comment.
+        DATA_RUN = %r{(?:[^\s'`/]|/(?!\*))+}
+        private_constant :COMMENT, :INSERT_STATEMENT, :DATA_RUN
+
+        # ClickHouse reads everything after VALUES with the Values input format, which rejects
+        # trailing comments (probed 2026-07-13), so sqlcommenter tags Rails' QueryLogs appends
+        # are hoisted to the front of INSERTs. Scans string-aware — a /* inside a value (a request
+        # path like "/*") is opaque and never taken for a comment, so the VALUES list stays intact.
+        def hoist_trailing_comments(sql) # rubocop:disable Metrics/MethodLength
+          # ClickHouse strings are byte sequences; SQL carrying invalid UTF-8 must reach the server
+          # rather than die in the scan, so it drops to binary (the patterns are pure ASCII).
           sql = sql.b unless sql.valid_encoding?
           return sql unless INSERT_STATEMENT.match?(sql)
 
-          comments = sql[TRAILING_COMMENTS]
-          return sql unless comments
+          scanner = StringScanner.new(sql)
+          data_end = 0
+          trailing = []
+          until scanner.eos?
+            next if scanner.skip(/\s+/)
+
+            if (comment = scanner.scan(COMMENT))
+              trailing << comment
+            else
+              consume_data_token(scanner)
+              trailing.clear
+              data_end = scanner.pos
+            end
+          end
+          return sql if trailing.empty?
+
+          "#{trailing.join(" ")} #{sql[0...data_end]}"
+        end
 
-          "#{comments.strip} #{sql[0...-comments.length]}"
+        # One opaque data token: a string literal or backtick identifier (skipped whole, so a /*
+        # inside never reads as a comment), an ordinary data run, or a lone char that starts none.
+        def consume_data_token(scanner)
+          scanner.scan(STRING_LITERAL) || scanner.scan(BACKTICK_IDENTIFIER) || scanner.scan(DATA_RUN) || scanner.getch
         end
 
         # Rails main (8.2) funnels execution through a QueryIntent object; released

data/lib/active_record/connection_adapters/clickhouse/gem_version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module ClickHouse
-      VERSION = "0.2.0"
+      VERSION = "0.2.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-clickhouse-adapter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ikraam Ghoor
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.3
 specification_version: 4
 summary: ClickHouse database adapter for Active Record
 test_files: []