neoorm 0.1.1 → 0.1.3
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/README.md +171 -11
- package/dist/bin/neoorm.js +11 -2
- package/dist/bin/neoorm.js.map +1 -1
- package/dist/codegen/emit-models.d.ts.map +1 -1
- package/dist/codegen/emit-models.js +24 -15
- package/dist/codegen/emit-models.js.map +1 -1
- package/dist/codegen/generate.d.ts +13 -2
- package/dist/codegen/generate.d.ts.map +1 -1
- package/dist/codegen/generate.js +70 -9
- package/dist/codegen/generate.js.map +1 -1
- package/dist/codegen/schema-to-manifest.d.ts +2 -1
- package/dist/codegen/schema-to-manifest.d.ts.map +1 -1
- package/dist/codegen/schema-to-manifest.js +22 -7
- package/dist/codegen/schema-to-manifest.js.map +1 -1
- package/dist/dialect/postgres.d.ts.map +1 -1
- package/dist/dialect/postgres.js +27 -23
- package/dist/dialect/postgres.js.map +1 -1
- package/dist/dialect/types.d.ts +8 -1
- package/dist/dialect/types.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/introspect/pull.d.ts.map +1 -1
- package/dist/introspect/pull.js +91 -31
- package/dist/introspect/pull.js.map +1 -1
- package/dist/plugins/builtin.d.ts +15 -0
- package/dist/plugins/builtin.d.ts.map +1 -0
- package/dist/plugins/builtin.js +156 -0
- package/dist/plugins/builtin.js.map +1 -0
- package/dist/plugins/ensure-plugins.d.ts +3 -0
- package/dist/plugins/ensure-plugins.d.ts.map +1 -0
- package/dist/plugins/ensure-plugins.js +19 -0
- package/dist/plugins/ensure-plugins.js.map +1 -0
- package/dist/plugins/index.d.ts +4 -0
- package/dist/plugins/index.d.ts.map +1 -0
- package/dist/plugins/index.js +3 -0
- package/dist/plugins/index.js.map +1 -0
- package/dist/plugins/postgis/columns.d.ts +25 -0
- package/dist/plugins/postgis/columns.d.ts.map +1 -0
- package/dist/plugins/postgis/columns.js +82 -0
- package/dist/plugins/postgis/columns.js.map +1 -0
- package/dist/plugins/postgis/geojson.d.ts +4 -0
- package/dist/plugins/postgis/geojson.d.ts.map +1 -0
- package/dist/plugins/postgis/geojson.js +22 -0
- package/dist/plugins/postgis/geojson.js.map +1 -0
- package/dist/plugins/postgis/index.d.ts +4 -0
- package/dist/plugins/postgis/index.d.ts.map +1 -0
- package/dist/plugins/postgis/index.js +6 -0
- package/dist/plugins/postgis/index.js.map +1 -0
- package/dist/plugins/postgis/operators.d.ts +5 -0
- package/dist/plugins/postgis/operators.d.ts.map +1 -0
- package/dist/plugins/postgis/operators.js +35 -0
- package/dist/plugins/postgis/operators.js.map +1 -0
- package/dist/plugins/postgis/plugin.d.ts +3 -0
- package/dist/plugins/postgis/plugin.d.ts.map +1 -0
- package/dist/plugins/postgis/plugin.js +7 -0
- package/dist/plugins/postgis/plugin.js.map +1 -0
- package/dist/plugins/registry.d.ts +10 -0
- package/dist/plugins/registry.d.ts.map +1 -0
- package/dist/plugins/registry.js +89 -0
- package/dist/plugins/registry.js.map +1 -0
- package/dist/plugins/types.d.ts +32 -0
- package/dist/plugins/types.d.ts.map +1 -0
- package/dist/plugins/types.js +2 -0
- package/dist/plugins/types.js.map +1 -0
- package/dist/runtime/client.d.ts +1 -1
- package/dist/runtime/client.d.ts.map +1 -1
- package/dist/runtime/client.js +29 -2
- package/dist/runtime/client.js.map +1 -1
- package/dist/runtime/executor.d.ts +4 -1
- package/dist/runtime/executor.d.ts.map +1 -1
- package/dist/runtime/executor.js +20 -3
- package/dist/runtime/executor.js.map +1 -1
- package/dist/runtime/query/compile.d.ts +3 -1
- package/dist/runtime/query/compile.d.ts.map +1 -1
- package/dist/runtime/query/compile.js +78 -11
- package/dist/runtime/query/compile.js.map +1 -1
- package/dist/runtime/query/create.d.ts.map +1 -1
- package/dist/runtime/query/create.js +61 -72
- package/dist/runtime/query/create.js.map +1 -1
- package/dist/runtime/query/primary-key.d.ts +4 -0
- package/dist/runtime/query/primary-key.d.ts.map +1 -0
- package/dist/runtime/query/primary-key.js +23 -0
- package/dist/runtime/query/primary-key.js.map +1 -0
- package/dist/runtime/query/update.js +2 -2
- package/dist/runtime/query/update.js.map +1 -1
- package/dist/runtime/query/upsert.d.ts.map +1 -1
- package/dist/runtime/query/upsert.js +2 -12
- package/dist/runtime/query/upsert.js.map +1 -1
- package/dist/runtime/types.d.ts +10 -0
- package/dist/runtime/types.d.ts.map +1 -1
- package/dist/schema/column.d.ts +8 -10
- package/dist/schema/column.d.ts.map +1 -1
- package/dist/schema/column.js +10 -53
- package/dist/schema/column.js.map +1 -1
- package/dist/schema/index.d.ts +2 -1
- package/dist/schema/index.d.ts.map +1 -1
- package/dist/schema/index.js +1 -1
- package/dist/schema/index.js.map +1 -1
- package/dist/schema/relation.d.ts +1 -0
- package/dist/schema/relation.d.ts.map +1 -1
- package/dist/schema/relation.js +16 -11
- package/dist/schema/relation.js.map +1 -1
- package/dist/utils/uuid.d.ts +6 -0
- package/dist/utils/uuid.d.ts.map +1 -0
- package/dist/utils/uuid.js +34 -0
- package/dist/utils/uuid.js.map +1 -0
- package/package.json +13 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/runtime/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC1B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/runtime/client.ts"],"names":[],"mappings":"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"}
|
package/dist/runtime/client.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Pool } from "pg";
|
|
2
|
+
import { ensurePlugins } from "../plugins/ensure-plugins.js";
|
|
2
3
|
import { createExecutor, compileQuery } from "./executor.js";
|
|
3
4
|
import { findMany, findFirst, findById } from "./query/find.js";
|
|
4
5
|
import { countRecords, findUnique } from "./query/count.js";
|
|
@@ -23,7 +24,8 @@ function createTableRepository(executor, manifest, accessor) {
|
|
|
23
24
|
deleteById: (id) => deleteById(executor, manifest, accessor, id),
|
|
24
25
|
};
|
|
25
26
|
}
|
|
26
|
-
function buildClient(executor, manifest, disconnect) {
|
|
27
|
+
function buildClient(executor, manifest, disconnect, options) {
|
|
28
|
+
const transactional = options?.transactional ?? false;
|
|
27
29
|
const client = {
|
|
28
30
|
sql(strings, ...values) {
|
|
29
31
|
const { text, params } = compileQuery(strings, values);
|
|
@@ -32,7 +34,30 @@ function buildClient(executor, manifest, disconnect) {
|
|
|
32
34
|
execute(query) {
|
|
33
35
|
return executor.query(query.text, query.params);
|
|
34
36
|
},
|
|
35
|
-
$disconnect:
|
|
37
|
+
$disconnect: transactional
|
|
38
|
+
? async () => {
|
|
39
|
+
throw new Error("Cannot disconnect inside a transaction");
|
|
40
|
+
}
|
|
41
|
+
: disconnect,
|
|
42
|
+
$transaction(fnOrSteps, txOptions) {
|
|
43
|
+
if (transactional) {
|
|
44
|
+
throw new Error("Nested transactions are not supported");
|
|
45
|
+
}
|
|
46
|
+
if (typeof fnOrSteps === "function") {
|
|
47
|
+
return executor.transaction(async (txExecutor) => {
|
|
48
|
+
const tx = buildClient(txExecutor, manifest, disconnect, { transactional: true });
|
|
49
|
+
return fnOrSteps(tx);
|
|
50
|
+
}, txOptions);
|
|
51
|
+
}
|
|
52
|
+
return executor.transaction(async (txExecutor) => {
|
|
53
|
+
const tx = buildClient(txExecutor, manifest, disconnect, { transactional: true });
|
|
54
|
+
const results = [];
|
|
55
|
+
for (const step of fnOrSteps) {
|
|
56
|
+
results.push(await step(tx));
|
|
57
|
+
}
|
|
58
|
+
return results;
|
|
59
|
+
}, txOptions);
|
|
60
|
+
},
|
|
36
61
|
};
|
|
37
62
|
for (const accessor of Object.keys(manifest.tables)) {
|
|
38
63
|
client[accessor] = createTableRepository(executor, manifest, accessor);
|
|
@@ -40,6 +65,7 @@ function buildClient(executor, manifest, disconnect) {
|
|
|
40
65
|
return client;
|
|
41
66
|
}
|
|
42
67
|
export function createNeoOrmClient(manifest, connectionString) {
|
|
68
|
+
ensurePlugins(manifest);
|
|
43
69
|
const url = connectionString ?? process.env["DATABASE_URL"];
|
|
44
70
|
if (!url) {
|
|
45
71
|
throw new Error("DATABASE_URL is required");
|
|
@@ -51,6 +77,7 @@ export function createNeoOrmClient(manifest, connectionString) {
|
|
|
51
77
|
});
|
|
52
78
|
}
|
|
53
79
|
export function createNeoOrmClientFromPool(manifest, pool) {
|
|
80
|
+
ensurePlugins(manifest);
|
|
54
81
|
const executor = createExecutor(pool);
|
|
55
82
|
return buildClient(executor, manifest, async () => {
|
|
56
83
|
await pool.end();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/runtime/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAG1B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAiB,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAwEhF,SAAS,qBAAqB,CAC5B,QAAkB,EAClB,QAAkB,EAClB,QAAgB;IAEhB,OAAO;QACL,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;QAChE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;QAClE,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;QACpE,QAAQ,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC;QACxE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;QAClE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;QAClE,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;QAClE,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;QAC3E,UAAU,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC;QAC5E,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;QAClE,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;QAC3E,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;QACjE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC;KACjE,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAKlB,QAAkB,EAClB,QAAkB,EAClB,UAA+B
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/runtime/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import type { Pool } from "pg";
|
|
2
2
|
import type { CompiledQuery } from "../dialect/types.js";
|
|
3
|
+
import type { TransactionOptions } from "./types.js";
|
|
3
4
|
export type Executor = {
|
|
5
|
+
readonly inTransaction?: boolean;
|
|
4
6
|
query<T = Record<string, unknown>>(text: string, params?: unknown[]): Promise<T[]>;
|
|
5
7
|
queryOne<T = Record<string, unknown>>(text: string, params?: unknown[]): Promise<T | null>;
|
|
6
|
-
transaction<T>(fn: (tx: Executor) => Promise<T
|
|
8
|
+
transaction<T>(fn: (tx: Executor) => Promise<T>, options?: TransactionOptions): Promise<T>;
|
|
7
9
|
};
|
|
10
|
+
export declare function buildBeginSql(options?: TransactionOptions): string;
|
|
8
11
|
export declare function createExecutor(pool: Pool): Executor;
|
|
9
12
|
export declare function compileQuery(parts: TemplateStringsArray, values: unknown[]): CompiledQuery;
|
|
10
13
|
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/runtime/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA2B,MAAM,IAAI,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/runtime/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA2B,MAAM,IAAI,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAChB,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACrB,WAAW,CAAC,CAAC,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,EAChC,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,CAAC,CAAC,CAAC;CACf,CAAC;AAYF,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAYlE;AAMD,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,QAAQ,CAsCnD;AAgCD,wBAAgB,YAAY,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAa1F"}
|
package/dist/runtime/executor.js
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
const isolationLevelSql = {
|
|
2
|
+
ReadUncommitted: "READ UNCOMMITTED",
|
|
3
|
+
ReadCommitted: "READ COMMITTED",
|
|
4
|
+
RepeatableRead: "REPEATABLE READ",
|
|
5
|
+
Serializable: "SERIALIZABLE",
|
|
6
|
+
};
|
|
7
|
+
export function buildBeginSql(options) {
|
|
8
|
+
const parts = ["BEGIN"];
|
|
9
|
+
if (options?.readOnly) {
|
|
10
|
+
parts.push("READ ONLY");
|
|
11
|
+
}
|
|
12
|
+
if (options?.isolationLevel) {
|
|
13
|
+
parts.push(`ISOLATION LEVEL ${isolationLevelSql[options.isolationLevel]}`);
|
|
14
|
+
}
|
|
15
|
+
return parts.join(" ");
|
|
16
|
+
}
|
|
1
17
|
function rowsFromResult(result) {
|
|
2
18
|
return result.rows;
|
|
3
19
|
}
|
|
@@ -12,10 +28,10 @@ export function createExecutor(pool) {
|
|
|
12
28
|
const rows = rowsFromResult(result);
|
|
13
29
|
return rows[0] ?? null;
|
|
14
30
|
},
|
|
15
|
-
async transaction(fn) {
|
|
31
|
+
async transaction(fn, options) {
|
|
16
32
|
const client = await pool.connect();
|
|
17
33
|
try {
|
|
18
|
-
await client.query(
|
|
34
|
+
await client.query(buildBeginSql(options));
|
|
19
35
|
const tx = createClientExecutor(client);
|
|
20
36
|
const result = await fn(tx);
|
|
21
37
|
await client.query("COMMIT");
|
|
@@ -33,6 +49,7 @@ export function createExecutor(pool) {
|
|
|
33
49
|
}
|
|
34
50
|
function createClientExecutor(client) {
|
|
35
51
|
return {
|
|
52
|
+
inTransaction: true,
|
|
36
53
|
async query(text, params = []) {
|
|
37
54
|
const result = await client.query(text, params);
|
|
38
55
|
return rowsFromResult(result);
|
|
@@ -42,7 +59,7 @@ function createClientExecutor(client) {
|
|
|
42
59
|
const rows = rowsFromResult(result);
|
|
43
60
|
return rows[0] ?? null;
|
|
44
61
|
},
|
|
45
|
-
transaction(_fn) {
|
|
62
|
+
transaction(_fn, _options) {
|
|
46
63
|
throw new Error("Nested transactions are not supported");
|
|
47
64
|
},
|
|
48
65
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/runtime/executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/runtime/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,9 @@ export declare function buildUpdateQuery(table: ManifestTable, dataKeys: string[
|
|
|
16
16
|
export declare function buildDeleteQuery(table: ManifestTable, whereSql: string): string;
|
|
17
17
|
export declare function buildDeleteManyQuery(table: ManifestTable, whereSql: string): string;
|
|
18
18
|
export declare function buildUpdateManyQuery(table: ManifestTable, dataKeys: string[], whereSql: string): string;
|
|
19
|
-
export declare function dataToSqlValues(table: ManifestTable, data: Record<string, unknown
|
|
19
|
+
export declare function dataToSqlValues(table: ManifestTable, data: Record<string, unknown>, options?: {
|
|
20
|
+
excludePrimary?: boolean;
|
|
21
|
+
}): {
|
|
20
22
|
keys: string[];
|
|
21
23
|
values: unknown[];
|
|
22
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/compile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAkB,aAAa,EAAiB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/compile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAkB,aAAa,EAAiB,MAAM,wBAAwB,CAAC;AAKpG,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,EAAE,CAAC;CACnB,CAAC;AA+CF,wBAAgB,YAAY,CAC1B,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC1C,OAAO,EAAE,OAAO,EAChB,eAAe,SAAI,GAClB,WAAW,CA0Db;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,GAC1C,MAAM,CAYR;AAED,wBAAgB,sBAAsB,CACpC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,GAC/D,SAAS,MAAM,EAAE,GAAG,SAAS,CAM/B;AAaD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAO3F;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,SAAO,GACd,MAAM,CAKR;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,CAUR;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI9E;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,MAAM,EAAE,EACpB,UAAU,EAAE,MAAM,EAAE,EACpB,kBAAkB,EAAE,SAAS,MAAM,EAAE,GACpC,MAAM,CA4BR;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAAE,GACjB,MAAM,CAcR;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CAiBR;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,GACf,MAAM,CAMR;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,GACf,MAAM,CAIR;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CAeR;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAcvC;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBnG;AAED,wBAAgB,QAAQ,CACtB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAC9B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAE3B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { quoteIdentifier } from "../../dialect/postgres.js";
|
|
2
|
+
import { getColumnType } from "../../plugins/registry.js";
|
|
2
3
|
function isOperatorObject(value) {
|
|
3
4
|
return (typeof value === "object" &&
|
|
4
5
|
value !== null &&
|
|
@@ -10,6 +11,33 @@ const operatorParamTransform = {
|
|
|
10
11
|
startsWith: (v) => `${String(v)}%`,
|
|
11
12
|
endsWith: (v) => `%${String(v)}`,
|
|
12
13
|
};
|
|
14
|
+
function pluginWhereOperators(col) {
|
|
15
|
+
if (col.kind === "fk")
|
|
16
|
+
return {};
|
|
17
|
+
return getColumnType(col.kind)?.whereOperators ?? {};
|
|
18
|
+
}
|
|
19
|
+
function serializeColumnValue(col, value) {
|
|
20
|
+
if (col.kind === "fk")
|
|
21
|
+
return value;
|
|
22
|
+
const plugin = getColumnType(col.kind);
|
|
23
|
+
if (plugin?.serializeValue) {
|
|
24
|
+
return plugin.serializeValue(col, value);
|
|
25
|
+
}
|
|
26
|
+
return value;
|
|
27
|
+
}
|
|
28
|
+
function buildValuePlaceholder(col, paramIndex) {
|
|
29
|
+
if (!col || col.kind === "fk")
|
|
30
|
+
return `$${paramIndex}`;
|
|
31
|
+
const plugin = getColumnType(col.kind);
|
|
32
|
+
if (plugin?.writeExpression) {
|
|
33
|
+
return plugin.writeExpression(col, paramIndex);
|
|
34
|
+
}
|
|
35
|
+
return `$${paramIndex}`;
|
|
36
|
+
}
|
|
37
|
+
function buildSetExpression(col, paramIndex) {
|
|
38
|
+
const sqlCol = quoteIdentifier(col?.sqlName ?? "");
|
|
39
|
+
return `${sqlCol} = ${buildValuePlaceholder(col, paramIndex)}`;
|
|
40
|
+
}
|
|
13
41
|
export function compileWhere(table, where, dialect, startParamIndex = 1) {
|
|
14
42
|
if (!where || Object.keys(where).length === 0) {
|
|
15
43
|
return { sql: "", params: [] };
|
|
@@ -22,13 +50,14 @@ export function compileWhere(table, where, dialect, startParamIndex = 1) {
|
|
|
22
50
|
if (!col)
|
|
23
51
|
continue;
|
|
24
52
|
const sqlCol = quoteIdentifier(col.sqlName);
|
|
53
|
+
const spatialOps = pluginWhereOperators(col);
|
|
25
54
|
if (!isOperatorObject(rawValue) || Array.isArray(rawValue)) {
|
|
26
55
|
conditions.push(dialect.whereOperators.equals(sqlCol, paramIndex));
|
|
27
|
-
params.push(rawValue);
|
|
56
|
+
params.push(serializeColumnValue(col, rawValue));
|
|
28
57
|
paramIndex++;
|
|
29
58
|
continue;
|
|
30
59
|
}
|
|
31
|
-
const hasOperator = Object.keys(rawValue).some((k) => k in dialect.whereOperators);
|
|
60
|
+
const hasOperator = Object.keys(rawValue).some((k) => k in dialect.whereOperators || k in spatialOps);
|
|
32
61
|
if (!hasOperator) {
|
|
33
62
|
conditions.push(dialect.whereOperators.equals(sqlCol, paramIndex));
|
|
34
63
|
params.push(rawValue);
|
|
@@ -36,6 +65,14 @@ export function compileWhere(table, where, dialect, startParamIndex = 1) {
|
|
|
36
65
|
continue;
|
|
37
66
|
}
|
|
38
67
|
for (const [op, value] of Object.entries(rawValue)) {
|
|
68
|
+
if (op in spatialOps) {
|
|
69
|
+
const operator = spatialOps[op];
|
|
70
|
+
const compiled = operator.compile(sqlCol, value, col, paramIndex);
|
|
71
|
+
conditions.push(compiled.sql);
|
|
72
|
+
params.push(...compiled.params);
|
|
73
|
+
paramIndex += compiled.params.length;
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
39
76
|
if (!(op in dialect.whereOperators))
|
|
40
77
|
continue;
|
|
41
78
|
const operator = op;
|
|
@@ -73,11 +110,21 @@ export function normalizeSelectColumns(select) {
|
|
|
73
110
|
.filter(([, enabled]) => enabled === true)
|
|
74
111
|
.map(([key]) => key);
|
|
75
112
|
}
|
|
113
|
+
function selectExpression(col) {
|
|
114
|
+
if (col.kind === "fk") {
|
|
115
|
+
return quoteIdentifier(col.sqlName);
|
|
116
|
+
}
|
|
117
|
+
const plugin = getColumnType(col.kind);
|
|
118
|
+
if (plugin?.selectExpression) {
|
|
119
|
+
return plugin.selectExpression(col);
|
|
120
|
+
}
|
|
121
|
+
return quoteIdentifier(col.sqlName);
|
|
122
|
+
}
|
|
76
123
|
export function buildSelectColumns(table, select) {
|
|
77
124
|
const cols = select && select.length > 0
|
|
78
125
|
? table.columns.filter((c) => select.includes(c.tsName))
|
|
79
126
|
: table.columns;
|
|
80
|
-
return cols.map((c) =>
|
|
127
|
+
return cols.map((c) => selectExpression(c)).join(", ");
|
|
81
128
|
}
|
|
82
129
|
export function buildFindByIdQuery(table, idColumn = "id") {
|
|
83
130
|
const col = table.columns.find((c) => c.tsName === idColumn);
|
|
@@ -109,7 +156,12 @@ export function buildUpsertQuery(table, insertKeys, updateKeys, conflictSqlColum
|
|
|
109
156
|
const col = table.columns.find((c) => c.tsName === k);
|
|
110
157
|
return quoteIdentifier(col?.sqlName ?? k);
|
|
111
158
|
});
|
|
112
|
-
const insertPlaceholders = insertKeys
|
|
159
|
+
const insertPlaceholders = insertKeys
|
|
160
|
+
.map((k, i) => {
|
|
161
|
+
const col = table.columns.find((c) => c.tsName === k);
|
|
162
|
+
return buildValuePlaceholder(col, i + 1);
|
|
163
|
+
})
|
|
164
|
+
.join(", ");
|
|
113
165
|
const selectCols = buildSelectColumns(table);
|
|
114
166
|
const conflictCols = conflictSqlColumns.map((c) => quoteIdentifier(c)).join(", ");
|
|
115
167
|
const updateSets = updateKeys.length > 0
|
|
@@ -129,14 +181,19 @@ export function buildInsertQuery(table, dataKeys) {
|
|
|
129
181
|
const col = table.columns.find((c) => c.tsName === k);
|
|
130
182
|
return quoteIdentifier(col?.sqlName ?? k);
|
|
131
183
|
});
|
|
132
|
-
const placeholders = dataKeys
|
|
184
|
+
const placeholders = dataKeys
|
|
185
|
+
.map((k, i) => {
|
|
186
|
+
const col = table.columns.find((c) => c.tsName === k);
|
|
187
|
+
return buildValuePlaceholder(col, i + 1);
|
|
188
|
+
})
|
|
189
|
+
.join(", ");
|
|
133
190
|
const selectCols = buildSelectColumns(table);
|
|
134
191
|
return `INSERT INTO ${quoteIdentifier(table.sqlName)} (${cols.join(", ")}) VALUES (${placeholders}) RETURNING ${selectCols}`;
|
|
135
192
|
}
|
|
136
193
|
export function buildUpdateQuery(table, dataKeys, whereSql) {
|
|
137
194
|
const sets = dataKeys.map((k, i) => {
|
|
138
195
|
const col = table.columns.find((c) => c.tsName === k);
|
|
139
|
-
return
|
|
196
|
+
return buildSetExpression(col, i + 1);
|
|
140
197
|
});
|
|
141
198
|
const selectCols = buildSelectColumns(table);
|
|
142
199
|
const whereOffset = dataKeys.length;
|
|
@@ -167,7 +224,7 @@ export function buildDeleteManyQuery(table, whereSql) {
|
|
|
167
224
|
export function buildUpdateManyQuery(table, dataKeys, whereSql) {
|
|
168
225
|
const sets = dataKeys.map((k, i) => {
|
|
169
226
|
const col = table.columns.find((c) => c.tsName === k);
|
|
170
|
-
return
|
|
227
|
+
return buildSetExpression(col, i + 1);
|
|
171
228
|
});
|
|
172
229
|
const whereOffset = dataKeys.length;
|
|
173
230
|
let sql = `UPDATE ${quoteIdentifier(table.sqlName)} SET ${sets.join(", ")}`;
|
|
@@ -179,17 +236,19 @@ export function buildUpdateManyQuery(table, dataKeys, whereSql) {
|
|
|
179
236
|
}
|
|
180
237
|
return sql;
|
|
181
238
|
}
|
|
182
|
-
export function dataToSqlValues(table, data) {
|
|
239
|
+
export function dataToSqlValues(table, data, options) {
|
|
183
240
|
const keys = [];
|
|
184
241
|
const values = [];
|
|
185
242
|
for (const [key, value] of Object.entries(data)) {
|
|
186
243
|
const col = table.columns.find((c) => c.tsName === key);
|
|
187
|
-
if (!col
|
|
244
|
+
if (!col)
|
|
245
|
+
continue;
|
|
246
|
+
if (options?.excludePrimary && col.primary)
|
|
188
247
|
continue;
|
|
189
248
|
if (value === undefined)
|
|
190
249
|
continue;
|
|
191
250
|
keys.push(key);
|
|
192
|
-
values.push(value);
|
|
251
|
+
values.push(serializeColumnValue(col, value));
|
|
193
252
|
}
|
|
194
253
|
return { keys, values };
|
|
195
254
|
}
|
|
@@ -197,7 +256,15 @@ export function rowToTs(table, row) {
|
|
|
197
256
|
const result = {};
|
|
198
257
|
for (const col of table.columns) {
|
|
199
258
|
if (col.sqlName in row) {
|
|
200
|
-
|
|
259
|
+
const raw = row[col.sqlName];
|
|
260
|
+
if (col.kind === "fk") {
|
|
261
|
+
result[col.tsName] = raw;
|
|
262
|
+
continue;
|
|
263
|
+
}
|
|
264
|
+
const plugin = getColumnType(col.kind);
|
|
265
|
+
result[col.tsName] = plugin?.deserializeValue
|
|
266
|
+
? plugin.deserializeValue(col, raw)
|
|
267
|
+
: raw;
|
|
201
268
|
}
|
|
202
269
|
}
|
|
203
270
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../src/runtime/query/compile.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../src/runtime/query/compile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/create.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO/C,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/create.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO/C,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAuL1D,wBAAsB,YAAY,CAChC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACJ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,GACA,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
|
-
import { randomUUID } from "node:crypto";
|
|
2
1
|
import { quoteIdentifier } from "../../dialect/postgres.js";
|
|
3
2
|
import { buildInsertQuery, dataToSqlValues, rowToTs, } from "./compile.js";
|
|
4
3
|
import { loadRelations } from "./find.js";
|
|
5
|
-
|
|
6
|
-
const prefix = tableAccessor.replace(/s$/, "").slice(0, 4);
|
|
7
|
-
return `${prefix}_${randomUUID().slice(0, 8)}`;
|
|
8
|
-
}
|
|
4
|
+
import { fillMissingPrimaryKeys } from "./primary-key.js";
|
|
9
5
|
async function resolveConnectOrCreate(executor, manifest, targetAccessor, items) {
|
|
10
6
|
const ids = [];
|
|
11
7
|
const targetTable = manifest.tables[targetAccessor];
|
|
@@ -24,14 +20,8 @@ async function resolveConnectOrCreate(executor, manifest, targetAccessor, items)
|
|
|
24
20
|
}
|
|
25
21
|
}
|
|
26
22
|
const createData = { ...item.create };
|
|
27
|
-
|
|
28
|
-
createData["id"] = generateId(targetAccessor);
|
|
29
|
-
}
|
|
23
|
+
fillMissingPrimaryKeys(targetTable, createData);
|
|
30
24
|
const { keys, values } = dataToSqlValues(targetTable, createData);
|
|
31
|
-
if (!keys.includes("id")) {
|
|
32
|
-
keys.unshift("id");
|
|
33
|
-
values.unshift(createData["id"]);
|
|
34
|
-
}
|
|
35
25
|
const sql = buildInsertQuery(targetTable, keys);
|
|
36
26
|
const row = await executor.queryOne(sql, values);
|
|
37
27
|
if (row)
|
|
@@ -60,80 +50,79 @@ async function insertJunctionRows(executor, manifest, throughAccessor, leftFkCol
|
|
|
60
50
|
data[col.tsName] = new Date();
|
|
61
51
|
}
|
|
62
52
|
}
|
|
53
|
+
fillMissingPrimaryKeys(throughTable, data);
|
|
63
54
|
const { keys, values } = dataToSqlValues(throughTable, data);
|
|
64
55
|
const sql = buildInsertQuery(throughTable, keys);
|
|
65
56
|
await executor.query(sql, values);
|
|
66
57
|
}
|
|
67
58
|
}
|
|
68
|
-
|
|
59
|
+
async function runCreate(executor, manifest, tableAccessor, args) {
|
|
69
60
|
const table = manifest.tables[tableAccessor];
|
|
70
61
|
if (!table)
|
|
71
62
|
throw new Error(`Unknown table: ${tableAccessor}`);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
63
|
+
const scalarData = {};
|
|
64
|
+
const relationWrites = [];
|
|
65
|
+
for (const [key, value] of Object.entries(args.data)) {
|
|
66
|
+
const col = table.columns.find((c) => c.tsName === key);
|
|
67
|
+
if (col) {
|
|
68
|
+
scalarData[key] = value;
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
71
|
+
const rel = table.relations.find((r) => r.name === key);
|
|
72
|
+
if (rel && value && typeof value === "object") {
|
|
73
|
+
const relValue = value;
|
|
74
|
+
if ("connect" in relValue) {
|
|
75
|
+
relationWrites.push({ relationName: key, type: "connect", value: relValue["connect"] });
|
|
80
76
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
}
|
|
87
|
-
else if ("connectOrCreate" in relValue) {
|
|
88
|
-
relationWrites.push({
|
|
89
|
-
relationName: key,
|
|
90
|
-
type: "connectOrCreate",
|
|
91
|
-
value: relValue["connectOrCreate"],
|
|
92
|
-
});
|
|
93
|
-
}
|
|
77
|
+
else if ("connectOrCreate" in relValue) {
|
|
78
|
+
relationWrites.push({
|
|
79
|
+
relationName: key,
|
|
80
|
+
type: "connectOrCreate",
|
|
81
|
+
value: relValue["connectOrCreate"],
|
|
82
|
+
});
|
|
94
83
|
}
|
|
95
84
|
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
scalarData[rel.fkColumn] = connect.id;
|
|
105
|
-
}
|
|
85
|
+
}
|
|
86
|
+
fillMissingPrimaryKeys(table, scalarData);
|
|
87
|
+
for (const write of relationWrites) {
|
|
88
|
+
if (write.type === "connect") {
|
|
89
|
+
const connect = write.value;
|
|
90
|
+
const rel = table.relations.find((r) => r.name === write.relationName);
|
|
91
|
+
if (rel && rel.cardinality === "one") {
|
|
92
|
+
scalarData[rel.fkColumn] = connect.id;
|
|
106
93
|
}
|
|
107
94
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
if (
|
|
121
|
-
const
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
const items = write.value;
|
|
127
|
-
const ids = await resolveConnectOrCreate(tx, manifest, targetAccessor, items);
|
|
128
|
-
await insertJunctionRows(tx, manifest, m2m.throughAccessor, m2m.leftFkColumn, m2m.rightFkColumn, recordId, ids);
|
|
129
|
-
}
|
|
95
|
+
}
|
|
96
|
+
const { keys, values } = dataToSqlValues(table, scalarData);
|
|
97
|
+
const insertSql = buildInsertQuery(table, keys);
|
|
98
|
+
const row = await executor.queryOne(insertSql, values);
|
|
99
|
+
if (!row)
|
|
100
|
+
throw new Error("Insert failed");
|
|
101
|
+
const result = rowToTs(table, row);
|
|
102
|
+
const recordId = String(result["id"]);
|
|
103
|
+
for (const write of relationWrites) {
|
|
104
|
+
if (write.type === "connectOrCreate") {
|
|
105
|
+
const m2m = manifest.manyToMany.find((m) => (m.leftAccessor === tableAccessor && m.as === write.relationName) ||
|
|
106
|
+
(m.rightAccessor === tableAccessor && m.inverse === write.relationName));
|
|
107
|
+
if (m2m) {
|
|
108
|
+
const isLeft = m2m.leftAccessor === tableAccessor;
|
|
109
|
+
const targetAccessor = isLeft ? m2m.rightAccessor : m2m.leftAccessor;
|
|
110
|
+
const items = write.value;
|
|
111
|
+
const ids = await resolveConnectOrCreate(executor, manifest, targetAccessor, items);
|
|
112
|
+
await insertJunctionRows(executor, manifest, m2m.throughAccessor, m2m.leftFkColumn, m2m.rightFkColumn, recordId, ids);
|
|
130
113
|
}
|
|
131
114
|
}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
115
|
+
}
|
|
116
|
+
if (args.with) {
|
|
117
|
+
const [withLoaded] = await loadRelations(executor, manifest, table, [result], args.with);
|
|
118
|
+
return withLoaded ?? result;
|
|
119
|
+
}
|
|
120
|
+
return result;
|
|
121
|
+
}
|
|
122
|
+
export async function createRecord(executor, manifest, tableAccessor, args) {
|
|
123
|
+
if (executor.inTransaction) {
|
|
124
|
+
return runCreate(executor, manifest, tableAccessor, args);
|
|
125
|
+
}
|
|
126
|
+
return executor.transaction((tx) => runCreate(tx, manifest, tableAccessor, args));
|
|
138
127
|
}
|
|
139
128
|
//# sourceMappingURL=create.js.map
|