Skip to content

feat: migrate ClickHouse adapter to utopia-php/query 0.3.x builder#120

Open
lohanidamodar wants to merge 25 commits into
mainfrom
feat/utopia-query-0.3.x
Open

feat: migrate ClickHouse adapter to utopia-php/query 0.3.x builder#120
lohanidamodar wants to merge 25 commits into
mainfrom
feat/utopia-query-0.3.x

Conversation

@lohanidamodar

@lohanidamodar lohanidamodar commented May 17, 2026

Copy link
Copy Markdown
Contributor

Summary

Migrate the ClickHouse audit adapter off the legacy 0.1.x utopia-php/query
contract onto the 0.3.x Builder\ClickHouse and Schema\ClickHouse API. Every
SQL/DDL string the adapter emits now goes through the query library; the audit
side keeps only the HTTP transport, ClickHouse-typed parameter hint binding,
JSONEachRow body serialization, and tuple cursor compilation.

What was replaced:

  • setup() — CREATE TABLE / engine / ORDER BY / PARTITION BY / SETTINGS /
    bloom_filter indexes through Schema\ClickHouse.
  • createBatch()INSERT INTO … (cols) FORMAT JSONEachRow through
    Builder\ClickHouse::insertFormat() (rows still serialized in the
    HTTP-payload layer).
  • cleanup()ALTER TABLE … DELETE WHERE … with optional trailing
    SETTINGS clause through Builder\ClickHouse::settings() +
    delete(). Async cleanup now drives mutations_sync = 0 instead of
    lightweight_deletes_sync = 0 because the builder compiles mutations,
    not lightweight deletes; row visibility is identical.
  • find(), count(), getById()SELECT … FROM … WHERE … ORDER BY …
    skeleton through Builder\ClickHouse. Filter / cursor / tenant
    expressions ride along via whereRaw(); the existing ClickHouse-typed
    {name:Type} parameters and associative params map stay in the audit
    runtime layer.

Dependency

All required query-side work (insertFormat(), trailing SETTINGS on
delete(), materialized-view DDL, bulkInsert() + Format::serialize(),
identifier quoting, and the LowCardinality(Nullable(T)) wrapping-order fix)
has been merged upstream and released in the stable utopia-php/query 0.3.3
tag. The Composer requirement is the stable range 0.3.* (resolves to
0.3.3); no dev-branch pins remain.

The ranges PHPStan deps were bumped to ^2.0 because PHP-Parser bundled by
PHPStan 1.x can't tokenize the asymmetric visibility (public protected(set))
the query library now uses on schema and builder properties.

Deferred / known gaps

  • Gap Connecting Membership Sub-Packages (textes) #7 (typed parameter hints). Builder\ClickHouse emits generic
    ? placeholders for compiled filters, limits, and offsets. Audit binds
    by associative {name:Type} so the runtime layer can attach ClickHouse
    type hints (UInt64, DateTime64(3), etc.). The adapter still relies on
    its own parseQueries() to emit the typed clauses (passed through
    whereRaw()), and appends LIMIT/OFFSET with typed placeholders by hand.
    Once the query lib gains a typed-placeholder hook this can collapse into a
    single builder call chain.
  • Gap Announcement comparison Tab #8 (tuple cursor). Keyset pagination still builds the
    (a > A) OR (a = A AND b > B) … cascade in the adapter and feeds it
    through whereRaw(). The base builder does not yet emit
    ClickHouse-flavoured tuple comparisons.
  • HTTP transport extraction stays where it was (future: utopia-php/database).

