feat: adapt audit schema to query-lib Attribute and Index VOs by abnegate · Pull Request #133 · utopia-php/audit

abnegate · 2026-08-21T04:24:49Z

Adapts the audit schema to the query-lib Attribute and Index value objects.

Why this approach

Database::createCollection() takes a Collection only, so audit setup now passes new Collection(id:, attributes:, indexes:) built from the typed Attribute and Index factories instead of raw arrays and Database::VAR_* strings.

The audit schema itself is unchanged.

utopia-php/database is pinned to dev-feat-query-lib as 7.0.0, re-pinned to that branch's head whenever it moves.

Chain

Landing order, bottom up:

utopia-php/database#823 — the query-lib migration itself
utopia-php/abuse#124, utopia-php/audit#133, utopia-php/migration#222 — the schema call sites in the libraries
appwrite/appwrite#11649
appwrite-labs/cloud#5410

Stacked on #823 but not part of it, and not required by anything above: #947 (ORM), #948 (repositories and seeding), #949 (migration runner and schema differ).

Every dev-feat-query-lib pin in this train is re-pinned to its branch head whenever one of them moves, so each PR's CI runs against what the others actually contain.

Verified

CI green on this head
Greptile 5/5, no unresolved threads
Pint on the Collection wrap

Not verified

The utopia-php/database dependency is still a branch pin. It becomes a released tag only once #823 merges, and this PR should not land before that.

Needed so Appwrite can take main's queue 1.3 pin.

Take main's validators ^0.5 pin and refresh database feat-query-lib so Attribute/Index/ColumnType stay current.

ClickHouse was mutating parent Attribute/Index instances in place. MariaDB tests were also losing event=delete rows because persistent PDO plus a new adapter per PHPUnit setUp rolled back uncommitted writes.

github-actions · 2026-08-21T04:25:01Z

Thanks for contributing! This repository is a read-only mirror; development for this library happens in packages/audit in the utopia-php monorepo. Please open this pull request there instead.

abnegate · 2026-08-21T04:25:11Z

@greptile-apps review

greptile-apps · 2026-08-21T04:27:19Z

Confidence Score: 4/5

The schema migration appears behaviorally sound, but the implementation-coupled ClickHouse tests violate an explicit repository requirement and must be corrected before merging.

Findings

Tests Mirror Schema Internals ▶

Fix with agent prompt

### Issue 1
tests/Audit/Adapter/ClickHouseTest.php:521
The updated test imports `Attribute` and reads its `key` property to mirror the adapter's schema definitions. The same pattern directly inspects attribute metadata around lines 633–652 and reads `Index::$key` around line 811. This violates the repository directive to test observable behavior rather than source representation; use ClickHouse schema or query behavior for these checks and leave structural validation to schema checks and linters. This repository requirement must be satisfied before merging.

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!

---

For each issue above, determine whether it is valid and should be fixed. If so, fix it directly.

Summary

Replaces raw attribute and index arrays with typed factories.
Updates ClickHouse schema generation to consume value-object properties.
Passes a Collection object to database setup.
Migrates substring queries to containsString.
Updates dependency constraints for the query-lib migration.

_{Reviews (16) · Last reviewed commit: "chore: merge main into feat-query-lib"}

Schema definitions with a known column or index type now use Attribute::string() / Index::key() instead of the generic constructors plus ColumnType / IndexType.

Asterisk wildcards on utopia-php packages are replaced with equivalent caret constraints so Composer ranges stay consistent.

Keep composer.json and composer.lock in sync so `composer validate` passes, and pin utopia-php/database to the current query-lib HEAD.

abnegate · 2026-08-21T05:24:48Z

@greptileai review

abnegate · 2026-08-21T06:00:13Z

@greptile-apps review

Force re-review of HEAD 348a4f8. Description updated for factories and caret lock refresh.

Database::createCollection no longer accepts a string id.

Database feat-query-lib now requires query ^0.5 after nested joins.

