joist-orm 2.3.0-next.7 → 2.3.0-next.71
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/build/_virtual/_rolldown/runtime.cjs +23 -0
- package/build/_virtual/_rolldown/runtime.js +5 -0
- package/build/codegen.cjs +19 -0
- package/build/codegen.cjs.map +1 -0
- package/build/codegen.d.cts +1 -0
- package/build/codegen.d.mts +1 -0
- package/build/codegen.js +12 -28
- package/build/codegen.js.map +1 -1
- package/build/drivers/PostgresDriver.cjs +299 -0
- package/build/drivers/PostgresDriver.cjs.map +1 -0
- package/build/drivers/PostgresDriver.d.cts +81 -0
- package/build/drivers/PostgresDriver.d.cts.map +1 -0
- package/build/drivers/PostgresDriver.d.mts +81 -0
- package/build/drivers/PostgresDriver.d.mts.map +1 -0
- package/build/drivers/PostgresDriver.js +262 -274
- package/build/drivers/PostgresDriver.js.map +1 -1
- package/build/drivers/WireRowData.cjs +374 -0
- package/build/drivers/WireRowData.cjs.map +1 -0
- package/build/drivers/WireRowData.d.cts +111 -0
- package/build/drivers/WireRowData.d.cts.map +1 -0
- package/build/drivers/WireRowData.d.mts +111 -0
- package/build/drivers/WireRowData.d.mts.map +1 -0
- package/build/drivers/WireRowData.js +370 -0
- package/build/drivers/WireRowData.js.map +1 -0
- package/build/drivers/binaryParsers.cjs +422 -0
- package/build/drivers/binaryParsers.cjs.map +1 -0
- package/build/drivers/binaryParsers.d.cts +80 -0
- package/build/drivers/binaryParsers.d.cts.map +1 -0
- package/build/drivers/binaryParsers.d.mts +80 -0
- package/build/drivers/binaryParsers.d.mts.map +1 -0
- package/build/drivers/binaryParsers.js +412 -0
- package/build/drivers/binaryParsers.js.map +1 -0
- package/build/drivers/patchPgProtocol.cjs +255 -0
- package/build/drivers/patchPgProtocol.cjs.map +1 -0
- package/build/drivers/patchPgProtocol.d.cts +47 -0
- package/build/drivers/patchPgProtocol.d.cts.map +1 -0
- package/build/drivers/patchPgProtocol.d.mts +47 -0
- package/build/drivers/patchPgProtocol.d.mts.map +1 -0
- package/build/drivers/patchPgProtocol.js +253 -0
- package/build/drivers/patchPgProtocol.js.map +1 -0
- package/build/graphql-codegen-export.cjs +10 -0
- package/build/graphql-codegen-export.d.cts +1 -0
- package/build/graphql-codegen-export.d.mts +1 -0
- package/build/graphql-codegen-export.js +2 -19
- package/build/graphql-export.cjs +10 -0
- package/build/graphql-export.d.cts +1 -0
- package/build/graphql-export.d.mts +1 -0
- package/build/graphql-export.js +2 -19
- package/build/index.cjs +41 -0
- package/build/index.d.cts +3 -0
- package/build/index.d.mts +3 -0
- package/build/index.js +3 -27
- package/build/knex-export.cjs +10 -0
- package/build/knex-export.d.cts +1 -0
- package/build/knex-export.d.mts +1 -0
- package/build/knex-export.js +2 -19
- package/build/pg-export.cjs +13 -0
- package/build/pg-export.d.cts +4 -0
- package/build/pg-export.d.mts +4 -0
- package/build/pg-export.js +4 -9
- package/build/pg-migrate.cjs +22 -0
- package/build/pg-migrate.cjs.map +1 -0
- package/build/pg-migrate.d.cts +1 -0
- package/build/pg-migrate.d.mts +1 -0
- package/build/pg-migrate.js +14 -28
- package/build/pg-migrate.js.map +1 -1
- package/build/seed.cjs +49 -0
- package/build/seed.cjs.map +1 -0
- package/build/{seed.d.ts → seed.d.cts} +5 -2
- package/build/seed.d.cts.map +1 -0
- package/build/seed.d.mts +24 -0
- package/build/seed.d.mts.map +1 -0
- package/build/seed.js +39 -45
- package/build/seed.js.map +1 -1
- package/build/tests-export.cjs +10 -0
- package/build/tests-export.d.cts +1 -0
- package/build/tests-export.d.mts +1 -0
- package/build/tests-export.js +2 -19
- package/package.json +154 -38
- package/build/codegen.d.ts +0 -2
- package/build/codegen.d.ts.map +0 -1
- package/build/drivers/PostgresDriver.d.ts +0 -49
- package/build/drivers/PostgresDriver.d.ts.map +0 -1
- package/build/graphql-codegen-export.d.ts +0 -2
- package/build/graphql-codegen-export.d.ts.map +0 -1
- package/build/graphql-codegen-export.js.map +0 -1
- package/build/graphql-export.d.ts +0 -2
- package/build/graphql-export.d.ts.map +0 -1
- package/build/graphql-export.js.map +0 -1
- package/build/index.d.ts +0 -4
- package/build/index.d.ts.map +0 -1
- package/build/index.js.map +0 -1
- package/build/knex-export.d.ts +0 -2
- package/build/knex-export.d.ts.map +0 -1
- package/build/knex-export.js.map +0 -1
- package/build/pg-export.d.ts +0 -3
- package/build/pg-export.d.ts.map +0 -1
- package/build/pg-export.js.map +0 -1
- package/build/pg-migrate.d.ts +0 -2
- package/build/pg-migrate.d.ts.map +0 -1
- package/build/seed.d.ts.map +0 -1
- package/build/tests-export.d.ts +0 -2
- package/build/tests-export.d.ts.map +0 -1
- package/build/tests-export.js.map +0 -1
|
@@ -1,306 +1,294 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const pg_1 = __importDefault(require("pg"));
|
|
10
|
-
const pg_types_1 = require("pg-types");
|
|
11
|
-
const postgres_array_1 = __importDefault(require("postgres-array"));
|
|
1
|
+
import { registerDatabaseBinaryParsers, registerTemporalBinaryParsers } from "./binaryParsers.js";
|
|
2
|
+
import { ensureLazyDataRows } from "./patchPgProtocol.js";
|
|
3
|
+
import { executeRowDataQuery, isRowDataCapableClient } from "./WireRowData.js";
|
|
4
|
+
import { JoinRowOperation, PojoRowData, SequenceIdAssigner, buildRawQuery, cleanSql, driverAfterBegin, driverAfterCommit, driverBeforeBegin, driverBeforeCommit, ensureRectangularArraySizes, fail, generateOps, getRuntimeConfig, kq, kqDot, partition } from "joist-core";
|
|
5
|
+
import pg from "pg";
|
|
6
|
+
import { builtins, getTypeParser } from "pg-types";
|
|
7
|
+
import array from "postgres-array";
|
|
8
|
+
//#region src/drivers/PostgresDriver.ts
|
|
12
9
|
/**
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
10
|
+
* Implements the `Driver` interface for Postgres.
|
|
11
|
+
*
|
|
12
|
+
* This is the canonical driver implementation and leverages several aspects of
|
|
13
|
+
* Postgres for the best performance, i.e.:
|
|
14
|
+
*
|
|
15
|
+
* - Deferred foreign key constraints are used to allow bulk inserting/updating
|
|
16
|
+
* all entities without any topographic sorting/ordering issues.
|
|
17
|
+
*
|
|
18
|
+
* - Sequences are used to bulk-assign + then bulk-insert all entities, to again
|
|
19
|
+
* avoid issues with ordering issues (cannot bulk insert A w/o knowing the id of B).
|
|
20
|
+
*
|
|
21
|
+
* - We use a pg-specific bulk update syntax.
|
|
22
|
+
*
|
|
23
|
+
* Query pipelining is enabled for clients created after driver construction unless the pool was
|
|
24
|
+
* configured with `pipeline: false`.
|
|
25
|
+
*/
|
|
26
|
+
var PostgresDriver = class {
|
|
27
|
+
pool;
|
|
28
|
+
#idAssigner;
|
|
29
|
+
#preloadPlugin;
|
|
30
|
+
#onQuery;
|
|
31
|
+
lazyRows;
|
|
32
|
+
/** Defined only when `lazyRows` is enabled; its presence is the capability signal the EM checks. */
|
|
33
|
+
executeFindRowData;
|
|
34
|
+
#databaseBinaryParsers = void 0;
|
|
35
|
+
constructor(pool, opts) {
|
|
36
|
+
this.pool = pool;
|
|
37
|
+
pool.options.pipeline ??= true;
|
|
38
|
+
this.#idAssigner = opts?.idAssigner ?? new SequenceIdAssigner(async (sql) => {
|
|
39
|
+
this.#onQuery?.(sql);
|
|
40
|
+
return (await pool.query(sql)).rows;
|
|
41
|
+
});
|
|
42
|
+
this.#preloadPlugin = opts?.preloadPlugin;
|
|
43
|
+
this.#onQuery = opts?.onQuery;
|
|
44
|
+
this.lazyRows = (opts?.lazyRows ?? false) && ensureLazyDataRows();
|
|
45
|
+
if (opts?.lazyRows && !this.lazyRows) console.warn("joist-orm: lazyRows was requested, but patching pg-protocol failed; using classic rows.");
|
|
46
|
+
this.executeFindRowData = this.lazyRows ? (em, parsed, settings) => this.#executeFindRowData(em, parsed, settings) : void 0;
|
|
47
|
+
setupLatestPgTypes(getRuntimeConfig().temporal);
|
|
48
|
+
}
|
|
49
|
+
async executeFind(em, parsed, settings) {
|
|
50
|
+
const { sql, bindings } = buildRawQuery(parsed, {
|
|
51
|
+
limit: em.entityLimit,
|
|
52
|
+
...settings
|
|
53
|
+
});
|
|
54
|
+
return (await this.executeQuery(em, sql, bindings)).rows;
|
|
55
|
+
}
|
|
56
|
+
async #executeFindRowData(em, parsed, settings) {
|
|
57
|
+
await (this.#databaseBinaryParsers ??= registerDatabaseBinaryParsers(this.pool).catch((err) => {
|
|
58
|
+
this.#databaseBinaryParsers = void 0;
|
|
59
|
+
throw err;
|
|
60
|
+
}));
|
|
61
|
+
const { sql, bindings } = buildRawQuery(parsed, {
|
|
62
|
+
limit: em.entityLimit,
|
|
63
|
+
...settings
|
|
64
|
+
});
|
|
65
|
+
const pgSql = toPgParams(sql);
|
|
66
|
+
this.#onQuery?.(pgSql);
|
|
67
|
+
const txnClient = em.txn;
|
|
68
|
+
const client = txnClient ?? await this.pool.connect();
|
|
69
|
+
try {
|
|
70
|
+
if (!isRowDataCapableClient(client)) {
|
|
71
|
+
warnUnsupportedClientOnce();
|
|
72
|
+
return new PojoRowData((await client.query(pgSql, bindings)).rows);
|
|
73
|
+
}
|
|
74
|
+
return await executeRowDataQuery(client, pgSql, bindings);
|
|
75
|
+
} finally {
|
|
76
|
+
if (!txnClient) client.release();
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
/** Returns PostgreSQL's native command count and raw rows, including null counts for DDL. */
|
|
80
|
+
async executeQuery(em, sql, bindings) {
|
|
81
|
+
const pgSql = toPgParams(sql);
|
|
82
|
+
this.#onQuery?.(pgSql);
|
|
83
|
+
const { rowCount, rows } = await this.getMaybeInTxnClient(em).query(pgSql, bindings);
|
|
84
|
+
return {
|
|
85
|
+
rowCount,
|
|
86
|
+
rows
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
async transaction(em, fn) {
|
|
90
|
+
if (em.txn) return fn(em.txn);
|
|
91
|
+
const client = await this.pool.connect();
|
|
92
|
+
let result;
|
|
93
|
+
try {
|
|
94
|
+
await driverBeforeBegin(em, client);
|
|
95
|
+
this.#onQuery?.("BEGIN;");
|
|
96
|
+
await client.query("BEGIN");
|
|
97
|
+
em.txn = client;
|
|
98
|
+
try {
|
|
99
|
+
await driverAfterBegin(em, client);
|
|
100
|
+
result = await fn(client);
|
|
101
|
+
await driverBeforeCommit(em, client);
|
|
102
|
+
this.#onQuery?.("COMMIT;");
|
|
103
|
+
await client.query("COMMIT");
|
|
104
|
+
} catch (e) {
|
|
105
|
+
await client.query("ROLLBACK");
|
|
106
|
+
throw e;
|
|
107
|
+
} finally {
|
|
108
|
+
em.txn = void 0;
|
|
109
|
+
}
|
|
110
|
+
await driverAfterCommit(em, client);
|
|
111
|
+
} finally {
|
|
112
|
+
client.release();
|
|
113
|
+
}
|
|
114
|
+
return result;
|
|
115
|
+
}
|
|
116
|
+
async assignNewIds(_, todos) {
|
|
117
|
+
return this.#idAssigner.assignNewIds(todos);
|
|
118
|
+
}
|
|
119
|
+
async flush(em, entityTodos, joinRows) {
|
|
120
|
+
const client = em.txn ?? fail("Expected EntityManager.txn to be set");
|
|
121
|
+
await this.#idAssigner.assignNewIds(entityTodos);
|
|
122
|
+
const ops = generateOps(entityTodos);
|
|
123
|
+
const onQuery = this.#onQuery;
|
|
124
|
+
await Promise.all([
|
|
125
|
+
...ops.inserts.map((op) => batchInsert(client, op, onQuery)),
|
|
126
|
+
...ops.updates.map((op) => batchUpdate(client, op, onQuery)),
|
|
127
|
+
...ops.deletes.map((op) => batchDelete(client, op, onQuery)),
|
|
128
|
+
...Object.entries(joinRows).flatMap(([joinTableName, todo]) => {
|
|
129
|
+
return [m2mBatchInsert(client, joinTableName, todo, onQuery), m2mBatchDelete(client, joinTableName, todo, onQuery)];
|
|
130
|
+
})
|
|
131
|
+
]);
|
|
132
|
+
}
|
|
133
|
+
get defaultPlugins() {
|
|
134
|
+
return { preloadPlugin: this.#preloadPlugin };
|
|
135
|
+
}
|
|
136
|
+
getMaybeInTxnClient(em) {
|
|
137
|
+
return em.txn || this.pool;
|
|
138
|
+
}
|
|
139
|
+
};
|
|
115
140
|
async function batchInsert(client, op, onQuery) {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
141
|
+
const { tableName, columns, columnValues } = op;
|
|
142
|
+
const [cte, bindings] = buildUnnestCte("data", columns, columnValues);
|
|
143
|
+
const pgSql = toPgParams(cleanSql(`
|
|
119
144
|
${cte}
|
|
120
|
-
INSERT INTO ${
|
|
145
|
+
INSERT INTO ${kq(tableName)} (${columns.map((c) => kq(c.columnName)).join(", ")})
|
|
121
146
|
SELECT * FROM data
|
|
122
|
-
`);
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
return client.query(pgSql, bindings);
|
|
147
|
+
`));
|
|
148
|
+
onQuery?.(pgSql);
|
|
149
|
+
return client.query(pgSql, bindings);
|
|
126
150
|
}
|
|
127
151
|
async function batchUpdate(client, op, onQuery) {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
//
|
|
134
|
-
// ...but Temporal's types don't have this flaw.
|
|
135
|
-
const truncateToMills = !(0, joist_core_1.getRuntimeConfig)().temporal;
|
|
136
|
-
const maybeUpdatedAt = updatedAt && truncateToMills
|
|
137
|
-
? ` AND date_trunc('milliseconds', ${(0, joist_core_1.kqDot)(tableName, updatedAt)}) = data.__original_updated_at`
|
|
138
|
-
: updatedAt
|
|
139
|
-
? ` AND ${(0, joist_core_1.kqDot)(tableName, updatedAt)} = data.__original_updated_at`
|
|
140
|
-
: "";
|
|
141
|
-
const sql = `
|
|
152
|
+
const { tableName, columns, columnValues, updatedAt } = op;
|
|
153
|
+
const [cte, bindings] = buildUnnestCte("data", columns, columnValues);
|
|
154
|
+
const truncateToMills = !getRuntimeConfig().temporal;
|
|
155
|
+
const maybeUpdatedAt = updatedAt && truncateToMills ? ` AND date_trunc('milliseconds', ${kqDot(tableName, updatedAt)}) = data.__original_updated_at` : updatedAt ? ` AND ${kqDot(tableName, updatedAt)} = data.__original_updated_at` : "";
|
|
156
|
+
const sql = `
|
|
142
157
|
${cte}
|
|
143
|
-
UPDATE ${
|
|
144
|
-
SET ${columns
|
|
145
|
-
.filter((c) => c.columnName !== "id" && c.columnName !== "__original_updated_at")
|
|
146
|
-
.map((c) => `${(0, joist_core_1.kq)(c.columnName)} = data.${(0, joist_core_1.kq)(c.columnName)}`)
|
|
147
|
-
.join(", ")}
|
|
158
|
+
UPDATE ${kq(tableName)}
|
|
159
|
+
SET ${columns.filter((c) => c.columnName !== "id" && c.columnName !== "__original_updated_at").map((c) => `${kq(c.columnName)} = data.${kq(c.columnName)}`).join(", ")}
|
|
148
160
|
FROM data
|
|
149
|
-
WHERE ${
|
|
150
|
-
RETURNING ${
|
|
161
|
+
WHERE ${kq(tableName)}.id = data.id ${maybeUpdatedAt}
|
|
162
|
+
RETURNING ${kq(tableName)}.id
|
|
151
163
|
`;
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
}
|
|
164
|
+
const pgSql = toPgParams(cleanSql(sql));
|
|
165
|
+
onQuery?.(pgSql);
|
|
166
|
+
const results = (await client.query(pgSql, bindings)).rows;
|
|
167
|
+
const ids = columnValues[0];
|
|
168
|
+
if (results.length !== ids.length) {
|
|
169
|
+
const updated = new Set(results.map((r) => r.id));
|
|
170
|
+
const missing = ids.filter((id) => !updated.has(id));
|
|
171
|
+
throw new Error(`Oplock failure for ${tableName} rows ${missing.join(", ")}`);
|
|
172
|
+
}
|
|
162
173
|
}
|
|
163
174
|
async function batchDelete(client, op, onQuery) {
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
175
|
+
const { tableName, ids } = op;
|
|
176
|
+
const pgSql = toPgParams(`DELETE FROM ${kq(tableName)} WHERE id = ANY(?)`);
|
|
177
|
+
onQuery?.(pgSql);
|
|
178
|
+
await client.query(pgSql, [ids]);
|
|
168
179
|
}
|
|
169
180
|
/** Creates a CTE named `tableName` that bulk-injects the `columnValues` into a SQL query. */
|
|
170
181
|
function buildUnnestCte(tableName, columns, columnValues) {
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
return `unnest_arrays(?::${c.dbType}[]) as ${(0, joist_core_1.kq)(c.columnName)}`;
|
|
179
|
-
}
|
|
180
|
-
}
|
|
181
|
-
else {
|
|
182
|
-
return `unnest(?::${c.dbType}[]) as ${(0, joist_core_1.kq)(c.columnName)}`;
|
|
183
|
-
}
|
|
184
|
-
});
|
|
185
|
-
const sql = `WITH ${tableName} AS (SELECT ${selects.join(", ")})`;
|
|
186
|
-
return [sql, columnValues];
|
|
182
|
+
ensureRectangularArraySizes(columns, columnValues);
|
|
183
|
+
return [`WITH ${tableName} AS (SELECT ${columns.map((c) => {
|
|
184
|
+
if (c.dbType.endsWith("[]")) {
|
|
185
|
+
if (c.isNullableArray) return `unnest_arrays(?::${c.dbType}[], true) as ${kq(c.columnName)}`;
|
|
186
|
+
else return `unnest_arrays(?::${c.dbType}[]) as ${kq(c.columnName)}`;
|
|
187
|
+
} else return `unnest(?::${c.dbType}[]) as ${kq(c.columnName)}`;
|
|
188
|
+
}).join(", ")})`, columnValues];
|
|
187
189
|
}
|
|
188
190
|
async function m2mBatchInsert(client, joinTableName, todo, onQuery) {
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
INSERT INTO ${(0, joist_core_1.kq)(joinTableName)} (${(0, joist_core_1.kq)(m2m.columnName)}, ${(0, joist_core_1.kq)(m2m.otherColumnName)})
|
|
191
|
+
const { m2m, newRows } = todo;
|
|
192
|
+
if (newRows.length === 0) return;
|
|
193
|
+
const col1Values = newRows.map((row) => todo.dbValue(row, m2m.columnName));
|
|
194
|
+
const col2Values = newRows.map((row) => todo.dbValue(row, m2m.otherColumnName));
|
|
195
|
+
if (m2m.hasJoinTableId) {
|
|
196
|
+
const pgSql = toPgParams(cleanSql(`
|
|
197
|
+
WITH data AS (SELECT unnest(?::int[]) as ${kq(m2m.columnName)}, unnest(?::int[]) as ${kq(m2m.otherColumnName)})
|
|
198
|
+
INSERT INTO ${kq(joinTableName)} (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)})
|
|
198
199
|
SELECT * FROM data
|
|
199
|
-
ON CONFLICT (${
|
|
200
|
+
ON CONFLICT (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) DO UPDATE SET id = ${kq(joinTableName)}.id
|
|
200
201
|
RETURNING id;
|
|
201
|
-
`);
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
// insert and let any duplicate be a no-op.
|
|
214
|
-
const sql = (0, joist_core_1.cleanSql)(`
|
|
215
|
-
WITH data AS (SELECT unnest(?::int[]) as ${(0, joist_core_1.kq)(m2m.columnName)}, unnest(?::int[]) as ${(0, joist_core_1.kq)(m2m.otherColumnName)})
|
|
216
|
-
INSERT INTO ${(0, joist_core_1.kq)(joinTableName)} (${(0, joist_core_1.kq)(m2m.columnName)}, ${(0, joist_core_1.kq)(m2m.otherColumnName)})
|
|
202
|
+
`));
|
|
203
|
+
onQuery?.(pgSql);
|
|
204
|
+
const { rows } = await client.query(pgSql, [col1Values, col2Values]);
|
|
205
|
+
for (let i = 0; i < rows.length; i++) {
|
|
206
|
+
newRows[i].id = rows[i].id;
|
|
207
|
+
newRows[i].op = JoinRowOperation.Flushed;
|
|
208
|
+
newRows[i].persisted = true;
|
|
209
|
+
}
|
|
210
|
+
} else {
|
|
211
|
+
const pgSql = toPgParams(cleanSql(`
|
|
212
|
+
WITH data AS (SELECT unnest(?::int[]) as ${kq(m2m.columnName)}, unnest(?::int[]) as ${kq(m2m.otherColumnName)})
|
|
213
|
+
INSERT INTO ${kq(joinTableName)} (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)})
|
|
217
214
|
SELECT * FROM data
|
|
218
|
-
ON CONFLICT (${
|
|
219
|
-
`);
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
}
|
|
215
|
+
ON CONFLICT (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) DO NOTHING;
|
|
216
|
+
`));
|
|
217
|
+
onQuery?.(pgSql);
|
|
218
|
+
await client.query(pgSql, [col1Values, col2Values]);
|
|
219
|
+
for (const row of newRows) {
|
|
220
|
+
row.op = JoinRowOperation.Flushed;
|
|
221
|
+
row.persisted = true;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
228
224
|
}
|
|
229
225
|
async function m2mBatchDelete(client, joinTableName, todo, onQuery) {
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
const pgSql = toPgParams(`DELETE FROM ${(0, joist_core_1.kq)(joinTableName)} WHERE id = ANY(?)`);
|
|
247
|
-
onQuery?.(pgSql);
|
|
248
|
-
await client.query(pgSql, [haveIds.map((r) => r.id)]);
|
|
249
|
-
}
|
|
250
|
-
if (noIds.length > 0) {
|
|
251
|
-
const data = noIds
|
|
252
|
-
// Watch for m2m rows that got added-then-removed to entities that were themselves added-then-removed,
|
|
253
|
-
// as the deTagId will be undefined for those, as we're skipping adding them to the database.
|
|
254
|
-
.filter((row) => !todo.isNew(row, m2m.columnName) && !todo.isNew(row, m2m.otherColumnName))
|
|
255
|
-
.map((row) => [todo.dbValue(row, m2m.columnName), todo.dbValue(row, m2m.otherColumnName)]);
|
|
256
|
-
if (data.length > 0) {
|
|
257
|
-
const pgSql = toPgParams(`
|
|
258
|
-
DELETE FROM ${(0, joist_core_1.kq)(joinTableName)}
|
|
259
|
-
WHERE (${(0, joist_core_1.kq)(m2m.columnName)}, ${(0, joist_core_1.kq)(m2m.otherColumnName)}) IN (
|
|
226
|
+
const { m2m, deletedRows } = todo;
|
|
227
|
+
if (deletedRows.length === 0) return;
|
|
228
|
+
const [haveIds, noIds] = partition(deletedRows, (r) => {
|
|
229
|
+
return r.id !== void 0 && r.id !== -1;
|
|
230
|
+
});
|
|
231
|
+
if (haveIds.length > 0) {
|
|
232
|
+
const pgSql = toPgParams(`DELETE FROM ${kq(joinTableName)} WHERE id = ANY(?)`);
|
|
233
|
+
onQuery?.(pgSql);
|
|
234
|
+
await client.query(pgSql, [haveIds.map((r) => r.id)]);
|
|
235
|
+
}
|
|
236
|
+
if (noIds.length > 0) {
|
|
237
|
+
const data = noIds.filter((row) => !todo.isNew(row, m2m.columnName) && !todo.isNew(row, m2m.otherColumnName)).map((row) => [todo.dbValue(row, m2m.columnName), todo.dbValue(row, m2m.otherColumnName)]);
|
|
238
|
+
if (data.length > 0) {
|
|
239
|
+
const pgSql = toPgParams(`
|
|
240
|
+
DELETE FROM ${kq(joinTableName)}
|
|
241
|
+
WHERE (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) IN (
|
|
260
242
|
SELECT (data->>0)::int, (data->>1)::int FROM jsonb_array_elements(?) data
|
|
261
243
|
)`);
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
244
|
+
onQuery?.(pgSql);
|
|
245
|
+
await client.query(pgSql, [JSON.stringify(data)]);
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
deletedRows.forEach((row) => {
|
|
249
|
+
row.id = void 0;
|
|
250
|
+
row.persisted = false;
|
|
251
|
+
row.op = JoinRowOperation.Flushed;
|
|
252
|
+
});
|
|
271
253
|
}
|
|
272
254
|
/**
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
255
|
+
* Configures the `pg` driver with the best type parsers.
|
|
256
|
+
*
|
|
257
|
+
* In particular, pg's default `TIMESTAMPTZ` parser is very inefficient, and even just
|
|
258
|
+
* pulling in the latest `pg-types` and installing the fixed parser makes a noticable
|
|
259
|
+
* difference.
|
|
260
|
+
*/
|
|
279
261
|
function setupLatestPgTypes(temporal) {
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
}
|
|
293
|
-
else {
|
|
294
|
-
pg_1.default.types.setTypeParser(pg_1.default.types.builtins.TIMESTAMPTZ, (0, pg_types_1.getTypeParser)(pg_types_1.builtins.TIMESTAMPTZ));
|
|
295
|
-
}
|
|
262
|
+
if (temporal) {
|
|
263
|
+
const noop = (s) => s;
|
|
264
|
+
const noopArray = (s) => array.parse(s, noop);
|
|
265
|
+
const { TIMESTAMP, TIMESTAMPTZ, DATE } = pg.types.builtins;
|
|
266
|
+
pg.types.setTypeParser(DATE, noop);
|
|
267
|
+
pg.types.setTypeParser(TIMESTAMP, noop);
|
|
268
|
+
pg.types.setTypeParser(TIMESTAMPTZ, noop);
|
|
269
|
+
pg.types.setTypeParser(1182, noopArray);
|
|
270
|
+
pg.types.setTypeParser(1115, noopArray);
|
|
271
|
+
pg.types.setTypeParser(1185, noopArray);
|
|
272
|
+
registerTemporalBinaryParsers();
|
|
273
|
+
} else pg.types.setTypeParser(pg.types.builtins.TIMESTAMPTZ, getTypeParser(builtins.TIMESTAMPTZ));
|
|
296
274
|
}
|
|
297
275
|
const questionMarks = /(?<!@)\?/g;
|
|
298
276
|
/**
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
277
|
+
* Converts our knex-style `?` placeholders to pg-native `$1, $2, ...` numbered parameters.
|
|
278
|
+
*
|
|
279
|
+
* We skipping postgres operators like `@?`. */
|
|
302
280
|
function toPgParams(sql) {
|
|
303
|
-
|
|
304
|
-
|
|
281
|
+
let i = 0;
|
|
282
|
+
return sql.replace(questionMarks, () => `$${++i}`);
|
|
283
|
+
}
|
|
284
|
+
let warnedUnsupportedClient = false;
|
|
285
|
+
/** Warns once when lazyRows degrades to classic rows for an unsupported client, i.e. pg-native. */
|
|
286
|
+
function warnUnsupportedClientOnce() {
|
|
287
|
+
if (warnedUnsupportedClient) return;
|
|
288
|
+
warnedUnsupportedClient = true;
|
|
289
|
+
console.warn("joist-orm: lazyRows is enabled, but this client does not support it; using classic rows.");
|
|
305
290
|
}
|
|
291
|
+
//#endregion
|
|
292
|
+
export { PostgresDriver, setupLatestPgTypes };
|
|
293
|
+
|
|
306
294
|
//# sourceMappingURL=PostgresDriver.js.map
|