Commit topology

  1. chore(deps): bump utopia-php/query to 0.3.x (dev-branch pin)
  2. refactor(query): re-expose TYPE_* constants on Audit\Query for 0.3.x
  3. chore(deps): bump phpstan to ^2.0 for PHP 8.4 query lib
  4. refactor(adapters): unwrap Method enum to string at getMethod() call sites
  5. chore: silence PHPStan 2.x diagnostics unrelated to the migration
  6. refactor(clickhouse): use Schema\ClickHouse for setup() DDL
  7. refactor(clickhouse): use Builder INSERT FORMAT JSONEachRow for createBatch
  8. refactor(clickhouse): use Builder DELETE + SETTINGS for cleanup()
  9. refactor(clickhouse): use Builder for find/count/getById SQL shape
  10. test(clickhouse): add SQL snapshot tests for migrated builder paths

Test plan

  • composer lint + composer check (PHPStan max) all clean locally.
  • vendor/bin/phpunit --filter "QueryTest|ClickHouseSqlSnapshotTest"
    green (no docker needed).
  • Integration: bring up the docker compose stack (ClickHouse 25.11 +
    MariaDB) and run the full audit suite; cursor / count / shared-tables /
    async-cleanup paths pass — 99 tests, 893 assertions.
  • Verify the CREATE TABLE emitted by the new setup() matches main's
    DDL (engine, ORDER BY, PARTITION BY, SETTINGS, column types including
    LowCardinality(Nullable(String)) for country).

Update: switched to bulkInsert() for createBatch()

Switched createBatch() from insertFormat()+manual-body to
bulkInsert(Format::JSONEachRow, ...) once utopia-php/query#13 landed.

The HTTP helper now takes a pre-serialized $rawBody string instead of a
$jsonRows array; the inline array_map(json_encode, ...) + implode("\n", ...) JSONEachRow body assembly has been deleted — that
serialization lives in Format::serialize() on the builder side with the
JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE
flags baked into the Format::JSONEachRow case.

The snapshot test testInsertFormatJsonEachRowSnapshot was renamed to
testBulkInsertJsonEachRowSnapshot and now pins both the envelope
query AND the JSONEachRow body against a fixture row so an upstream
regression in Format::serialize() would be caught by CI.

Update: refreshed against main (database ^6.0.0) + PSR-18 transport

Synced the branch with main (merge commit) and layered two changes on top:

Main sync. Adopted utopia-php/database ^6.0.0 and re-expressed main's
raw-DDL changes through Schema\ClickHouse:

  • Shared-table sort key now leads with tenant:
    orderBy(['tenant', 'time', 'id']) plus allow_nullable_key = 1 in
    SETTINGS when sharedTables is enabled (single-tenant DDL unchanged).
  • LowCardinality is applied through the schema builder's
    lowCardinality() for all four low-cardinality columns (event,
    actorType, resourceType, country), matching main's DDL exactly —
    including LowCardinality(Nullable(String)) for the nullable country.

Transport. Replaced utopia-php/fetch with the PSR-18
utopia-php/client cURL adapter using withConnectionReuse(), mirroring
the utopia-php/usage adapter: the TCP/TLS handshake is paid once and reused
across queries. Auth/database headers are attached per request, parameterized
queries go as multipart form data, bulkInsert bodies as
application/x-ndjson, and the constructor accepts an optional injected
Psr\Http\Client\ClientInterface. Composer: utopia-php/fetch ^1.1
psr/http-client ^1.0 + utopia-php/client ^0.1|^0.2.

Update: stable utopia-php/query 0.3.* pin — no remaining blockers

utopia-php/query 0.3.3 is tagged and includes everything this branch
needed (quoting + bulkInsert() from query#13, and the
lowCardinality()->nullable() wrapping-order fix from query#14 so it
compiles to LowCardinality(Nullable(T))). The Composer requirement now
reads "utopia-php/query": "0.3.*" and the lock resolves to 0.3.3.
The interim workaround that skipped lowCardinality() on nullable columns
has been removed, so country is LowCardinality(Nullable(String)) again —
byte-identical DDL to main.

Verified: composer lint, composer check (PHPStan max) clean; full suite
via docker compose (ClickHouse 25.11 + MariaDB) green — 99 tests,
893 assertions — and system.columns inspected to confirm the country
column type.

