refactor: shared internal postgres package that wraps slonik by Copilot · Pull Request #7887 · graphql-hive/console

Copilot · 2026-03-19T15:19:33Z

Background

Description

Note: this started as a copilot thing, but I (@n1ru4l), quickly took over and did a lot of manual work.

This PR updates all usages of slonik to go through our internal package @hive/postgres.

Because slonik frequently introduces breaking changes, this creates a single abstraction layer around it. This allows us to centralize how the library is used and makes it easier to adopt future major versions in a backward-compatible way.

This PR exploded a bit, since I initially only started with introducing zod model parsing to existing database calls that still used unsafe as typecasts via the generic parameter.

While working on that I realized that we could benefit from having a single slonik entrypoint shared in the whole repository.

Summary:

Import anything postgres related from @hive/postgres
Dedupe database utilities shattered and duplicated around the code base (e.g. createDatabaseQueryString, traced transactions)
Rename sql to psql, to avoid confusion and conflicts with our in-house clickhouse sql tag
Add new class PostgresDatabasePool, that has the query methods with unknown hard-coded so you are forced to use zod to decode the result
Update the whole code-base to use psql instead of sql
Update the whole code-base to use PostgresDatabasePool
Update the whole code-base to decode database results instead of casting them

Whether we keep or remove slonik as a dependency (still uncovering things bit by bit that we need to address in case we update in #7897), I see benefit of having a single entrypoint nevertheless.

… I/O decoding Co-authored-by: n1ru4l <14338007+n1ru4l@users.noreply.github.com>

…llable().parse - Replace `r => r ? Model.parse(r) : null` with `Model.nullable().parse` (point-free) - Replace `v => Model.nullable().parse(v)` with `Model.nullable().parse` - Replace `.query<unknown>(...).then(r => ({ ...r, rows: r.rows.map(...) }))` with `.any<unknown>(...).then(z.array(Model).parse)` - Update all downstream `.rows` array accesses after the above changes - Replace `.then(rows => rows.map(row => Model.parse(row)))` with `.then(z.array(Model).parse)` Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

… query to any Co-authored-by: n1ru4l <14338007+n1ru4l@users.noreply.github.com>

… parsing Co-authored-by: n1ru4l <14338007+n1ru4l@users.noreply.github.com>

github-actions · 2026-03-20T10:00:28Z

🚀 Snapshot Release (`alpha`)

The latest changes of this PR are available as alpha on npm (based on the declared changesets):

Package	Version	Info
`hive`	`11.0.1-alpha-20260325104308-b1359556eceaf03441901c8ab490555134fd3e38`	npm ↗︎ unpkg ↗︎

n1ru4l · 2026-03-20T10:00:37Z

@copilot There is more functions like transformOrganization, transformProject, transformOrganizationInvitation, transformMember and transformSchemaPolicy that should be replaced by updating the SQL queries to use aliases and adjusting the corresponding zod models.

…-connection-usage

packages/services/api/src/modules/proposals/resolvers/SchemaProposal.ts

n1ru4l · 2026-03-25T15:26:36Z

packages/services/api/src/modules/auth/providers/email-verification.ts

    private taskScheduler: TaskScheduler,
    private rateLimiter: InMemoryRateLimiter,
    @Inject(WEB_APP_URL) private appBaseUrl: string,
-    @Inject(PG_POOL_CONFIG) private pool: DatabasePool,


I like the small side-effect that we now have a class and this @Inject(PG_POOL_CONFIG) thingy is no longer needed.

jdolle · 2026-03-26T03:44:58Z

integration-tests/tests/migrations/retention.spec.ts

    delete process.env.CLICKHOUSE_TTL_HOURLY_MV_TABLES;
    delete process.env.CLICKHOUSE_TTL_MINUTELY_MV_TABLES;

-    vi.resetModules();


This is already being imported on line 25. The reset looks to be necessary to reset the environment variables on import

It does not seem to be necessary. Everyyhing works without it. 😓 Keeping it raised an exception.

That's odd. What was the error? I don't see any big changes with the code.

packages/internal/postgres/src/postgres-database-pool.ts

jdolle · 2026-03-26T04:00:44Z

packages/services/storage/src/index.ts

+      RETURNING ${schemaPolicyFields(psql``)};
+    `,
+        )
+        .then(SchemaPolicyModel.parse);


Do we use the returned fields from the update calls?
I'd expect we already have that information and by returning everything we're wasting bandwidth. Prefer returning void where it makes sense.

jdolle · 2026-03-26T04:02:12Z

packages/services/storage/src/index.ts

+            RETURNING
+              "organization_id" AS "organizationId",
+              "external_billing_reference_id" AS "externalBillingReference",
+              "billing_email_address" AS "billingEmailAddress"


Should this also be abstracted to a const to be used in other calls?

jdolle · 2026-03-26T04:03:16Z

packages/services/storage/src/index.ts

-      return results.rows;
+      return pool
+        .any(
+          psql`/* getGetOrganizationsAndTargetsWithLimitInfo */


minor: prefer moving to snake case to be consistent

packages/services/storage/src/index.ts

packages/services/api/src/modules/proposals/resolvers/SchemaProposal.ts

…-connection-usage

Initial plan

30fa4cd

Copilot AI assigned Copilot and n1ru4l Mar 19, 2026

Copilot started work on behalf of n1ru4l March 19, 2026 15:19 View session

Copilot AI requested a review from n1ru4l March 19, 2026 15:41

Replace Slonik generic parameters with unknown and add Zod models for…

7f49500

… I/O decoding Co-authored-by: n1ru4l <14338007+n1ru4l@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Update Slonik database connections to use unknown and zod decoding~~ Replace Slonik query generic parameters with unknown + Zod parsing in storage Mar 19, 2026

Copilot finished work on behalf of n1ru4l March 19, 2026 15:46

Copilot started work on behalf of n1ru4l March 19, 2026 16:45 View session

Copilot AI changed the title ~~Replace Slonik query generic parameters with unknown + Zod parsing in storage~~ refactor(storage): Replace Slonik<T> generics with unknown + Zod I/O decoding Mar 19, 2026

Copilot finished work on behalf of n1ru4l March 19, 2026 16:58

This comment was marked as resolved.

Sign in to view

Copilot started work on behalf of n1ru4l March 20, 2026 09:18 View session

Copilot AI and others added 2 commits March 20, 2026 09:26

refactor(storage): use Zod primitives (nullable, z.array) and migrate…

c8b5788

… query to any Co-authored-by: n1ru4l <14338007+n1ru4l@users.noreply.github.com>

This comment was marked as resolved.

Sign in to view

Copilot AI changed the title ~~refactor(storage): Replace Slonik<T> generics with unknown + Zod I/O decoding~~ refactor(storage): Replace Slonik generics with unknown + Zod I/O decoding Mar 20, 2026

Copilot finished work on behalf of n1ru4l March 20, 2026 09:33

Copilot started work on behalf of n1ru4l March 20, 2026 09:36 View session

Copilot stopped work on behalf of n1ru4l due to an error March 20, 2026 09:37
The session was cancelled by the user.

Copilot started work on behalf of n1ru4l March 20, 2026 09:40 View session

refactor: replace transform helper functions with SQL aliases and Zod…

fecd38e

… parsing Co-authored-by: n1ru4l <14338007+n1ru4l@users.noreply.github.com>

Copilot AI changed the title ~~refactor(storage): Replace Slonik generics with unknown + Zod I/O decoding~~ refactor(storage): eliminate transform helpers via SQL aliases and Zod schema reshaping Mar 20, 2026

Copilot finished work on behalf of n1ru4l March 20, 2026 09:54

fix type errors

b5d7cf6

Copilot started work on behalf of n1ru4l March 20, 2026 10:00 View session

n1ru4l added 2 commits March 23, 2026 09:32

ts

a36d527

ay

7bff3e4

n1ru4l force-pushed the copilot/update-slonik-connection-usage branch from 6e75a5a to 7bff3e4 Compare March 23, 2026 09:41

fix types

21ec7e2

n1ru4l force-pushed the copilot/update-slonik-connection-usage branch from 3320f21 to 21ec7e2 Compare March 23, 2026 10:23

fix: deps

ab14763

n1ru4l force-pushed the copilot/update-slonik-connection-usage branch from 6c4aa68 to ab14763 Compare March 23, 2026 10:30

n1ru4l added 5 commits March 23, 2026 11:35

fix tsconfig migrations

f79f629

tmpfix

627b3d5

oops

c4e6bbe

lets not open 5 million connections?

10e7cf2

fix tests

212ac08

n1ru4l force-pushed the copilot/update-slonik-connection-usage branch from 95e4f72 to 212ac08 Compare March 23, 2026 12:34

n1ru4l added 2 commits March 23, 2026 13:57

fix tests

9b86760

fix tests

e795870

n1ru4l mentioned this pull request Mar 23, 2026

feat: slonik major upgrade #7897

Draft

14 tasks

Merge remote-tracking branch 'origin/main' into copilot/update-slonik…

3e590de

…-connection-usage

n1ru4l force-pushed the copilot/update-slonik-connection-usage branch 2 times, most recently from 8e5a011 to a24dba9 Compare March 25, 2026 09:22

adjust merged code

4a99486

n1ru4l force-pushed the copilot/update-slonik-connection-usage branch from a24dba9 to 4a99486 Compare March 25, 2026 10:24

fix flow

b135955

n1ru4l requested review from dotansimha and jdolle March 25, 2026 13:48

n1ru4l marked this pull request as ready for review March 25, 2026 15:01

n1ru4l reviewed Mar 25, 2026

View reviewed changes

packages/services/api/src/modules/proposals/resolvers/SchemaProposal.ts Show resolved Hide resolved

n1ru4l reviewed Mar 25, 2026

View reviewed changes

jdolle reviewed Mar 26, 2026

View reviewed changes

n1ru4l added 2 commits March 26, 2026 10:51

address feedback

92cf939

Merge remote-tracking branch 'origin/main' into copilot/update-slonik…

165b959

…-connection-usage

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: shared internal postgres package that wraps slonik#7887

refactor: shared internal postgres package that wraps slonik#7887
Copilot wants to merge 45 commits intomainfrom
copilot/update-slonik-connection-usage

Copilot AI commented Mar 19, 2026 •

edited by n1ru4l

Loading

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

github-actions bot commented Mar 20, 2026 •

edited

Loading

Uh oh!

n1ru4l commented Mar 20, 2026

Uh oh!

Uh oh!

n1ru4l Mar 25, 2026

Uh oh!

jdolle Mar 26, 2026

Uh oh!

n1ru4l Mar 26, 2026

Uh oh!

jdolle Mar 26, 2026

Uh oh!

Uh oh!

jdolle Mar 26, 2026

Uh oh!

jdolle Mar 26, 2026

Uh oh!

jdolle Mar 26, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

Conversation

Copilot AI commented Mar 19, 2026 • edited by n1ru4l Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Background

Description

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

github-actions bot commented Mar 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🚀 Snapshot Release (alpha)

Uh oh!

n1ru4l commented Mar 20, 2026

Uh oh!

Uh oh!

n1ru4l Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

jdolle Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

n1ru4l Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

jdolle Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jdolle Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

jdolle Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

jdolle Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

Copilot AI commented Mar 19, 2026 •

edited by n1ru4l

Loading

github-actions bot commented Mar 20, 2026 •

edited

Loading

🚀 Snapshot Release (`alpha`)