joist-orm 2.0.3-next.34 → 2.0.3-next.35

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.
Files changed (5) hide show
  1. package/build/drivers/PostgresDriver.d.ts +6 -8
  2. package/build/drivers/PostgresDriver.d.ts.map +1 -1
  3. package/build/drivers/PostgresDriver.js +37 -80
  4. package/build/drivers/PostgresDriver.js.map +1 -1
  5. package/package.json +9 -9
package/build/drivers/PostgresDriver.d.ts CHANGED
@@ -1,11 +1,9 @@
1
1
  import { Driver, EntityManager, IdAssigner, JoinRowTodo, ParsedFindQuery, PreloadPlugin, RuntimeConfig, Todo } from "joist-core";
2
- import pg from "pg";
2
+ import { Knex } from "knex";
3
3
  export interface PostgresDriverOpts {
4
4
  idAssigner?: IdAssigner;
5
5
  /** Sets a default `PreloadPlugin` for any `EntityManager` that uses this driver. */
6
6
  preloadPlugin?: PreloadPlugin;
7
- /** Called after each query is executed, useful for testing/debugging. */
8
- onQuery?: (sql: string) => void;
9
7
  }
10
8
  /**
11
9
  * Implements the `Driver` interface for Postgres.
@@ -21,22 +19,22 @@ export interface PostgresDriverOpts {
21
19
  *
22
20
  * - We use a pg-specific bulk update syntax.
23
21
  */