lohanidamodar and others added 10 commits May 17, 2026 07:21
Pins to dev-feat/clickhouse-insert-delete-settings-mv as 0.3.2 — the branch
on utopia-php/query (PR #11) that adds the three ClickHouse builder
extras audit needs:

- Builder\ClickHouse::insertFormat(...) for INSERT ... FORMAT JSONEachRow
- Trailing SETTINGS clause on DELETE (for async cleanup)
- Schema\ClickHouse::create/dropMaterializedView (not used here)

TODO: flip to ^0.3.2 once PR #11 lands on utopia-php/query main and a
0.3.2 tag exists.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The 0.3.x utopia-php/query base class replaced the legacy `TYPE_*` string
constants with a `Method` enum. Audit's adapter switches and tests all
still compare against the string constants, so they're re-declared here
mapped to the same string values (`equal`, `lessThan`, ...).

Tests that compared `$query->getMethod()` (now returns a `Method` enum)
against the constants are updated to compare against `getMethod()->value`.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
utopia-php/query 0.3.x uses PHP 8.4 asymmetric visibility
(`public protected(set)`) on schema and builder properties. PHPStan
1.12's bundled PhpParser can't tokenize that syntax — `composer check`
crashes with a Lexer internal error on any audit source file that
imports a query schema/builder class.

PHPStan 2.x ships an updated PhpParser that handles asymmetric
visibility, so bumping the dev dependency is the smallest change that
restores the static-analysis gate.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…sites

utopia-php/query 0.3.x's `Query::getMethod()` returns a `Method` enum
instead of a string. The ClickHouse adapter's parseQueries switch, and
the Database adapter's count-time filter, both compare against the
legacy string `TYPE_*` constants. Switch from `getMethod()` to
`getMethod()->value` at the two call sites so the existing comparisons
keep matching.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Bumping PHPStan to 2.x to handle PHP 8.4 syntax surfaces a handful of
pre-existing diagnostics in code paths the migration does not otherwise
touch:

- Database adapter: redundant `instanceof Utopia\Audit\Query` guards
  inside a method whose signature already constrains the parameter.
  Kept as runtime defense (real callers occasionally pass mixed
  arrays); annotated with @phpstan-ignore-next-line.
- Log::getData(): PHPStan can't widen the ArrayObject return without a
  local @var hint.
- AuditBase batch test: removed a duplicate `applyRequiredAttributesToBatch`
  call (typo; the second invocation already re-merged the same row).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Replace the hand-built CREATE TABLE in `setup()` with a `Schema\ClickHouse`
table builder. Engine, ORDER BY tuple, PARTITION BY expression, table
settings, columns, and data-skipping (bloom_filter) indexes are now
declared through the schema API; the resulting Statement is executed
verbatim through the existing HTTP layer.

Column definitions follow the audit attribute descriptors:
- `id String` (primary)
- `time DateTime64(3)` (NOT NULL — partition key)
- `<id> [Nullable(]String[)]` for every other attribute, nullability
  driven by the descriptor's `required` flag
- `tenant Nullable(UInt64)` when sharedTables is on

CREATE DATABASE IF NOT EXISTS still goes through a raw string — the
schema's `createDatabase()` helper has no IF NOT EXISTS form and we'd
otherwise break the second `setup()` call.

Also folds in a few PHPStan-driven cleanups in this file (collapsed
`!empty($inParams)` guards into unconditional emits since the upstream
VALUE_REQUIRED_METHODS guard already rejects empty value lists; dropped
the redundant is_array($row) inside parseJsonResults whose row type was
already array<string,mixed>).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…eBatch

Build the JSONEachRow INSERT statement through `Builder\ClickHouse::insertFormat`
instead of a hand-rolled string. Column list is derived from the audit
schema (id, time, the remaining attributes, optional tenant) in the
same insertion order as the row maps so the JSON keys line up against
ClickHouse's declared columns.

The JSONEachRow body itself still serializes in the adapter — that's an
HTTP-payload concern that stays in the runtime layer.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Compile the cleanup DELETE through `Builder\ClickHouse::delete()` with a
trailing SETTINGS clause emitted by the builder when async cleanup is
enabled. The DELETE WHERE expression is supplied via `whereRaw()` so the
ClickHouse-typed parameter syntax (`{datetime:DateTime64(3)}`) and the
existing tenant filter stay in the runtime layer — the builder still
emits generic `?` placeholders today (dry-run gap #7).

Behaviour note: the ClickHouse builder compiles DELETE as
`ALTER TABLE ... DELETE` (mutation) instead of the lightweight
`DELETE FROM ...` the previous string emitted. The async setting tracks
the same shift: `mutations_sync = 0` for mutations replaces the
previous `lightweight_deletes_sync = 0`. End-state row visibility is
the same; the storage path is different (mutations rewrite parts,
lightweight deletes mask rows).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Route the SELECT skeleton (FROM, raw projection, WHERE conjunction,
ORDER BY) for `find()`, `count()`, and `getById()` through
`Builder\ClickHouse`. Filter expressions emitted by `parseQueries()`
still carry ClickHouse-typed parameter hints (`{name:Type}`) and the
audit-side associative params map; both ride along via `whereRaw()` /
`orderByRaw()` so the typed-binding HTTP layer keeps working.

`LIMIT` / `OFFSET` and the trailing `FORMAT JSON` / `FORMAT TabSeparated`
are appended on the compiled SQL string — the base builder emits
positional `?` placeholders for limit/offset, which would collide with
the ClickHouse `{name:UInt64}` placeholders the runtime layer binds.
Cleaning that up belongs with the gap #7 (ClickHouse param hint) work
on utopia-php/query.

Cursor pagination still builds tuple WHERE fragments through the
existing `buildCursorWhere()` helper and feeds them in via `whereRaw()`
(gap #8, deferred).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Pin the SQL emitted by `Schema\ClickHouse` and `Builder\ClickHouse`
through the audit configurations the adapter relies on:

- `setup()` CREATE TABLE — engine, columns, indexes, ORDER BY,
  PARTITION BY, SETTINGS
- `createBatch()` `INSERT ... FORMAT JSONEachRow` with the audit
  column list
- `cleanup()` async DELETE with trailing SETTINGS clause
- `cleanup()` sync DELETE with no SETTINGS
- `find()` SELECT with whereRaw filters, cursor tuple comparison,
  ORDER BY tiebreaker, LIMIT and FORMAT JSON tail

These do not require a live ClickHouse so they run as fast unit tests
and prevent silent SQL drift from a query-lib upgrade.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@greptile-apps

greptile-apps Bot commented May 17, 2026

Copy link
Copy Markdown

Greptile Summary

This PR migrates the ClickHouse audit adapter from the legacy utopia-php/query 0.1.x raw-string API to the 0.3.x Builder\ClickHouse / Schema\ClickHouse fluent builders, and replaces the utopia-php/fetch transport with a PSR-18 utopia-php/client cURL adapter using connection reuse.

  • DDL: setup() now uses Schema\ClickHouse to emit CREATE TABLE, bloom-filter indexes, MergeTree engine, PARTITION BY, and ORDER BY — including a tenant-first sort key and allow_nullable_key in shared-tables mode.
  • DML: createBatch() uses bulkInsert(Format::JSONEachRow, ...) with pre-serialized body; cleanup() uses lightweight DELETE FROM with optional async SETTINGS; find() / count() / getById() drive SELECT shape through the builder.
  • Tests: New ClickHouseSqlSnapshotTest pins every new SQL shape; integration suite green at 99 tests / 893 assertions.

Confidence Score: 5/5

Well-structured migration with passing integration tests; all SQL generation goes through the query builder and parameterised bindings are used throughout.

The adapter logic is thoroughly integration-tested (ClickHouse 25.11, 99 tests), snapshot tests pin every new SQL shape, and the dependency on the dev-branch pin is explicitly called out with a clear migration path to a stable tag.

src/Audit/Adapter/ClickHouse.php — verify country low-cardinality behavior matches intent; tests/Audit/Adapter/ClickHouseSqlSnapshotTest.php — add a shared-tables DDL snapshot before the dev-branch pin is promoted to stable.

Important Files Changed

Filename Overview
src/Audit/Adapter/ClickHouse.php Major rewrite migrating all SQL/DDL generation to Builder and Schema; transport switched to PSR-18. Logic is sound and integration-tested; two style/consistency gaps noted.
src/Audit/Query.php Re-exposes TYPE_* string constants and overrides constructor to accept Method enum or string, preserving backward compatibility.
tests/Audit/Adapter/ClickHouseSqlSnapshotTest.php New snapshot suite pins DDL, INSERT, DELETE, SELECT, cursor, and multi-value NOT IN shapes; missing shared-tables DDL variant snapshot.
composer.json Bumps utopia-php/query to 0.3.x dev-branch pin, replaces utopia-php/fetch with PSR-18 utopia-php/client, bumps phpstan to ^2.0.
src/Audit/Adapter/Database.php Minimal change: adds PHPStan suppression comments and unwraps getMethod() enum to .value for string comparisons.
tests/Audit/QueryTest.php Updated assertions to call .value on getMethod() to match enum return type from 0.3.x base library.

Reviews (9): Last reviewed commit: "chore(deps): pin utopia-php/query to sta..." | Re-trigger Greptile

Comment thread src/Audit/Adapter/ClickHouse.php
Comment thread src/Audit/Adapter/ClickHouse.php
Bump utopia-php/query to the upstream branch HEAD that ships named-typed
{name:Type} placeholder support and the lightweight DELETE form, then add
two helpers to the adapter:

- getColumnTypeMap() derives a column → ClickHouse-type map from the
  schema attributes (DateTime → DateTime64(3), all other columns →
  String) plus id, tenant (when sharedTables is enabled) and the
  limit/offset/max pseudo-columns used by the count/find SQL wrappers.

- newBuilder() returns a Builder\ClickHouse with useNamedBindings() and
  withParamTypes() pre-applied, so positional `?` bindings flow through
  the typed-binding rewriter at Statement-emission time.

Every existing adapter call site is rerouted from `new ClickHouseBuilder()`
to `$this->newBuilder()`. The current call sites all hand-construct their
{name:Type} placeholders inside whereRaw fragments with zero `?` bindings,
so this change is a no-op for the existing SQL shape — it just preps the
infra that the find()/count()/getById() reads will switch to next.
…ter API

Drop every hand-built WHERE / ORDER BY fragment in find(), count() and
getById() and feed Query value objects straight to Builder\ClickHouse via
filter(), sortAsc/sortDesc/sortRandom, limit() and offset(). Positional
`?` bindings are rewritten to `{paramN:Type}` placeholders by the
typed-binding registration installed in newBuilder(), so HTTP params now
flow through $statement->namedBindings instead of a hand-maintained
$paramCounter dict.

parseQueries() is reduced to a list of Query objects plus auxiliary
metadata (orderAttributes, limit, offset, cursor, select). Two
audit-specific rewrites stay in this layer:

  - Contains / NotContains are remapped to Equal / NotEqual so they keep
    audit's historical IN / NOT IN semantics. The base builder compiles
    Contains to substring-match `position(x, ?) > 0`, which is not what
    callers like Audit::getByUserAndEvents() expect.
  - `time`-column DateTime values are stringified at parse time so they
    appear in namedBindings as `Y-m-d H:i:s.v` literals rather than raw
    objects the HTTP layer can't serialise.

Cursor pagination keeps its whereRaw escape hatch with explicit
{name:Type} placeholders — Builder\ClickHouse still has no tuple-compare
helper, so the existing buildCursorWhere() output is appended to the
builder and its params are merged into the final HTTP request alongside
$statement->namedBindings. The dead buildOrderBySql() helper is removed;
applyOrderBy() drives the builder directly.
Builder\ClickHouse now defaults to DELETE_MODE_LIGHTWEIGHT, so cleanup()
emits `DELETE FROM t WHERE …` again — matching audit's pre-migration
baseline. The previous mutation form (`ALTER TABLE t DELETE WHERE …`)
was a workaround forced by the older builder API and changed the
storage-path semantics: lightweight marks rows deleted via a mask and is
the right tool for row-level cleanup, while mutations rewrite parts on
disk and are heavier.

The async SETTINGS knob switches from `mutations_sync = 0` to
`lightweight_deletes_sync = 0` to match the new DELETE form. The public
setAsyncCleanup() docblock already referenced lightweight_deletes_sync,
so no docs change is needed.
…LETE

Pin the new SQL shape on the adapter's hot paths:

  - cleanup() emits `DELETE FROM t WHERE …` with an optional trailing
    `SETTINGS lightweight_deletes_sync=0` for the async path.
  - find() / count() filter via Builder\ClickHouse::filter() and
    sortAsc/sortDesc/limit, producing typed `{paramN:Type}` placeholders
    and a populated `namedBindings` map on the Statement.
  - The cursor whereRaw fragment with explicit `{name:Type}` placeholders
    composes cleanly with the typed positional bindings — both end up in
    the final HTTP params dict by the adapter merging them.
  - count(max) wraps the inner Statement in `SELECT COUNT(*) FROM (… LIMIT ?) sub`
    and reuses the inner builder's namedBindings unchanged.

A small newAuditBuilder() / auditTypeMap() helper mirrors the adapter's
own column → ClickHouse-type registration so the snapshot tests exercise
the same typed-binding flow callers will see in production.
The Dockerfile pinned php:8.3.3-cli-alpine3.19, but composer.json
requires php >=8.4. Once utopia-php/query: ^0.3.0 was adopted, the CI
Tests check failed because the library uses 8.4-only asymmetric
visibility syntax (public protected(set)). Bump the test image to
php:8.4.21-cli-alpine3.23 so the CI environment matches the package
requirement.
Comment thread src/Audit/Adapter/ClickHouse.php
lohanidamodar and others added 2 commits May 18, 2026 01:49
ClickHouse JSON responses come from json_decode and aren't statically
guaranteed to satisfy any inner shape. The pre-migration code skipped
non-array rows defensively; restore that guard and loosen the @var on
\$data to array<int, mixed> so PHPStan max accepts the runtime check
instead of pruning it as already-narrowed.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Adds a snapshot test that locks the SQL emitted when TYPE_NOT_CONTAINS
is mapped to Method::NotEqual with multiple values. The base builder
compiles NotEqual with 2+ non-null values via compileNotIn(), producing
`attr NOT IN (?, ?)`; with named typed bindings on Builder\ClickHouse
this becomes `attr NOT IN ({param0:Type}, {param1:Type})`. Pinning the
shape guards against a query-lib drift silently degrading multi-value
notContains() to a single-value `!=` filter.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Comment on lines +2061 to +2063
if ($this->asyncCleanup) {
$builder->settings(['lightweight_deletes_sync' => '0']);
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 The cleanup() builder uses lightweight_deletes_sync here, but the PR description states the setting was changed to mutations_sync = 0. DELETE FROM is ClickHouse's lightweight-delete syntax, and lightweight_deletes_sync is the correct setting for it — so the code and snapshot test are internally consistent. However, the PR description is factually wrong when it says this was switched to mutations_sync, which could mislead future maintainers into thinking the mutation semantics changed.

Suggested change
if ($this->asyncCleanup) {
$builder->settings(['lightweight_deletes_sync' => '0']);
}
if ($this->asyncCleanup) {
$builder->settings(['mutations_sync' => '0']);
}

lohanidamodar and others added 7 commits May 18, 2026 07:11
Brings in actor-terminology rename (PR #122), location-column drop /
N-part resource parser (PR #118), and country / userAgent test refactors.

Conflict resolution (src/Audit/Adapter/ClickHouse.php parseQueries):
- Kept main's call to translateAttribute() right after reading
  $query->getAttribute() so callers passing legacy 'userId' /
  'userType' / 'userInternalId' Query filters are rewritten to the
  renamed 'actorId' / 'actorType' / 'actorInternalId' columns before
  the typed-bindings layer compiles them.
- The column type map registered via withParamTypes() is derived from
  getAttributes() and already uses the actor* names, so once the
  attribute is translated the map binds it as String correctly.
- Public Audit API (Audit::log, getLogsByUser, countLogsByUser,
  getLogsByUserAndEvents, countLogsByUserAndEvents) is unchanged --
  the ClickHouse adapter's getByUser / countByUser implementations
  already build internal Query::equal('actorId', $userId) filters.

ClickHouseSqlSnapshotTest:
- Updated the synthetic audit type map and DDL snapshot to reflect
  actorId / actorType / actorInternalId columns, idx_actorId_event,
  and the dropped location column. Find / count / cursor snapshots
  now filter on actorId.
utopia-php/query 0.3.2 is now tagged and published with all ClickHouse
builder/schema features this PR depends on. Switch from the temporary
dev-branch alias to the stable semver constraint.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Re-introduces the dev-branch pin (b26baf9) for the duration of
utopia-php/query PR #13's lifecycle so audit can adopt the new typed
Builder\ClickHouse::bulkInsert(Format, rows, columns) bulk-ingest entry
point ahead of the 0.3.3 tag. Relaxes composer's minimum-stability to
dev with prefer-stable=true so the alias resolves.

TODO: flip composer.json back to "utopia-php/query": "^0.3.3" and
minimum-stability: "stable" once 0.3.3 is tagged.
…nual JSONEachRow body assembly

Switches createBatch() to the typed Builder\ClickHouse::bulkInsert(
Format::JSONEachRow, $rows, $columns) entry point so the INSERT envelope
and the serialized row body are produced together. The HTTP helper now
takes a pre-serialized $rawBody string instead of a $jsonRows array,
deleting the inline array_map(json_encode, ...) + implode("\n", ...)
body assembly loop — that serialization now lives in Format::serialize()
on the builder side, with the JSON flags (JSON_THROW_ON_ERROR,
JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE) baked into Format::JSONEachRow.

The SQL envelope shape is unchanged (`INSERT INTO ... (cols) FORMAT
JSONEachRow`); the snapshot test is updated to drive bulkInsert and now
pins the JSONEachRow body serialization with a fixture row, so an
upstream regression in Format::serialize() would be caught by CI.
Adopt utopia-php/database ^6.0.0 from main and express main's shared-table
sort key (tenant, time, id), allow_nullable_key and LowCardinality columns
through the Schema builder. LowCardinality is applied to required columns
only because the query builder emits Nullable(LowCardinality(String)) for
nullable columns, which ClickHouse rejects.
… utopia-php/client

Swap the Fetch client for the PSR-18 utopia-php/client cURL adapter with
connection reuse so the TCP handshake is paid once across queries, matching
the transport used by utopia-php/usage. The constructor accepts an optional
injected ClientInterface for custom transports.
…inality on country

Query 0.3.3 compiles lowCardinality()->nullable() to LowCardinality(Nullable(T)),
so the nullable country column again matches main's DDL.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant