@rebasepro/server-postgres 0.9.1-canary.c0d4c07 → 0.9.1-canary.d198c11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/PostgresBootstrapper.d.ts +0 -10
- package/dist/auth/services.d.ts +0 -16
- package/dist/connection.d.ts +0 -21
- package/dist/data-transformer.d.ts +2 -9
- package/dist/index.es.js +318 -619
- package/dist/index.es.js.map +1 -1
- package/dist/schema/doctor.d.ts +1 -1
- package/dist/security/policy-drift.d.ts +0 -30
- package/dist/services/FetchService.d.ts +32 -4
- package/dist/services/RelationService.d.ts +1 -34
- package/dist/services/collection-helpers.d.ts +0 -76
- package/dist/services/index.d.ts +1 -1
- package/dist/services/realtimeService.d.ts +0 -7
- package/package.json +7 -11
- package/src/PostgresBackendDriver.ts +11 -39
- package/src/PostgresBootstrapper.ts +25 -62
- package/src/auth/ensure-tables.ts +11 -73
- package/src/auth/services.ts +19 -49
- package/src/cli.ts +0 -60
- package/src/connection.ts +1 -61
- package/src/data-transformer.ts +9 -11
- package/src/databasePoolManager.ts +0 -2
- package/src/schema/doctor.ts +20 -45
- package/src/schema/introspect-db.ts +2 -19
- package/src/security/policy-drift.test.ts +1 -106
- package/src/security/policy-drift.ts +0 -56
- package/src/services/FetchService.ts +229 -50
- package/src/services/PersistService.ts +2 -9
- package/src/services/RelationService.ts +94 -153
- package/src/services/collection-helpers.ts +3 -166
- package/src/services/index.ts +0 -1
- package/src/services/realtimeService.ts +19 -40
- package/src/utils/drizzle-conditions.ts +0 -13
- package/dist/collections/buildRegistry.d.ts +0 -27
- package/dist/services/row-pipeline.d.ts +0 -63
- package/src/collections/buildRegistry.ts +0 -59
- package/src/services/row-pipeline.ts +0 -239
package/dist/schema/doctor.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { CollectionConfig, Property } from "@rebasepro/types";
|
|
|
2
2
|
export type IssueSeverity = "error" | "warning" | "info";
|
|
3
3
|
export interface DoctorIssue {
|
|
4
4
|
severity: IssueSeverity;
|
|
5
|
-
category: "missing_table" | "missing_column" | "type_mismatch" | "missing_constraint" | "schema_stale" | "missing_enum" | "enum_value_mismatch" | "missing_foreign_key" | "sdk_stale"
|
|
5
|
+
category: "missing_table" | "missing_column" | "type_mismatch" | "missing_constraint" | "schema_stale" | "missing_enum" | "enum_value_mismatch" | "missing_foreign_key" | "sdk_stale";
|
|
6
6
|
table?: string;
|
|
7
7
|
column?: string;
|
|
8
8
|
expected?: string;
|
|
@@ -63,36 +63,6 @@ export declare function parseExpectedPolicies(ddl: string): PolicyRef[];
|
|
|
63
63
|
* of reads. The same blindness would hide a policy that fails open.
|
|
64
64
|
*/
|
|
65
65
|
export declare function checkPolicyDrift(client: Queryable, collections: CollectionConfig[]): Promise<PolicyDrift>;
|
|
66
|
-
/**
|
|
67
|
-
* Does this name look like one the generator produced for this table?
|
|
68
|
-
*
|
|
69
|
-
* Unnamed rules compile to `<table>_<op>_<sha1[0:7]>` (plus `_<idx>` when one
|
|
70
|
-
* rule spans several operations), and the hash covers the rule's semantics — so
|
|
71
|
-
* *editing* a rule renames its policy. The policy under the old name is left
|
|
72
|
-
* behind by `db push`, which only DROPs the names it is about to CREATE, and
|
|
73
|
-
* Postgres ORs PERMISSIVE policies together: a superseded `USING (true)` keeps
|
|
74
|
-
* granting everything no matter how tight its replacement is.
|
|
75
|
-
*
|
|
76
|
-
* Matching the shape is what makes dropping them safe. A hand-written policy
|
|
77
|
-
* would have to collide with a 7-hex digest to be mistaken for generated one;
|
|
78
|
-
* a policy named anything else is left alone and merely reported, because a
|
|
79
|
-
* custom name is indistinguishable from one someone wrote in SQL on purpose.
|
|
80
|
-
*/
|
|
81
|
-
export declare function isGeneratedPolicyName(name: string, table: string): boolean;
|
|
82
|
-
export interface OrphanCleanup {
|
|
83
|
-
/** Superseded generated policies that were dropped. */
|
|
84
|
-
dropped: PolicyRef[];
|
|
85
|
-
/** Orphans left in place because their names are not generator-shaped. */
|
|
86
|
-
kept: PolicyRef[];
|
|
87
|
-
}
|
|
88
|
-
/**
|
|
89
|
-
* Drop the policies an earlier push superseded but never removed.
|
|
90
|
-
*
|
|
91
|
-
* Only touches tables the collections describe — a table with no expected
|
|
92
|
-
* policy is not ours to reconcile, and scanning by schema alone would sweep up
|
|
93
|
-
* policies belonging to something else sharing the database.
|
|
94
|
-
*/
|
|
95
|
-
export declare function dropOrphanedPolicies(client: Queryable, drift: PolicyDrift, collections: CollectionConfig[]): Promise<OrphanCleanup>;
|
|
96
66
|
export declare const hasDrift: (d: PolicyDrift) => boolean;
|
|
97
67
|
/** Human-readable report; empty string when the database matches the config. */
|
|
98
68
|
export declare function formatPolicyDrift(drift: PolicyDrift): string;
|
|
@@ -40,22 +40,52 @@ export declare class FetchService {
|
|
|
40
40
|
* the target relation so actual row data is returned.
|
|
41
41
|
*/
|
|
42
42
|
private buildWithConfig;
|
|
43
|
+
/**
|
|
44
|
+
* Detect if a many-to-many relation uses a junction table in the Drizzle schema.
|
|
45
|
+
*/
|
|
46
|
+
private isJunctionRelation;
|
|
43
47
|
/**
|
|
44
48
|
* Get the Drizzle relation name on the junction table that points to the actual target row.
|
|
45
49
|
* For example, for posts_tags junction, this returns "tag_id" (the relation pointing to tags).
|
|
46
50
|
*/
|
|
47
51
|
private getJunctionTargetRelationName;
|
|
52
|
+
/**
|
|
53
|
+
* Convert a db.query result row (with nested relation objects) to a flat row.
|
|
54
|
+
* Handles:
|
|
55
|
+
* - Type normalization (dates, numbers, NaN) via normalizeDbValues
|
|
56
|
+
* - Converting nested relation objects to { id, path, __type: "relation" } for CMS
|
|
57
|
+
* - Flattening junction-table many-to-many results
|
|
58
|
+
*
|
|
59
|
+
* The row's own address is not among them: it is derived by the consumer
|
|
60
|
+
* from the collection's primary keys.
|
|
61
|
+
*/
|
|
62
|
+
private drizzleResultToRow;
|
|
48
63
|
/**
|
|
49
64
|
* Post-fetch joinPath relations for a single flat row.
|
|
50
65
|
* joinPath relations cannot be expressed via Drizzle's `with` config,
|
|
51
66
|
* so they must be loaded separately after the primary query.
|
|
52
67
|
*/
|
|
53
68
|
private resolveJoinPathRelations;
|
|
69
|
+
/**
|
|
70
|
+
* Post-fetch joinPath relations for a batch of flat rows.
|
|
71
|
+
* Uses batch fetching to avoid N+1 queries for list views.
|
|
72
|
+
*/
|
|
73
|
+
private resolveJoinPathRelationsBatch;
|
|
54
74
|
/**
|
|
55
75
|
* Resolves joinPath relations for raw REST rows and directly injects them.
|
|
56
76
|
* Uses RelationService to query the database and maps results back to the flattened objects.
|
|
57
77
|
*/
|
|
58
78
|
private resolveJoinPathRelationsBatchRest;
|
|
79
|
+
/**
|
|
80
|
+
* Convert a db.query result row to a flat REST-style row with populated relations.
|
|
81
|
+
*
|
|
82
|
+
* Every column is copied through under its own name, with the value Postgres
|
|
83
|
+
* returned. This used to open with a synthesized `id` and then skip the key
|
|
84
|
+
* column, which renamed it (a `sku` primary key was served as `id`, and `sku`
|
|
85
|
+
* did not appear at all) and restringified it (`42` → `"42"`). Consumers that
|
|
86
|
+
* need an address derive it from the collection's primary keys.
|
|
87
|
+
*/
|
|
88
|
+
private drizzleResultToRestRow;
|
|
59
89
|
/**
|
|
60
90
|
* Build db.query-compatible options from standard fetch options.
|
|
61
91
|
* Handles filter, search, orderBy, limit, and cursor-based pagination.
|
|
@@ -86,10 +116,8 @@ export declare class FetchService {
|
|
|
86
116
|
}): Promise<Record<string, unknown>[]>;
|
|
87
117
|
/**
|
|
88
118
|
* Fallback path used when db.query is unavailable.
|
|
89
|
-
*
|
|
90
|
-
*
|
|
91
|
-
* relations from what drizzle already nested — no query per row. This one
|
|
92
|
-
* has no nesting to read, so it resolves relations itself, in batches.
|
|
119
|
+
* The primary path uses drizzleResultToRow which handles relation
|
|
120
|
+
* mapping without N+1 queries.
|
|
93
121
|
*
|
|
94
122
|
* Process raw database results into flat rows with relations.
|
|
95
123
|
*/
|
|
@@ -20,40 +20,6 @@ export declare class RelationService {
|
|
|
20
20
|
private db;
|
|
21
21
|
private registry;
|
|
22
22
|
constructor(db: DrizzleClient, registry: PostgresCollectionRegistry);
|
|
23
|
-
/**
|
|
24
|
-
* One target row, as the {@link RelatedRow} everything here returns.
|
|
25
|
-
*
|
|
26
|
-
* Eight sites built this by hand, which is how the address came to be the
|
|
27
|
-
* target's first key column in all eight — one edit, eight places to miss.
|
|
28
|
-
*
|
|
29
|
-
* `resolveNested` is the one thing they did not agree on, and the
|
|
30
|
-
* disagreement was invisible: the single-parent fetches pass `db` and
|
|
31
|
-
* `registry` to `parseDataFromServer`, so the target's *own* relations get
|
|
32
|
-
* resolved too, while the batch paths deliberately do not — a query per
|
|
33
|
-
* target row is the N+1 the batching exists to avoid. Naming the parameter
|
|
34
|
-
* makes that a decision rather than a difference between two call sites
|
|
35
|
-
* nobody was comparing.
|
|
36
|
-
*/
|
|
37
|
-
private toRelatedRow;
|
|
38
|
-
/**
|
|
39
|
-
* A WHERE matching any of `parentIds`, by the whole key.
|
|
40
|
-
*
|
|
41
|
-
* A single key is an `IN (…)`. A composite one cannot be: matching
|
|
42
|
-
* `tenant_id IN (1, 1)` collects every row of tenant 1, so two parents that
|
|
43
|
-
* share their first column each receive the other's relations. It becomes
|
|
44
|
-
* an OR of ANDs — one exact address per parent — which Postgres indexes the
|
|
45
|
-
* same way it would a multi-column key lookup.
|
|
46
|
-
*/
|
|
47
|
-
private parentKeyCondition;
|
|
48
|
-
/**
|
|
49
|
-
* Reject a relation that cannot express a composite-keyed parent.
|
|
50
|
-
*
|
|
51
|
-
* `localKey` and `foreignKeyOnTarget` are single column names: one column
|
|
52
|
-
* cannot reference a two-column key, so such a relation has no correct
|
|
53
|
-
* reading. Left alone it would silently match on the first key column and
|
|
54
|
-
* hand a tenant's rows to its neighbour — say so instead.
|
|
55
|
-
*/
|
|
56
|
-
private assertSingleKeyAddressable;
|
|
57
23
|
/**
|
|
58
24
|
* Fetch rows related to a parent row through a specific relation
|
|
59
25
|
*/
|
|
@@ -106,6 +72,7 @@ export declare class RelationService {
|
|
|
106
72
|
relationKey: string;
|
|
107
73
|
relation: Relation;
|
|
108
74
|
newValue: unknown;
|
|
75
|
+
currentId?: string | number;
|
|
109
76
|
}>): Promise<void>;
|
|
110
77
|
/**
|
|
111
78
|
* Handle inverse relations with joinPath
|
|
@@ -24,80 +24,4 @@ export interface DrizzleColumnMeta {
|
|
|
24
24
|
export declare function getColumnMeta(col: AnyPgColumn): DrizzleColumnMeta;
|
|
25
25
|
export declare function getCollectionByPath(collectionPath: string, registry: PostgresCollectionRegistry): CollectionConfig;
|
|
26
26
|
export declare function getTableForCollection(collection: CollectionConfig, registry: PostgresCollectionRegistry): PgTable<any>;
|
|
27
|
-
/**
|
|
28
|
-
* The key columns a collection's rows are addressed by.
|
|
29
|
-
*
|
|
30
|
-
* Three tiers, in order: properties marked `isId`, the primary keys of the
|
|
31
|
-
* drizzle schema, and finally a column literally named `id`. Only the first is
|
|
32
|
-
* visible to the browser, which is why a key known only to drizzle is reported
|
|
33
|
-
* at boot — see {@link warnOnKeysTheAdminCannotResolve}.
|
|
34
|
-
*
|
|
35
|
-
* Returns `[]` when nothing resolves, rather than throwing. It used to open by
|
|
36
|
-
* resolving the table, which throws when there is none — so the `isId` tier,
|
|
37
|
-
* which needs no table at all, was unreachable for exactly the collections
|
|
38
|
-
* most likely to have no table registered. Every caller that wanted "no keys"
|
|
39
|
-
* to mean "no keys" had to spell that out in a try/catch.
|
|
40
|
-
*
|
|
41
|
-
* Callers that cannot proceed without a key must say so themselves, naming the
|
|
42
|
-
* collection: an empty array here means "this collection has no address", which
|
|
43
|
-
* is a different answer in a notification (broadcast a wildcard) than in a save
|
|
44
|
-
* (fail).
|
|
45
|
-
*/
|
|
46
27
|
export declare function getPrimaryKeys(collection: CollectionConfig, registry: PostgresCollectionRegistry): PrimaryKeyInfo[];
|
|
47
|
-
/**
|
|
48
|
-
* The key columns, for callers that cannot do their job without one.
|
|
49
|
-
*
|
|
50
|
-
* {@link getPrimaryKeys} answers "what keys, if any" and returns `[]` for a
|
|
51
|
-
* collection with no address. Most of this driver, though, is building a WHERE
|
|
52
|
-
* clause and has no meaning without a key — for those, an empty array is not an
|
|
53
|
-
* answer, and indexing `[0]` into it produces `Cannot read properties of
|
|
54
|
-
* undefined` three frames from where the real problem is. This says what is
|
|
55
|
-
* wrong and which collection it is wrong about.
|
|
56
|
-
*/
|
|
57
|
-
export declare function requirePrimaryKeys(collection: CollectionConfig, registry: PostgresCollectionRegistry): PrimaryKeyInfo[];
|
|
58
|
-
/**
|
|
59
|
-
* Collections whose key the *browser* cannot resolve, and what it will do
|
|
60
|
-
* instead.
|
|
61
|
-
*
|
|
62
|
-
* The two sides resolve keys from different evidence. This driver reads, in
|
|
63
|
-
* order: properties marked `isId`, the primary keys of the Drizzle schema, then
|
|
64
|
-
* a column literally named `id`. The admin shares the `CollectionConfig` — it
|
|
65
|
-
* compiles the same collection files into its bundle — but never the Drizzle
|
|
66
|
-
* schema, so the middle tier is invisible to it.
|
|
67
|
-
*
|
|
68
|
-
* Nothing can normalize this at runtime: the server does not serve the admin
|
|
69
|
-
* its collections, so a key resolved here cannot be handed over there. The
|
|
70
|
-
* config files are the only thing both sides read, so the fix is an edit to
|
|
71
|
-
* them, and the most this can do is say exactly which edit.
|
|
72
|
-
*
|
|
73
|
-
* Two shapes, and the second is the dangerous one:
|
|
74
|
-
*
|
|
75
|
-
* - No `isId`, no `id` property → the admin resolves no address, warns in the
|
|
76
|
-
* console, and rows cannot be opened or linked.
|
|
77
|
-
* - No `isId`, but an `id` property that is *not* the key → the admin addresses
|
|
78
|
-
* rows by `id` while this driver reads the address as the real key. Nothing
|
|
79
|
-
* errors: the addresses look right and route wrong.
|
|
80
|
-
*/
|
|
81
|
-
export declare function findUnresolvableKeyCollections(collections: CollectionConfig[], registry: PostgresCollectionRegistry): {
|
|
82
|
-
collection: CollectionConfig;
|
|
83
|
-
keys: PrimaryKeyInfo[];
|
|
84
|
-
shadowedByIdProperty: boolean;
|
|
85
|
-
}[];
|
|
86
|
-
/**
|
|
87
|
-
* Report the collections from {@link findUnresolvableKeyCollections} at boot,
|
|
88
|
-
* with the edit that fixes each one.
|
|
89
|
-
*
|
|
90
|
-
* Grouped by failure, not by collection: the shadowed case is a routing bug and
|
|
91
|
-
* the silent case is a missing feature, and they deserve different urgency.
|
|
92
|
-
*/
|
|
93
|
-
export declare function warnOnKeysTheAdminCannotResolve(collections: CollectionConfig[], registry: PostgresCollectionRegistry): void;
|
|
94
|
-
/**
|
|
95
|
-
* The address of a row: derived from the collection's primary keys, because a
|
|
96
|
-
* row does not carry one — it is exactly its columns.
|
|
97
|
-
*
|
|
98
|
-
* Falls back to a literal `id` column, for a row that reached us from somewhere
|
|
99
|
-
* other than this driver. Returns `""` when there is no key and no `id` —
|
|
100
|
-
* callers decide what that means, since "unaddressable" is a different answer
|
|
101
|
-
* in a notification (broadcast a wildcard) than in a save (fail).
|
|
102
|
-
*/
|
|
103
|
-
export declare function deriveRowAddress(row: Record<string, unknown>, collection: CollectionConfig, registry: PostgresCollectionRegistry): string;
|
package/dist/services/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { FetchService } from "./FetchService";
|
|
2
2
|
export { PersistService } from "./PersistService";
|
|
3
3
|
export { RelationService } from "./RelationService";
|
|
4
|
-
export { getCollectionByPath, getTableForCollection, getPrimaryKeys,
|
|
4
|
+
export { getCollectionByPath, getTableForCollection, getPrimaryKeys, parseIdValues, buildCompositeId } from "./collection-helpers";
|
|
@@ -177,15 +177,8 @@ export declare class RealtimeService extends EventEmitter implements RealtimePro
|
|
|
177
177
|
/**
|
|
178
178
|
* Send a lightweight row-level patch to a collection subscriber.
|
|
179
179
|
* The client can merge this into its cached data for instant feedback.
|
|
180
|
-
*
|
|
181
|
-
* The key columns ride along: the patch names a row by address, and the
|
|
182
|
-
* client has to find that row among the ones it cached — which carry
|
|
183
|
-
* columns and no address. The SDK holds no collection config to derive one
|
|
184
|
-
* from, so this is the only place the mapping can come from.
|
|
185
180
|
*/
|
|
186
181
|
private sendCollectionPatch;
|
|
187
|
-
/** The key columns of the collection at `path`, if they can be resolved. */
|
|
188
|
-
private primaryKeysForPath;
|
|
189
182
|
private sendError;
|
|
190
183
|
private sendMessage;
|
|
191
184
|
/**
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rebasepro/server-postgres",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.9.1-canary.
|
|
4
|
+
"version": "0.9.1-canary.d198c11",
|
|
5
5
|
"description": "PostgreSQL data source backend implementation for Rebase with Drizzle ORM",
|
|
6
6
|
"funding": {
|
|
7
7
|
"url": "https://github.com/sponsors/rebaseco"
|
|
@@ -71,21 +71,18 @@
|
|
|
71
71
|
"execa": "^9.6.1",
|
|
72
72
|
"pg": "^8.21.0",
|
|
73
73
|
"ws": "^8.21.0",
|
|
74
|
-
"@rebasepro/common": "0.9.1-canary.
|
|
75
|
-
"@rebasepro/codegen": "0.9.1-canary.
|
|
76
|
-
"@rebasepro/utils": "0.9.1-canary.
|
|
77
|
-
"@rebasepro/
|
|
78
|
-
"@rebasepro/
|
|
74
|
+
"@rebasepro/common": "0.9.1-canary.d198c11",
|
|
75
|
+
"@rebasepro/codegen": "0.9.1-canary.d198c11",
|
|
76
|
+
"@rebasepro/utils": "0.9.1-canary.d198c11",
|
|
77
|
+
"@rebasepro/types": "0.9.1-canary.d198c11",
|
|
78
|
+
"@rebasepro/server": "0.9.1-canary.d198c11"
|
|
79
79
|
},
|
|
80
80
|
"devDependencies": {
|
|
81
|
-
"@hono/node-server": "^2.0.9",
|
|
82
|
-
"@jest/globals": "^30.4.1",
|
|
83
81
|
"@types/jest": "^30.0.0",
|
|
84
82
|
"@types/node": "^25.9.3",
|
|
85
83
|
"@types/pg": "^8.20.0",
|
|
86
84
|
"@types/ws": "^8.18.1",
|
|
87
85
|
"@vitejs/plugin-react": "^6.0.2",
|
|
88
|
-
"hono": "^4.12.25",
|
|
89
86
|
"jest": "^30.4.2",
|
|
90
87
|
"ts-jest": "^29.4.11",
|
|
91
88
|
"typescript": "^6.0.3",
|
|
@@ -106,7 +103,6 @@
|
|
|
106
103
|
"test:lint": "eslint \"src/**\" --quiet",
|
|
107
104
|
"test": "jest --passWithNoTests",
|
|
108
105
|
"test:e2e": "vitest run --config vitest.e2e.config.ts",
|
|
109
|
-
"clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f"
|
|
110
|
-
"smoke:baas": "tsx scripts/smoke-baas.ts"
|
|
106
|
+
"clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f"
|
|
111
107
|
}
|
|
112
108
|
}
|
|
@@ -29,7 +29,6 @@ import {
|
|
|
29
29
|
import { sql as drizzleSql } from "drizzle-orm";
|
|
30
30
|
import { buildPropertyCallbacks, buildSdkData, resolveCollectionRelations, updateDateAutoValues } from "@rebasepro/common";
|
|
31
31
|
import { PostgresCollectionRegistry } from "./collections/PostgresCollectionRegistry";
|
|
32
|
-
import { deriveRowAddress } from "./services/collection-helpers";
|
|
33
32
|
import { HistoryService } from "./history/HistoryService";
|
|
34
33
|
import { mergeDeep } from "@rebasepro/utils";
|
|
35
34
|
import { logger } from "@rebasepro/server";
|
|
@@ -548,26 +547,13 @@ export class PostgresBackendDriver implements DataDriver {
|
|
|
548
547
|
let updatedValues = values;
|
|
549
548
|
const contextForCallback = this.buildCallContext();
|
|
550
549
|
|
|
551
|
-
// Fetch previous values for callbacks AND history recording
|
|
552
|
-
// as the saved row the callbacks receive (`fetchOneForRest`), so
|
|
553
|
-
// `values` and `previousValues` compare like with like — a Date on one
|
|
554
|
-
// side and its ISO string on the other reads as a change that never
|
|
555
|
-
// happened.
|
|
550
|
+
// Fetch previous values for callbacks AND history recording
|
|
556
551
|
let previousValuesForHistory: Partial<M> | undefined;
|
|
557
552
|
if (status === "existing" && id) {
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
const { id: _existingId, ...existingValues } = existing;
|
|
563
|
-
previousValuesForHistory = existingValues as Partial<M>;
|
|
564
|
-
}
|
|
565
|
-
} catch (err) {
|
|
566
|
-
// Best-effort enrichment: callbacks and history run without
|
|
567
|
-
// previous values rather than the save failing on a read the
|
|
568
|
-
// write itself does not need (e.g. a collection whose key the
|
|
569
|
-
// registry cannot resolve).
|
|
570
|
-
logger.debug(`[save] Could not fetch previous values for "${path}"`, { detail: err instanceof Error ? err.message : String(err) });
|
|
553
|
+
const existing = await this.dataService.fetchOne<M>(path, id, resolvedCollection?.databaseId);
|
|
554
|
+
if (existing) {
|
|
555
|
+
const { id: _existingId, ...existingValues } = existing;
|
|
556
|
+
previousValuesForHistory = existingValues as Partial<M>;
|
|
571
557
|
}
|
|
572
558
|
}
|
|
573
559
|
|
|
@@ -666,19 +652,8 @@ export class PostgresBackendDriver implements DataDriver {
|
|
|
666
652
|
}
|
|
667
653
|
}
|
|
668
654
|
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
// literally named `id`, and is ordinary data for a table that has such
|
|
672
|
-
// a column without it being the key.
|
|
673
|
-
const savedId = deriveRowAddress(
|
|
674
|
-
savedRow,
|
|
675
|
-
(resolvedCollection ?? collection) as CollectionConfig,
|
|
676
|
-
this.registry
|
|
677
|
-
);
|
|
678
|
-
// `values` are the row's columns — all of them. For an `id`-keyed table
|
|
679
|
-
// that includes `id`, which used to be stripped here because it was the
|
|
680
|
-
// synthesized address rather than the column it now is.
|
|
681
|
-
const savedValues = savedRow;
|
|
655
|
+
const savedId = savedRow.id as string | number;
|
|
656
|
+
const { id: _savedId, ...savedValues } = savedRow;
|
|
682
657
|
|
|
683
658
|
if (globalCallbacks?.afterSave || callbacks?.afterSave || propertyCallbacks?.afterSave) {
|
|
684
659
|
// 1. Global callbacks first
|
|
@@ -723,7 +698,7 @@ export class PostgresBackendDriver implements DataDriver {
|
|
|
723
698
|
if (this.historyService && resolvedCollection?.history) {
|
|
724
699
|
this.historyService.recordHistory({
|
|
725
700
|
tableName: path,
|
|
726
|
-
id: savedId,
|
|
701
|
+
id: savedId.toString(),
|
|
727
702
|
action: status === "new" ? "create" : "update",
|
|
728
703
|
values: savedValues as Record<string, unknown>,
|
|
729
704
|
previousValues: previousValuesForHistory as Record<string, unknown> | undefined,
|
|
@@ -735,14 +710,14 @@ export class PostgresBackendDriver implements DataDriver {
|
|
|
735
710
|
if (this._deferNotifications) {
|
|
736
711
|
this._pendingNotifications.push({
|
|
737
712
|
path,
|
|
738
|
-
id: savedId,
|
|
713
|
+
id: savedId.toString(),
|
|
739
714
|
row: savedRow,
|
|
740
715
|
databaseId: resolvedCollection?.databaseId
|
|
741
716
|
});
|
|
742
717
|
} else {
|
|
743
718
|
await this.realtimeService.notifyUpdate(
|
|
744
719
|
path,
|
|
745
|
-
savedId,
|
|
720
|
+
savedId.toString(),
|
|
746
721
|
savedRow,
|
|
747
722
|
resolvedCollection?.databaseId
|
|
748
723
|
);
|
|
@@ -868,10 +843,7 @@ export class PostgresBackendDriver implements DataDriver {
|
|
|
868
843
|
}: DeleteProps<M>): Promise<void> {
|
|
869
844
|
|
|
870
845
|
const targetPath = row.path;
|
|
871
|
-
|
|
872
|
-
// travels beside it as `id`, so merging it in here only ever invented an
|
|
873
|
-
// `id` field for tables that have no such column.
|
|
874
|
-
const targetRow: Record<string, unknown> = { ...(row.values ?? {}) };
|
|
846
|
+
const targetRow: Record<string, unknown> = { id: row.id, ...(row.values ?? {}) };
|
|
875
847
|
|
|
876
848
|
// Resolve from backend registry to restore callbacks lost during WebSocket serialization
|
|
877
849
|
const {
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Implements the `BackendBootstrapper` interface for PostgreSQL.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { Relations, sql } from "drizzle-orm";
|
|
7
|
+
import { getTableName, isTable, Relations, sql } from "drizzle-orm";
|
|
8
8
|
import { NodePgDatabase } from "drizzle-orm/node-postgres";
|
|
9
9
|
import { PgEnum, PgTable } from "drizzle-orm/pg-core";
|
|
10
10
|
import type { RebasePgTable } from "./types";
|
|
@@ -21,7 +21,6 @@ import {
|
|
|
21
21
|
} from "@rebasepro/types";
|
|
22
22
|
import { PostgresBackendDriver } from "./PostgresBackendDriver";
|
|
23
23
|
import { RealtimeService } from "./services/realtimeService";
|
|
24
|
-
import { buildCollectionRegistry } from "./collections/buildRegistry";
|
|
25
24
|
import { DatabasePoolManager } from "./databasePoolManager";
|
|
26
25
|
import { PostgresCollectionRegistry } from "./collections/PostgresCollectionRegistry";
|
|
27
26
|
import { createEmailService, type EmailConfig, type EmailService, logger } from "@rebasepro/server";
|
|
@@ -65,15 +64,6 @@ export interface PostgresDriverInternals {
|
|
|
65
64
|
realtimeService: RealtimeService;
|
|
66
65
|
driver: PostgresBackendDriver;
|
|
67
66
|
poolManager?: DatabasePoolManager;
|
|
68
|
-
/**
|
|
69
|
-
* Attach CDC triggers to tables that did not exist when the driver
|
|
70
|
-
* bootstrapped. Only set when database-level capture is actually active.
|
|
71
|
-
*
|
|
72
|
-
* Auth owns its own tables and creates them later in boot, so at driver
|
|
73
|
-
* bootstrap they are legitimately missing and get skipped; without this
|
|
74
|
-
* they would stay uninstrumented until the next restart.
|
|
75
|
-
*/
|
|
76
|
-
provisionCdcForTables?: (tables: CdcTableRef[]) => Promise<void>;
|
|
77
67
|
}
|
|
78
68
|
|
|
79
69
|
// Re-export from shared CLI error utilities
|
|
@@ -171,17 +161,30 @@ export function createPostgresBootstrapper(pgConfig: PostgresDriverConfig): Back
|
|
|
171
161
|
}
|
|
172
162
|
|
|
173
163
|
const activeCollections = introspectedCollections ?? collections;
|
|
164
|
+
|
|
165
|
+
// Create a fresh registry for this driver
|
|
166
|
+
const registry = new PostgresCollectionRegistry();
|
|
167
|
+
if (activeCollections) {
|
|
168
|
+
registry.registerMultiple(activeCollections);
|
|
169
|
+
logger.info(`📋 [PostgresRegistry] Registered ${registry.getCollections().length} collections: [${registry.getCollections().map(c => c.slug).join(", ")}]`);
|
|
170
|
+
}
|
|
171
|
+
|
|
174
172
|
const schemaTables = introspectedTables ?? pgConfig.schema?.tables;
|
|
175
|
-
const schemaRelations = introspectedRelations ?? (pgConfig.schema?.relations as Record<string, Relations> | undefined);
|
|
176
173
|
|
|
177
|
-
//
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
174
|
+
// Register tables
|
|
175
|
+
if (schemaTables) {
|
|
176
|
+
Object.values(schemaTables).forEach((table) => {
|
|
177
|
+
if (isTable(table)) {
|
|
178
|
+
const tableName = getTableName(table);
|
|
179
|
+
registry.registerTable(table as PgTable, tableName);
|
|
180
|
+
}
|
|
181
|
+
});
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
if (pgConfig.schema?.enums) registry.registerEnums(pgConfig.schema.enums as Record<string, PgEnum<[string, ...string[]]>>);
|
|
185
|
+
|
|
186
|
+
const schemaRelations = introspectedRelations ?? (pgConfig.schema?.relations as Record<string, Relations> | undefined);
|
|
187
|
+
if (schemaRelations) registry.registerRelations(schemaRelations);
|
|
185
188
|
|
|
186
189
|
// Patch Drizzle's PgArray columns to handle NULL values safely.
|
|
187
190
|
// Drizzle's mapFromDriverValue crashes with "value.map is not a function"
|
|
@@ -343,7 +346,6 @@ export function createPostgresBootstrapper(pgConfig: PostgresDriverConfig): Back
|
|
|
343
346
|
const wantsCdc = cdcMode !== "off";
|
|
344
347
|
const explicitCdc = cdcMode === "trigger" || cdcMode === "wal";
|
|
345
348
|
let cdcEnabled = false;
|
|
346
|
-
let provisionCdcForTables: PostgresDriverInternals["provisionCdcForTables"];
|
|
347
349
|
|
|
348
350
|
if (wantsCdc && !directUrl) {
|
|
349
351
|
const reason = "no direct database connection is available for the realtime LISTEN client (set DATABASE_DIRECT_URL)";
|
|
@@ -377,11 +379,6 @@ export function createPostgresBootstrapper(pgConfig: PostgresDriverConfig): Back
|
|
|
377
379
|
await provisionTriggerCdc(cdcRunSql, cdcTables);
|
|
378
380
|
await realtimeService.enableCdc(directUrl);
|
|
379
381
|
cdcEnabled = true;
|
|
380
|
-
// Boot steps that create their own tables (auth) run after
|
|
381
|
-
// this one and use it to instrument what they just created.
|
|
382
|
-
provisionCdcForTables = async (tables) => {
|
|
383
|
-
await provisionTriggerCdc(cdcRunSql, tables);
|
|
384
|
-
};
|
|
385
382
|
logger.info(
|
|
386
383
|
`📡 [CDC] Realtime source = database-level change capture (mode: ${cdcMode === "wal" ? "wal→trigger" : "trigger"}). ` +
|
|
387
384
|
`All writes now emit realtime events regardless of origin.`
|
|
@@ -432,14 +429,6 @@ export function createPostgresBootstrapper(pgConfig: PostgresDriverConfig): Back
|
|
|
432
429
|
);
|
|
433
430
|
const missing: Array<{ slug: string; table: string }> = [];
|
|
434
431
|
for (const col of registeredCollections) {
|
|
435
|
-
// Auth owns its table and creates it later in this same
|
|
436
|
-
// boot (initializeAuth → ensureAuthTablesExist), so it is
|
|
437
|
-
// legitimately absent right now. Reporting it as drift
|
|
438
|
-
// tells the user to `db:push` a table that is about to
|
|
439
|
-
// exist — and on an introspected database, one that the
|
|
440
|
-
// database was never supposed to hold.
|
|
441
|
-
if ((col as { auth?: { enabled?: boolean } }).auth?.enabled) continue;
|
|
442
|
-
|
|
443
432
|
const schemaName = "schema" in col && col.schema ? col.schema : "public";
|
|
444
433
|
const tableName = registry.hasTableForCollection(
|
|
445
434
|
col.table ?? col.slug
|
|
@@ -454,10 +443,8 @@ export function createPostgresBootstrapper(pgConfig: PostgresDriverConfig): Back
|
|
|
454
443
|
const checkName = resolvedTable ?? tableName;
|
|
455
444
|
const fullCheckName = schemaName === "public" ? checkName : `${schemaName}.${checkName}`;
|
|
456
445
|
if (!dbTables.has(fullCheckName)) {
|
|
457
|
-
// Report what was actually looked up: an unqualified
|
|
458
|
-
// "users" sends people hunting for public.users.
|
|
459
446
|
missing.push({ slug: col.slug,
|
|
460
|
-
table:
|
|
447
|
+
table: checkName });
|
|
461
448
|
}
|
|
462
449
|
}
|
|
463
450
|
if (missing.length > 0) {
|
|
@@ -491,8 +478,7 @@ table: fullCheckName });
|
|
|
491
478
|
registry,
|
|
492
479
|
realtimeService,
|
|
493
480
|
driver,
|
|
494
|
-
poolManager
|
|
495
|
-
provisionCdcForTables
|
|
481
|
+
poolManager
|
|
496
482
|
};
|
|
497
483
|
|
|
498
484
|
return {
|
|
@@ -521,29 +507,6 @@ table: fullCheckName });
|
|
|
521
507
|
// ensureAuthTablesExist works with the collection abstraction — no Drizzle leakage.
|
|
522
508
|
await ensureAuthTablesExist(db, authCollection);
|
|
523
509
|
|
|
524
|
-
// The driver bootstrapped before these tables existed, so CDC skipped
|
|
525
|
-
// them. Instrument them now, or writes to the user table emit no
|
|
526
|
-
// realtime events until the next restart.
|
|
527
|
-
if (authCollection && internals.provisionCdcForTables) {
|
|
528
|
-
const authSchema = "schema" in authCollection && typeof authCollection.schema === "string"
|
|
529
|
-
? authCollection.schema
|
|
530
|
-
: "rebase";
|
|
531
|
-
const authTable = "table" in authCollection && typeof authCollection.table === "string"
|
|
532
|
-
? authCollection.table
|
|
533
|
-
: authCollection.slug;
|
|
534
|
-
if (authTable) {
|
|
535
|
-
try {
|
|
536
|
-
await internals.provisionCdcForTables([{ schema: authSchema, table: authTable }]);
|
|
537
|
-
} catch (err) {
|
|
538
|
-
logger.warn(
|
|
539
|
-
`⚠️ [CDC] Could not attach change-capture to the auth table "${authSchema}.${authTable}" — ` +
|
|
540
|
-
"writes to it won't emit database-level events.",
|
|
541
|
-
{ detail: err instanceof Error ? err.message : String(err) }
|
|
542
|
-
);
|
|
543
|
-
}
|
|
544
|
-
}
|
|
545
|
-
}
|
|
546
|
-
|
|
547
510
|
let emailService: EmailService | undefined;
|
|
548
511
|
if (authConfig.email) {
|
|
549
512
|
emailService = createEmailService(authConfig.email as EmailConfig);
|