main's #91 migrated the ClickHouse adapter onto the query library's own builder and schema and moved to query 0.6, which is strictly ahead of the hand-rolled SQL this branch carried. That side is taken wholesale: the builder, the schema, the SQL snapshot test, Query.php and the 0.6 constraint are all main's. What main does not have is the database 7 adaptation, which is the reason this branch exists. Released database 7.2.2 still takes createCollection(string, array, array) and still exposes VAR_STRING, INDEX_KEY and VAR_DATETIME; the dev branch behind PR #823 replaces all of that with Collection, Attribute and Index value objects and drops the constants. main's ClickHouse.php therefore does not load against it -- 48 PHPStan errors, all undefined constants. So getAttributes() and getIndexes() are ported onto main's file as value objects, and the three consumers that still read $attribute['type'] and $attribute['required'] now read the properties. The port is attribute-for-attribute equal: all 35 columns match on type and required, and Attribute::string() defaults size to Database::LENGTH_KEY, which is what the raw arrays passed. The eight indexes map onto Index::key(), which is the same type/lengths/orders triple. Three of main's ClickHouse tests asserted the array shape and now assert the value objects. database is pinned to dev-feat-query-lib as 7.0.0 with the VCS repositories, matching abuse#124 and migration#222. All four pins come off together when database 8 is tagged. Verified against the real backends: PHPStan clean, 22 unit tests, 91 e2e tests with 979 assertions. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

utopia-php/database#823 moved its ORM, repository/seeder and migration-runner layers into stacked PRs, so its branch head moved. Nothing here referenced any of them. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

utopia-php/database moved to ^0.6 and appwrite/appwrite followed on main, so a consumer that pins both cannot resolve while this one still asks for ^0.5: utopia-php/audit dev-feat-query-lib requires utopia-php/validators ^0.5 -> found 0.5.0 but it conflicts with your root composer.json require (^0.6) Also re-pins the database lock to the current chain head. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Keep query-lib database pins and drop the lockfile main no longer tracks.

Picks up the utopia-php/validators ^1.0 bump. database's feat-query-lib now requires ^1.0, so audit's ^0.6 made the pair unresolvable for anything depending on both. validators 1.0.0 is a stability re-tag of 0.7.0, whose only change is Assoc declaring an object instead of an array. Audit does not use that validator. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

greptile-apps · 2026-09-10T15:20:33Z


        $attributes = $adapter->getAttributes();
-        $attributeIds = array_map(fn(array $attr): mixed => $attr['$id'], $attributes);
+        $attributeIds = array_map(fn (Attribute $attr): string => $attr->key, $attributes);


Tests Mirror Schema Internals

The updated test imports Attribute and reads its key property to mirror the adapter's schema definitions. The same pattern directly inspects attribute metadata around lines 633–652 and reads Index::$key around line 811. This violates the repository directive to test observable behavior rather than source representation; use ClickHouse schema or query behavior for these checks and leave structural validation to schema checks and linters. This repository requirement must be satisfied before merging.

Context Used: Call out and harshly judge implementation-coupled ... (source)

Prompt To Fix With AI

This is a comment left during a code review. Path: tests/Audit/Adapter/ClickHouseTest.php Line: 521 Comment: **Tests Mirror Schema Internals** The updated test imports `Attribute` and reads its `key` property to mirror the adapter's schema definitions. The same pattern directly inspects attribute metadata around lines 633–652 and reads `Index::$key` around line 811. This violates the repository directive to test observable behavior rather than source representation; use ClickHouse schema or query behavior for these checks and leave structural validation to schema checks and linters. This repository requirement must be satisfied before merging. **Context Used:** Call out and harshly judge implementation-coupled ... ([source](https://app.greptile.com/review/custom-context?memory=instruction-0)) --- For each issue above, determine whether it is valid and should be fixed. If so, fix it directly.

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!

abnegate added 4 commits August 14, 2026 16:32