24
- export declare class PostgresDriver implements Driver<pg.PoolClient> {
22
+ export declare class PostgresDriver implements Driver<Knex.Transaction> {
25
23
  #private;
26
- readonly pool: pg.Pool;
27
- constructor(pool: pg.Pool, opts?: PostgresDriverOpts);
24
+ private readonly knex;
25
+ constructor(knex: Knex, opts?: PostgresDriverOpts);
28
26
  executeFind(em: EntityManager, parsed: ParsedFindQuery, settings: {
29
27
  limit?: number;
30
28
  offset?: number;
31
29
  }): Promise<any[]>;
32
30
  executeQuery(em: EntityManager, sql: string, bindings: readonly any[]): Promise<any[]>;
33
- transaction<T>(em: EntityManager, fn: (txn: pg.PoolClient) => Promise<T>): Promise<T>;
31
+ transaction<T>(em: EntityManager, fn: (txn: Knex.Transaction) => Promise<T>): Promise<T>;
34
32
  assignNewIds(_: EntityManager, todos: Record<string, Todo>): Promise<void>;
35
33
  flush(em: EntityManager, entityTodos: Record<string, Todo>, joinRows: Record<string, JoinRowTodo>): Promise<void>;
36
34
  get defaultPlugins(): {
37
35
  preloadPlugin: PreloadPlugin | undefined;
38
36
  };
39
- private getMaybeInTxnClient;
37
+ private getMaybeInTxnKnex;
40
38
  }
41
39
  /**
42
40
  * Configures the `pg` driver with the best type parsers.
package/build/drivers/PostgresDriver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PostgresDriver.d.ts","sourceRoot":"","sources":["../../src/drivers/PostgresDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EAMN,aAAa,EAKb,UAAU,EAIV,WAAW,EAMX,eAAe,EAEf,aAAa,EACb,aAAa,EAEb,IAAI,EAEL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AAIpB,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,oFAAoF;IACpF,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,yEAAyE;IACzE,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AASD;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,YAAW,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC;;IAMxD,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI;gBAAb,IAAI,EAAE,EAAE,CAAC,IAAI,EACtB,IAAI,CAAC,EAAE,kBAAkB;IAarB,WAAW,CACf,EAAE,EAAE,aAAa,EACjB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5C,OAAO,CAAC,GAAG,EAAE,CAAC;IAKX,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAOtF,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IA8BrF,YAAY,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1E,KAAK,CACT,EAAE,EAAE,aAAa,EACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAoBhB,IAAI,cAAc;;MAEjB;IAED,OAAO,CAAC,mBAAmB;CAG5B;AA8JD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,IAAI,CAkB5E"}
1
+ {"version":3,"file":"PostgresDriver.d.ts","sourceRoot":"","sources":["../../src/drivers/PostgresDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EAMN,aAAa,EAKb,UAAU,EAIV,WAAW,EAMX,eAAe,EAEf,aAAa,EACb,aAAa,EAEb,IAAI,EAEL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAK5B,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,oFAAoF;IACpF,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,YAAW,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;;IAK3D,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI,EAC3B,IAAI,CAAC,EAAE,kBAAkB;IAOrB,WAAW,CACf,EAAE,EAAE,aAAa,EACjB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5C,OAAO,CAAC,GAAG,EAAE,CAAC;IAKX,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAOtF,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAqBxF,YAAY,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1E,KAAK,CACT,EAAE,EAAE,aAAa,EACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAgBhB,IAAI,cAAc;;MAEjB;IAED,OAAO,CAAC,iBAAiB;CAG1B;AA8ID;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,IAAI,CAkB5E"}
package/build/drivers/PostgresDriver.js CHANGED
@@ -24,20 +24,13 @@ const postgres_array_1 = __importDefault(require("postgres-array"));
24
24
  * - We use a pg-specific bulk update syntax.
25
25
  */
26
26
  class PostgresDriver {
27
- pool;
27
+ knex;
28
28
  #idAssigner;
29
29
  #preloadPlugin;
30
- #onQuery;
31
- constructor(pool, opts) {
32
- this.pool = pool;
33
- this.#idAssigner =
34
- opts?.idAssigner ??
35
- new joist_core_1.SequenceIdAssigner(async (sql) => {
36
- this.#onQuery?.(sql);
37
- return (await pool.query(sql)).rows;
38
- });
30
+ constructor(knex, opts) {
31
+ this.knex = knex;
32
+ this.#idAssigner = opts?.idAssigner ?? new joist_core_1.SequenceIdAssigner(async (sql) => (await knex.raw(sql)).rows);
39
33
  this.#preloadPlugin = opts?.preloadPlugin;
40
- this.#onQuery = opts?.onQuery;
41
34
  setupLatestPgTypes((0, joist_core_1.getRuntimeConfig)().temporal);
42
35
  }
43
36
  async executeFind(em, parsed, settings) {
@@ -45,74 +38,59 @@ class PostgresDriver {
45
38
  return this.executeQuery(em, sql, bindings);
46
39
  }
47
40
  async executeQuery(em, sql, bindings) {
48
- const pgSql = toPgParams(sql);
49
- this.#onQuery?.(pgSql);
50
- const client = this.getMaybeInTxnClient(em);
51
- return client.query(pgSql, bindings).then((result) => result.rows);
41
+ // Still go through knex to use the connection pool
42
+ return this.getMaybeInTxnKnex(em)
43
+ .raw(sql, bindings)
44
+ .then((result) => result.rows);
52
45
  }
53
46
  async transaction(em, fn) {
47
+ // `em.transaction` might have already opened a transaction
54
48
  if (em.txn) {
55
49
  return fn(em.txn);
56
50
  }
57
- const client = await this.pool.connect();
58
- let result;
59
- try {
60
- await (0, joist_core_1.driverBeforeBegin)(em, client);
61
- this.#onQuery?.("BEGIN;");
62
- await client.query("BEGIN");
63
- em.txn = client;
51
+ await (0, joist_core_1.driverBeforeBegin)(em, this.knex);
52
+ const result = await this.knex.transaction(async (txn) => {
53
+ em.txn = txn;
64
54
  try {
65
- await (0, joist_core_1.driverAfterBegin)(em, client);
66
- result = await fn(client);
67
- await (0, joist_core_1.driverBeforeCommit)(em, client);
68
- this.#onQuery?.("COMMIT;");
69
- await client.query("COMMIT");
70
- }
71
- catch (e) {
72
- await client.query("ROLLBACK");
73
- throw e;
55
+ await (0, joist_core_1.driverAfterBegin)(em, txn);
56
+ const result = await fn(txn);
57
+ await (0, joist_core_1.driverBeforeCommit)(em, txn);
58
+ return result;
74
59
  }
75
60
  finally {
76
61
  em.txn = undefined;
77
62
  }
78
- await (0, joist_core_1.driverAfterCommit)(em, client);
79
- }
80
- finally {
81
- client.release();
82
- }
63
+ });
64
+ await (0, joist_core_1.driverAfterCommit)(em, this.knex);
83
65
  return result;
84
66
  }
85
67
  async assignNewIds(_, todos) {
86
68
  return this.#idAssigner.assignNewIds(todos);
87
69
  }
88
70
  async flush(em, entityTodos, joinRows) {
89
- const client = (em.txn ?? (0, joist_core_1.fail)("Expected EntityManager.txn to be set"));
71
+ const txn = (em.txn ?? (0, joist_core_1.fail)("Expected EntityManager.txn to be set"));
90
72
  await this.#idAssigner.assignNewIds(entityTodos);
91
73
  const ops = (0, joist_core_1.generateOps)(entityTodos);
92
- const onQuery = this.#onQuery;
93
74
  // Do INSERTs+UPDATEs first so that we avoid DELETE cascades invalidating oplocks
94
75
  // See https://github.com/joist-orm/joist-orm/issues/591
95
76
  await Promise.all([
96
- ...ops.inserts.map((op) => batchInsert(client, op, onQuery)),
97
- ...ops.updates.map((op) => batchUpdate(client, op, onQuery)),
98
- ...ops.deletes.map((op) => batchDelete(client, op, onQuery)),
77
+ ...ops.inserts.map((op) => batchInsert(txn, op)),
78
+ ...ops.updates.map((op) => batchUpdate(txn, op)),
79
+ ...ops.deletes.map((op) => batchDelete(txn, op)),
99
80
  ...Object.entries(joinRows).flatMap(([joinTableName, { m2m, newRows, deletedRows }]) => {
100
- return [
101
- m2mBatchInsert(client, joinTableName, m2m, newRows, onQuery),
102
- m2mBatchDelete(client, joinTableName, m2m, deletedRows, onQuery),
103
- ];
81
+ return [m2mBatchInsert(txn, joinTableName, m2m, newRows), m2mBatchDelete(txn, joinTableName, m2m, deletedRows)];
104
82
  }),
105
83
  ]);
106
84
  }
107
85
  get defaultPlugins() {
108
86
  return { preloadPlugin: this.#preloadPlugin };
109
87
  }
110
- getMaybeInTxnClient(em) {
111
- return em.txn || this.pool;
88
+ getMaybeInTxnKnex(em) {
89
+ return (em.txn || this.knex);
112
90
  }
113
91
  }
114
92
  exports.PostgresDriver = PostgresDriver;
115
- async function batchInsert(client, op, onQuery) {
93
+ async function batchInsert(txn, op) {
116
94
  const { tableName, columns, columnValues } = op;
117
95
  const [cte, bindings] = buildUnnestCte("data", columns, columnValues);
118
96
  const sql = (0, joist_core_1.cleanSql)(`
@@ -120,11 +98,9 @@ async function batchInsert(client, op, onQuery) {
120
98
  INSERT INTO ${(0, joist_core_1.kq)(tableName)} (${columns.map((c) => (0, joist_core_1.kq)(c.columnName)).join(", ")})
121
99
  SELECT * FROM data
122
100
  `);
123
- const pgSql = toPgParams(sql);
124
- onQuery?.(pgSql);
125
- return client.query(pgSql, bindings);
101
+ return txn.raw(sql, bindings);
126
102
  }
127
- async function batchUpdate(client, op, onQuery) {
103
+ async function batchUpdate(txn, op) {
128
104
  const { tableName, columns, columnValues, updatedAt } = op;
129
105
  const [cte, bindings] = buildUnnestCte("data", columns, columnValues);
130
106
  // JS Dates only have millisecond-level precision, so we may have dropped/lost accuracy when
@@ -149,9 +125,7 @@ async function batchUpdate(client, op, onQuery) {
149
125
  WHERE ${(0, joist_core_1.kq)(tableName)}.id = data.id ${maybeUpdatedAt}
150
126
  RETURNING ${(0, joist_core_1.kq)(tableName)}.id
151
127
  `;
152
- const pgSql = toPgParams((0, joist_core_1.cleanSql)(sql));
153
- onQuery?.(pgSql);
154
- const result = await client.query(pgSql, bindings);
128
+ const result = await txn.raw((0, joist_core_1.cleanSql)(sql), bindings);
155
129
  const results = result.rows;
156
130
  const ids = columnValues[0]; // assume id is the 1st column
157
131
  if (results.length !== ids.length) {
@@ -160,11 +134,9 @@ async function batchUpdate(client, op, onQuery) {
160
134
  throw new Error(`Oplock failure for ${tableName} rows ${missing.join(", ")}`);
161
135
  }
162
136
  }
163
- async function batchDelete(client, op, onQuery) {
137
+ async function batchDelete(txn, op) {
164
138
  const { tableName, ids } = op;
165
- const pgSql = toPgParams(`DELETE FROM ${(0, joist_core_1.kq)(tableName)} WHERE id = ANY(?)`);
166
- onQuery?.(pgSql);
167
- await client.query(pgSql, [ids]);
139
+ await txn.raw(`DELETE FROM ${(0, joist_core_1.kq)(tableName)} WHERE id = ANY(?)`, [ids]);
168
140
  }
169
141
  /** Creates a CTE named `tableName` that bulk-injects the `columnValues` into a SQL query. */
170
142
  function buildUnnestCte(tableName, columns, columnValues) {
@@ -185,7 +157,7 @@ function buildUnnestCte(tableName, columns, columnValues) {
185
157
  const sql = `WITH ${tableName} AS (SELECT ${selects.join(", ")})`;
186
158
  return [sql, columnValues];
187
159
  }
188
- async function m2mBatchInsert(client, joinTableName, m2m, newRows, onQuery) {
160
+ async function m2mBatchInsert(txn, joinTableName, m2m, newRows) {
189
161
  if (newRows.length === 0)
190
162
  return;
191
163
  const meta1 = (0, joist_core_1.getMetadata)(m2m.entity);
@@ -199,23 +171,19 @@ async function m2mBatchInsert(client, joinTableName, m2m, newRows, onQuery) {
199
171
  ON CONFLICT (${(0, joist_core_1.kq)(m2m.columnName)}, ${(0, joist_core_1.kq)(m2m.otherColumnName)}) DO UPDATE SET id = ${(0, joist_core_1.kq)(joinTableName)}.id
200
172
  RETURNING id;
201
173
  `);
202
- const pgSql = toPgParams(sql);
203
- onQuery?.(pgSql);
204
- const { rows } = await client.query(pgSql, [col1Values, col2Values]);
174
+ const { rows } = await txn.raw(sql, [col1Values, col2Values]);
205
175
  for (let i = 0; i < rows.length; i++) {
206
176
  newRows[i].id = rows[i].id;
207
177
  newRows[i].op = joist_core_1.JoinRowOperation.Flushed;
208
178
  }
209
179
  }
210
- async function m2mBatchDelete(client, joinTableName, m2m, deletedRows, onQuery) {
180
+ async function m2mBatchDelete(txn, joinTableName, m2m, deletedRows) {
211
181
  if (deletedRows.length === 0)
212
182
  return;
213
183
  // `remove`s that were done against unloaded ManyToManyCollections will not have row ids
214
184
  const [haveIds, noIds] = (0, joist_core_1.partition)(deletedRows, (r) => r.id !== -1);
215
185
  if (haveIds.length > 0) {
216
- const pgSql = toPgParams(`DELETE FROM ${(0, joist_core_1.kq)(joinTableName)} WHERE id = ANY(?)`);
217
- onQuery?.(pgSql);
218
- await client.query(pgSql, [haveIds.map((r) => r.id)]);
186
+ await txn.raw(`DELETE FROM ${(0, joist_core_1.kq)(joinTableName)} WHERE id = ANY(?)`, [haveIds.map((r) => r.id)]);
219
187
  }
220
188
  if (noIds.length > 0) {
221
189
  const data = noIds
@@ -231,13 +199,11 @@ async function m2mBatchDelete(client, joinTableName, m2m, deletedRows, onQuery)
231
199
  (0, joist_core_1.keyToNumber)(m2m.otherMeta, e.columns[m2m.otherColumnName].idTagged),
232
200
  ]);
233
201
  if (data.length > 0) {
234
- const pgSql = toPgParams(`
202
+ await txn.raw(`
235
203
  DELETE FROM ${(0, joist_core_1.kq)(joinTableName)}
236
204
  WHERE (${(0, joist_core_1.kq)(m2m.columnName)}, ${(0, joist_core_1.kq)(m2m.otherColumnName)}) IN (
237
205
  SELECT (data->>0)::int, (data->>1)::int FROM jsonb_array_elements(?) data
238
- )`);
239
- onQuery?.(pgSql);
240
- await client.query(pgSql, [JSON.stringify(data)]);
206
+ )`, [JSON.stringify(data)]);
241
207
  }
242
208
  }
243
209
  deletedRows.forEach((row) => {
@@ -270,13 +236,4 @@ function setupLatestPgTypes(temporal) {
270
236
  pg_1.default.types.setTypeParser(pg_1.default.types.builtins.TIMESTAMPTZ, (0, pg_types_1.getTypeParser)(pg_types_1.builtins.TIMESTAMPTZ));
271
237
  }
272
238
  }
273
- const questionMarks = /(?<!@)\?/g;
274
- /**
275
- * Converts our knex-style `?` placeholders to pg-native `$1, $2, ...` numbered parameters.
276
- *
277
- * We skipping postgres operators like `@?`. */
278
- function toPgParams(sql) {
279
- let i = 0;
280
- return sql.replace(questionMarks, () => `$${++i}`);
281
- }
282
239
  //# sourceMappingURL=PostgresDriver.js.map
package/build/drivers/PostgresDriver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PostgresDriver.js","sourceRoot":"","sources":["../../src/drivers/PostgresDriver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PostgresDriver.js","sourceRoot":"","sources":["../../src/drivers/PostgresDriver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "joist-orm",
3
- "version": "2.0.3-next.34",
3
+ "version": "2.0.3-next.35",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -83,14 +83,14 @@
83
83
  "build"
84
84
  ],
85
85
  "dependencies": {
86
- "joist-codegen": "2.0.3-next.34",
87
- "joist-core": "2.0.3-next.34",
88
- "joist-graphql-codegen": "2.0.3-next.34",
89
- "joist-graphql-resolver-utils": "2.0.3-next.34",
90
- "joist-knex": "2.0.3-next.34",
91
- "joist-migration-utils": "2.0.3-next.34",
92
- "joist-test-utils": "2.0.3-next.34",
93
- "joist-utils": "2.0.3-next.34"
86
+ "joist-codegen": "2.0.3-next.35",
87
+ "joist-core": "2.0.3-next.35",
88
+ "joist-graphql-codegen": "2.0.3-next.35",
89
+ "joist-graphql-resolver-utils": "2.0.3-next.35",
90
+ "joist-knex": "2.0.3-next.35",
91
+ "joist-migration-utils": "2.0.3-next.35",
92
+ "joist-test-utils": "2.0.3-next.35",
93
+ "joist-utils": "2.0.3-next.35"
94
94
  },
95
95
  "peerDependencies": {
96
96
  "knex": "^3.1.0",