feat: adapt audit schema to query-lib Attribute and Index VOs

85406fa

(chore): allow validators 0.5 alongside 0.4

9c7f6db

Needed so Appwrite can take main's queue 1.3 pin.

Merge branch 'main' into feat-query-lib

fcce114

Take main's validators ^0.5 pin and refresh database feat-query-lib so Attribute/Index/ColumnType stay current.

(fix): reconstruct Attribute VOs and disable persistent PDO in tests

9688d08

ClickHouse was mutating parent Attribute/Index instances in place. MariaDB tests were also losing event=delete rows because persistent PDO plus a new adapter per PHPUnit setUp rolled back uncommitted writes.

github-actions Bot closed this Aug 21, 2026

abnegate reopened this Aug 21, 2026

abnegate added 3 commits August 21, 2026 16:48

(refactor): prefer Attribute and Index typed factories

e1700e5

Schema definitions with a known column or index type now use Attribute::string() / Index::key() instead of the generic constructors plus ColumnType / IndexType.

(chore): use caret ranges for Utopia dependencies

8750f1e

Asterisk wildcards on utopia-php packages are replaced with equivalent caret constraints so Composer ranges stay consistent.

(chore): refresh lockfile after caret Utopia constraints

348a4f8

Keep composer.json and composer.lock in sync so `composer validate` passes, and pin utopia-php/database to the current query-lib HEAD.

This was referenced Aug 21, 2026

Use query lib utopia-php/database#823

Open

feat: migrate to utopia-php/database query-lib appwrite/appwrite#11649

Open

abnegate and others added 4 commits August 21, 2026 18:52

(feat): pass Collection to createCollection

d552413

Database::createCollection no longer accepts a string id.

(chore): allow utopia-php/query 0.5

e6e2892

Database feat-query-lib now requires query ^0.5 after nested joins.

chore(deps): re-pin the database lock to the split query-lib head

bb9a09d

utopia-php/database#823 moved its ORM, repository/seeder and migration-runner layers into stacked PRs, so its branch head moved. Nothing here referenced any of them. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

abnegate and others added 5 commits August 28, 2026 15:48

(chore): pin database query-lib ready head

24c72c9

(chore): repin database query-lib ready head

46b91c0

(chore): repin database query library

e35e432

(chore): repin database query library

8b41397

abnegate mentioned this pull request Sep 4, 2026

feat: migrate audit to query-lib schema objects utopia-php/monorepo#206

Open

abnegate and others added 2 commits September 7, 2026 12:17

Merge branch 'main' into feat-query-lib

4fd25fd

Keep query-lib database pins and drop the lockfile main no longer tracks.

greptile-apps Bot reviewed Sep 10, 2026

View reviewed changes

Navigation Menu

Uh oh!

feat: adapt audit schema to query-lib Attribute and Index VOs - #133

feat: adapt audit schema to query-lib Attribute and Index VOs#133
abnegate wants to merge 18 commits into
mainfrom
feat-query-lib

abnegate commented Aug 21, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Aug 21, 2026

Uh oh!

abnegate commented Aug 21, 2026

Uh oh!

greptile-apps Bot commented Aug 21, 2026 •

edited

Loading

Uh oh!

abnegate commented Aug 21, 2026

Uh oh!

abnegate commented Aug 21, 2026

Uh oh!

greptile-apps Bot Sep 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

abnegate commented Aug 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why this approach

Chain

Verified

Not verified

Uh oh!

github-actions Bot commented Aug 21, 2026

Uh oh!

abnegate commented Aug 21, 2026

Uh oh!

greptile-apps Bot commented Aug 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Confidence Score: 4/5

Findings

Summary

Uh oh!

abnegate commented Aug 21, 2026

Uh oh!

abnegate commented Aug 21, 2026

Uh oh!

greptile-apps Bot Sep 10, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

abnegate commented Aug 21, 2026 •

edited

Loading

greptile-apps Bot commented Aug 21, 2026 •

edited

Loading