drizzle-orm 0.17.2 → 0.17.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.
Files changed (73) hide show
  1. package/aws-data-api/common/index.d.ts +9 -0
  2. package/aws-data-api/common/index.d.ts.map +1 -0
  3. package/aws-data-api/common/index.js +93 -0
  4. package/aws-data-api/common/index.js.map +1 -0
  5. package/aws-data-api/pg/driver.d.ts +30 -0
  6. package/aws-data-api/pg/driver.d.ts.map +1 -0
  7. package/aws-data-api/pg/driver.js +34 -0
  8. package/aws-data-api/pg/driver.js.map +1 -0
  9. package/aws-data-api/pg/index.d.ts +3 -0
  10. package/aws-data-api/pg/index.d.ts.map +1 -0
  11. package/aws-data-api/pg/index.js +19 -0
  12. package/aws-data-api/pg/index.js.map +1 -0
  13. package/aws-data-api/pg/migrator.d.ts +4 -0
  14. package/aws-data-api/pg/migrator.d.ts.map +1 -0
  15. package/aws-data-api/pg/migrator.js +65 -0
  16. package/aws-data-api/pg/migrator.js.map +1 -0
  17. package/aws-data-api/pg/session.d.ts +41 -0
  18. package/aws-data-api/pg/session.d.ts.map +1 -0
  19. package/aws-data-api/pg/session.js +103 -0
  20. package/aws-data-api/pg/session.js.map +1 -0
  21. package/mysql-core/query-builders/delete.d.ts +1 -1
  22. package/mysql-core/query-builders/delete.d.ts.map +1 -1
  23. package/mysql-core/query-builders/delete.js +14 -2
  24. package/mysql-core/query-builders/delete.js.map +1 -1
  25. package/mysql-core/query-builders/insert.d.ts +1 -1
  26. package/mysql-core/query-builders/insert.d.ts.map +1 -1
  27. package/mysql-core/query-builders/insert.js +14 -2
  28. package/mysql-core/query-builders/insert.js.map +1 -1
  29. package/mysql-core/query-builders/select.d.ts +1 -1
  30. package/mysql-core/query-builders/select.d.ts.map +1 -1
  31. package/mysql-core/query-builders/select.js +14 -2
  32. package/mysql-core/query-builders/select.js.map +1 -1
  33. package/mysql-core/query-builders/update.d.ts +1 -1
  34. package/mysql-core/query-builders/update.d.ts.map +1 -1
  35. package/mysql-core/query-builders/update.js +14 -2
  36. package/mysql-core/query-builders/update.js.map +1 -1
  37. package/package.json +7 -2
  38. package/pg-core/query-builders/delete.d.ts +1 -1
  39. package/pg-core/query-builders/delete.d.ts.map +1 -1
  40. package/pg-core/query-builders/delete.js +14 -2
  41. package/pg-core/query-builders/delete.js.map +1 -1
  42. package/pg-core/query-builders/insert.d.ts +1 -1
  43. package/pg-core/query-builders/insert.d.ts.map +1 -1
  44. package/pg-core/query-builders/insert.js +14 -2
  45. package/pg-core/query-builders/insert.js.map +1 -1
  46. package/pg-core/query-builders/select.d.ts +1 -1
  47. package/pg-core/query-builders/select.d.ts.map +1 -1
  48. package/pg-core/query-builders/select.js +14 -2
  49. package/pg-core/query-builders/select.js.map +1 -1
  50. package/pg-core/query-builders/update.d.ts +1 -1
  51. package/pg-core/query-builders/update.d.ts.map +1 -1
  52. package/pg-core/query-builders/update.js +14 -2
  53. package/pg-core/query-builders/update.js.map +1 -1
  54. package/sql/index.d.ts +2 -0
  55. package/sql/index.d.ts.map +1 -1
  56. package/sql/index.js +29 -1
  57. package/sql/index.js.map +1 -1
  58. package/sqlite-core/query-builders/delete.d.ts +1 -1
  59. package/sqlite-core/query-builders/delete.d.ts.map +1 -1
  60. package/sqlite-core/query-builders/delete.js +14 -2
  61. package/sqlite-core/query-builders/delete.js.map +1 -1
  62. package/sqlite-core/query-builders/insert.d.ts +1 -1
  63. package/sqlite-core/query-builders/insert.d.ts.map +1 -1
  64. package/sqlite-core/query-builders/insert.js +14 -2
  65. package/sqlite-core/query-builders/insert.js.map +1 -1
  66. package/sqlite-core/query-builders/select.d.ts +1 -1
  67. package/sqlite-core/query-builders/select.d.ts.map +1 -1
  68. package/sqlite-core/query-builders/select.js +14 -3
  69. package/sqlite-core/query-builders/select.js.map +1 -1
  70. package/sqlite-core/query-builders/update.d.ts +1 -1
  71. package/sqlite-core/query-builders/update.d.ts.map +1 -1
  72. package/sqlite-core/query-builders/update.js +14 -2
  73. package/sqlite-core/query-builders/update.js.map +1 -1
@@ -0,0 +1,9 @@
1
+ import { Field, TypeHint } from "@aws-sdk/client-rds-data";
2
+ import { QueryTypingsValue } from "../../sql";
3
+ export declare function getValueFromDataApi(row: Field): string | number | boolean | string[] | Uint8Array | null;
4
+ export declare function typingsToAwsTypeHint(typings?: QueryTypingsValue): TypeHint | undefined;
5
+ export declare function toValueParam(value: any, typings?: QueryTypingsValue): {
6
+ value: Field;
7
+ typeHint?: TypeHint;
8
+ };
9
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/aws-data-api/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAE1C,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,KAAK,4DAqB7C;AAED,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,QAAQ,GAAG,SAAS,CAgBtF;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAAE,CA2B3G"}
@@ -0,0 +1,93 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.toValueParam = exports.typingsToAwsTypeHint = exports.getValueFromDataApi = void 0;
4
+ const client_rds_data_1 = require("@aws-sdk/client-rds-data");
5
+ function getValueFromDataApi(row) {
6
+ if (typeof row.stringValue !== 'undefined') {
7
+ return row.stringValue;
8
+ }
9
+ else if (typeof row.booleanValue !== 'undefined') {
10
+ return row.booleanValue;
11
+ }
12
+ else if (typeof row.doubleValue !== 'undefined') {
13
+ return row.doubleValue;
14
+ }
15
+ else if (typeof row.isNull !== 'undefined') {
16
+ return null;
17
+ }
18
+ else if (typeof row.longValue !== 'undefined') {
19
+ return row.longValue;
20
+ }
21
+ else if (typeof row.blobValue !== 'undefined') {
22
+ return row.blobValue;
23
+ }
24
+ else if (typeof row.arrayValue !== 'undefined') {
25
+ if (typeof row.arrayValue.stringValues !== 'undefined') {
26
+ return row.arrayValue.stringValues;
27
+ }
28
+ throw Error('Unknown array type');
29
+ }
30
+ else {
31
+ throw Error('Unknown type');
32
+ }
33
+ }
34
+ exports.getValueFromDataApi = getValueFromDataApi;
35
+ function typingsToAwsTypeHint(typings) {
36
+ if (typings === 'date') {
37
+ return client_rds_data_1.TypeHint.DATE;
38
+ }
39
+ else if (typings === 'decimal') {
40
+ return client_rds_data_1.TypeHint.DECIMAL;
41
+ }
42
+ else if (typings === 'json') {
43
+ return client_rds_data_1.TypeHint.JSON;
44
+ }
45
+ else if (typings === 'time') {
46
+ return client_rds_data_1.TypeHint.TIME;
47
+ }
48
+ else if (typings === 'timestamp') {
49
+ return client_rds_data_1.TypeHint.TIMESTAMP;
50
+ }
51
+ else if (typings === 'uuid') {
52
+ return client_rds_data_1.TypeHint.UUID;
53
+ }
54
+ else {
55
+ return undefined;
56
+ }
57
+ }
58
+ exports.typingsToAwsTypeHint = typingsToAwsTypeHint;
59
+ function toValueParam(value, typings) {
60
+ let response = {
61
+ value: {},
62
+ typeHint: typingsToAwsTypeHint(typings),
63
+ };
64
+ if (value === null) {
65
+ response.value = { isNull: true };
66
+ }
67
+ else if (typeof value === 'string') {
68
+ if (response.typeHint === 'DATE') {
69
+ response.value = { stringValue: value.split('T')[0] };
70
+ }
71
+ else {
72
+ response.value = { stringValue: value };
73
+ }
74
+ }
75
+ else if (typeof value === 'number' && Number.isInteger(value)) {
76
+ response.value = { longValue: value };
77
+ }
78
+ else if (typeof value === 'number' && !Number.isInteger(value)) {
79
+ response.value = { doubleValue: value };
80
+ }
81
+ else if (typeof value === 'boolean') {
82
+ response.value = { booleanValue: value };
83
+ }
84
+ else if (value instanceof Date) {
85
+ response.value = { stringValue: value.toISOString().replace('T', ' ').replace('Z', '') };
86
+ }
87
+ else {
88
+ throw Error(`Unknown type for ${value}`);
89
+ }
90
+ return response;
91
+ }
92
+ exports.toValueParam = toValueParam;
93
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/aws-data-api/common/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,30 @@
1
+ import { Logger } from '../../logger';
2
+ import { PgDatabase } from '../../pg-core/db';
3
+ import { PgDialect } from '../../pg-core/dialect';
4
+ import { AwsDataApiClient, AwsDataApiPgQueryResultHKT, AwsDataApiSession } from './session';
5
+ export interface PgDriverOptions {
6
+ logger?: Logger;
7
+ database: string;
8
+ resourceArn: string;
9
+ secretArn: string;
10
+ }
11
+ export declare class AwsDataApiDriver {
12
+ private client;
13
+ private dialect;
14
+ private options;
15
+ constructor(client: AwsDataApiClient, dialect: PgDialect, options: PgDriverOptions);
16
+ createSession(): AwsDataApiSession;
17
+ }
18
+ export interface DrizzleConfig {
19
+ logger?: Logger;
20
+ database: string;
21
+ resourceArn: string;
22
+ secretArn: string;
23
+ }
24
+ export declare type AwsDataApiPgDatabase = PgDatabase<AwsDataApiPgQueryResultHKT, AwsDataApiSession>;
25
+ export declare class AwsPgDialect extends PgDialect {
26
+ escapeName(name: string): string;
27
+ escapeParam(num: number): string;
28
+ }
29
+ export declare function drizzle(client: AwsDataApiClient, config: DrizzleConfig): AwsDataApiPgDatabase;
30
+ //# sourceMappingURL=driver.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../../src/aws-data-api/pg/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE5F,MAAM,WAAW,eAAe;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAFP,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,eAAe;IAIjC,aAAa,IAAI,iBAAiB;CAGlC;AAED,MAAM,WAAW,aAAa;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,oBAAY,oBAAoB,GAAG,UAAU,CAAC,0BAA0B,EAAE,iBAAiB,CAAC,CAAC;AAE7F,qBAAa,YAAa,SAAQ,SAAS;IACjC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAGzC;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,GAAG,oBAAoB,CAK7F"}
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.drizzle = exports.AwsPgDialect = exports.AwsDataApiDriver = void 0;
4
+ const db_1 = require("../../pg-core/db");
5
+ const dialect_1 = require("../../pg-core/dialect");
6
+ const session_1 = require("./session");
7
+ class AwsDataApiDriver {
8
+ constructor(client, dialect, options) {
9
+ this.client = client;
10
+ this.dialect = dialect;
11
+ this.options = options;
12
+ }
13
+ createSession() {
14
+ return new session_1.AwsDataApiSession(this.client, this.dialect, this.options);
15
+ }
16
+ }
17
+ exports.AwsDataApiDriver = AwsDataApiDriver;
18
+ class AwsPgDialect extends dialect_1.PgDialect {
19
+ escapeName(name) {
20
+ return `"${name}"`;
21
+ }
22
+ escapeParam(num) {
23
+ return `:${num + 1}`;
24
+ }
25
+ }
26
+ exports.AwsPgDialect = AwsPgDialect;
27
+ function drizzle(client, config) {
28
+ const dialect = new AwsPgDialect();
29
+ const driver = new AwsDataApiDriver(client, dialect, config);
30
+ const session = driver.createSession();
31
+ return new db_1.PgDatabase(dialect, session);
32
+ }
33
+ exports.drizzle = drizzle;
34
+ //# sourceMappingURL=driver.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../src/aws-data-api/pg/driver.ts"],"names":[],"mappings":";;;AACA,qCAA0C;AAC1C,+CAA8C;AAC9C,uCAA4F;AAS5F,MAAa,gBAAgB;IAC5B,YACS,MAAwB,EACxB,OAAkB,EAClB,OAAwB;QAFxB,WAAM,GAAN,MAAM,CAAkB;QACxB,YAAO,GAAP,OAAO,CAAW;QAClB,YAAO,GAAP,OAAO,CAAiB;IAEjC,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,2BAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACvE,CAAC;CACD;AAXD,4CAWC;AAWD,MAAa,YAAa,SAAQ,mBAAS;IACjC,UAAU,CAAC,IAAY;QAC/B,OAAO,IAAI,IAAI,GAAG,CAAC;IACpB,CAAC;IAEQ,WAAW,CAAC,GAAW;QAC/B,OAAO,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;IACtB,CAAC;CACD;AARD,oCAQC;AAED,SAAgB,OAAO,CAAC,MAAwB,EAAE,MAAqB;IACtE,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IACnC,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;IACvC,OAAO,IAAI,eAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AALD,0BAKC"}
@@ -0,0 +1,3 @@
1
+ export * from './driver';
2
+ export * from './session';
3
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/aws-data-api/pg/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC"}
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
+ };
16
+ Object.defineProperty(exports, "__esModule", { value: true });
17
+ __exportStar(require("./driver"), exports);
18
+ __exportStar(require("./session"), exports);
19
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/aws-data-api/pg/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,4CAA0B"}
@@ -0,0 +1,4 @@
1
+ import { MigrationConfig } from '../../migrator';
2
+ import { AwsDataApiPgDatabase } from './driver';
3
+ export declare function migrate(db: AwsDataApiPgDatabase, config: string | MigrationConfig): Promise<void>;
4
+ //# sourceMappingURL=migrator.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../../src/aws-data-api/pg/migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAsB,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAGhD,wBAAsB,OAAO,CAAC,EAAE,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,iBAwCvF"}
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __asyncValues = (this && this.__asyncValues) || function (o) {
12
+ if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
13
+ var m = o[Symbol.asyncIterator], i;
14
+ return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
15
+ function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
16
+ function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
17
+ };
18
+ Object.defineProperty(exports, "__esModule", { value: true });
19
+ exports.migrate = void 0;
20
+ const migrator_1 = require("../../migrator");
21
+ const sql_1 = require("../../sql");
22
+ function migrate(db, config) {
23
+ var e_1, _a;
24
+ return __awaiter(this, void 0, void 0, function* () {
25
+ const migrations = (0, migrator_1.readMigrationFiles)(config);
26
+ // Write own aws datapi migrator
27
+ const session = db.session;
28
+ const migrationTableCreate = (0, sql_1.sql) `CREATE TABLE IF NOT EXISTS "drizzle"."__drizzle_migrations" (
29
+ id SERIAL PRIMARY KEY,
30
+ hash text NOT NULL,
31
+ created_at bigint
32
+ )`;
33
+ yield session.execute((0, sql_1.sql) `CREATE SCHEMA IF NOT EXISTS "drizzle"`);
34
+ yield session.execute(migrationTableCreate);
35
+ const dbMigrations = yield session.execute((0, sql_1.sql) `SELECT id, hash, created_at FROM "drizzle"."__drizzle_migrations" ORDER BY created_at DESC LIMIT 1`);
36
+ const lastDbMigration = dbMigrations[0];
37
+ const transactionId = yield session.beginTransaction();
38
+ try {
39
+ try {
40
+ for (var migrations_1 = __asyncValues(migrations), migrations_1_1; migrations_1_1 = yield migrations_1.next(), !migrations_1_1.done;) {
41
+ const migration = migrations_1_1.value;
42
+ if (!lastDbMigration
43
+ || parseInt(lastDbMigration.created_at, 10) < migration.folderMillis) {
44
+ yield session.executeWithTransaction(sql_1.sql.raw(migration.sql), transactionId);
45
+ yield session.executeWithTransaction((0, sql_1.sql) `INSERT INTO "drizzle"."__drizzle_migrations" ("hash", "created_at") VALUES(${migration.hash}, ${migration.folderMillis})`, transactionId);
46
+ }
47
+ }
48
+ }
49
+ catch (e_1_1) { e_1 = { error: e_1_1 }; }
50
+ finally {
51
+ try {
52
+ if (migrations_1_1 && !migrations_1_1.done && (_a = migrations_1.return)) yield _a.call(migrations_1);
53
+ }
54
+ finally { if (e_1) throw e_1.error; }
55
+ }
56
+ yield session.commitTransaction(transactionId);
57
+ }
58
+ catch (e) {
59
+ yield session.rollbackTransaction(transactionId);
60
+ throw e;
61
+ }
62
+ });
63
+ }
64
+ exports.migrate = migrate;
65
+ //# sourceMappingURL=migrator.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../../src/aws-data-api/pg/migrator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,yCAAiE;AACjE,+BAA4B;AAI5B,SAAsB,OAAO,CAAC,EAAwB,EAAE,MAAgC;;;QACvF,MAAM,UAAU,GAAG,IAAA,6BAAkB,EAAC,MAAM,CAAC,CAAC;QAE9C,gCAAgC;QAChC,MAAM,OAAO,GAAG,EAAE,CAAC,OAA4B,CAAC;QAEhD,MAAM,oBAAoB,GAAG,IAAA,SAAG,EAAA;;;;GAI9B,CAAC;QACH,MAAM,OAAO,CAAC,OAAO,CAAC,IAAA,SAAG,EAAA,uCAAuC,CAAC,CAAC;QAClE,MAAM,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAE5C,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,OAAO,CACzC,IAAA,SAAG,EAAA,oGAAoG,CACvG,CAAC;QAEF,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAEvD,IAAI;;gBACH,KAA8B,IAAA,eAAA,cAAA,UAAU,CAAA,gBAAA;oBAA7B,MAAM,SAAS,uBAAA,CAAA;oBACzB,IACC,CAAC,eAAe;2BACb,QAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,YAAY,EACnE;wBACD,MAAM,OAAO,CAAC,sBAAsB,CAAC,SAAG,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,CAAC;wBAC5E,MAAM,OAAO,CAAC,sBAAsB,CACnC,IAAA,SAAG,EAAA,8EAA8E,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,YAAY,GAAG,EAC7H,aAAa,CACb,CAAC;qBACF;iBACD;;;;;;;;;YAED,MAAM,OAAO,CAAC,iBAAiB,CAAC,aAAc,CAAC,CAAC;SAChD;QAAC,OAAO,CAAC,EAAE;YACX,MAAM,OAAO,CAAC,mBAAmB,CAAC,aAAc,CAAC,CAAC;YAClD,MAAM,CAAC,CAAC;SACR;;CACD;AAxCD,0BAwCC"}
@@ -0,0 +1,41 @@
1
+ import { ExecuteStatementCommandOutput, RDSDataClient } from '@aws-sdk/client-rds-data';
2
+ import { Logger } from '../../logger';
3
+ import { SelectFieldsOrdered } from '../../operations';
4
+ import { PgDialect, PgSession, PreparedQuery, PreparedQueryConfig, QueryResultHKT } from '../../pg-core';
5
+ import { Query, QueryTypingsValue, SQL } from '../../sql';
6
+ export declare type AwsDataApiClient = RDSDataClient;
7
+ export declare class AwsDataApiPreparedQuery<T extends PreparedQueryConfig> extends PreparedQuery<T> {
8
+ private client;
9
+ private params;
10
+ private typings;
11
+ private options;
12
+ private fields;
13
+ private rawQuery;
14
+ constructor(client: AwsDataApiClient, queryString: string, params: unknown[], typings: QueryTypingsValue[], options: AwsDataApiSessionOptions, fields: SelectFieldsOrdered | undefined, name: string | undefined, transactionId: string | undefined);
15
+ execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
16
+ all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
17
+ values(placeholderValues?: Record<string, unknown> | undefined): Promise<T['values']>;
18
+ }
19
+ export interface AwsDataApiSessionOptions {
20
+ logger?: Logger;
21
+ database: string;
22
+ resourceArn: string;
23
+ secretArn: string;
24
+ }
25
+ export declare class AwsDataApiSession extends PgSession {
26
+ private client;
27
+ private options;
28
+ private rawQuery;
29
+ constructor(client: AwsDataApiClient, dialect: PgDialect, options: AwsDataApiSessionOptions);
30
+ prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectFieldsOrdered | undefined, name: string | undefined): PreparedQuery<T>;
31
+ prepareQueryWithTransaction<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectFieldsOrdered | undefined, name: string | undefined, transactionId: string | undefined): PreparedQuery<T>;
32
+ executeWithTransaction<T>(query: SQL, transactionId: string | undefined): Promise<T>;
33
+ execute<T>(query: SQL): Promise<T>;
34
+ beginTransaction(): Promise<string | undefined>;
35
+ commitTransaction(transactionId: string): Promise<void>;
36
+ rollbackTransaction(transactionId: string): Promise<void>;
37
+ }
38
+ export interface AwsDataApiPgQueryResultHKT extends QueryResultHKT {
39
+ type: ExecuteStatementCommandOutput;
40
+ }
41
+ //# sourceMappingURL=session.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/aws-data-api/pg/session.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,103 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.AwsDataApiSession = exports.AwsDataApiPreparedQuery = void 0;
13
+ const client_rds_data_1 = require("@aws-sdk/client-rds-data");
14
+ const pg_core_1 = require("../../pg-core");
15
+ const sql_1 = require("../../sql");
16
+ const utils_1 = require("../../utils");
17
+ const common_1 = require("../common");
18
+ class AwsDataApiPreparedQuery extends pg_core_1.PreparedQuery {
19
+ constructor(client, queryString, params, typings, options, fields, name, transactionId) {
20
+ super();
21
+ this.client = client;
22
+ this.params = params;
23
+ this.typings = typings;
24
+ this.options = options;
25
+ this.fields = fields;
26
+ this.rawQuery = new client_rds_data_1.ExecuteStatementCommand({
27
+ sql: queryString,
28
+ parameters: [],
29
+ secretArn: options.secretArn,
30
+ resourceArn: options.resourceArn,
31
+ database: options.database,
32
+ transactionId,
33
+ });
34
+ }
35
+ execute(placeholderValues = {}) {
36
+ var _a, _b;
37
+ return __awaiter(this, void 0, void 0, function* () {
38
+ const params = (0, sql_1.fillPlaceholders)(this.params, placeholderValues);
39
+ this.rawQuery.input.parameters = params.map((param, index) => (Object.assign({ name: `${index + 1}` }, (0, common_1.toValueParam)(param, this.typings[index]))));
40
+ (_a = this.options.logger) === null || _a === void 0 ? void 0 : _a.logQuery(this.rawQuery.input.sql, this.rawQuery.input.parameters);
41
+ const { fields } = this;
42
+ if (!fields) {
43
+ return yield this.client.send(this.rawQuery);
44
+ }
45
+ const result = yield this.client.send(this.rawQuery);
46
+ return (_b = result.records) === null || _b === void 0 ? void 0 : _b.map((result) => {
47
+ const mappedResult = result.map((res) => (0, common_1.getValueFromDataApi)(res));
48
+ return (0, utils_1.mapResultRow)(fields, mappedResult);
49
+ });
50
+ });
51
+ }
52
+ all(placeholderValues) {
53
+ throw new Error('Method not implemented.');
54
+ }
55
+ values(placeholderValues) {
56
+ throw new Error('Method not implemented.');
57
+ }
58
+ }
59
+ exports.AwsDataApiPreparedQuery = AwsDataApiPreparedQuery;
60
+ class AwsDataApiSession extends pg_core_1.PgSession {
61
+ constructor(client, dialect, options) {
62
+ super(dialect);
63
+ this.client = client;
64
+ this.options = options;
65
+ this.rawQuery = {
66
+ secretArn: options.secretArn,
67
+ resourceArn: options.resourceArn,
68
+ database: options.database,
69
+ };
70
+ }
71
+ prepareQuery(query, fields, name) {
72
+ var _a;
73
+ return new AwsDataApiPreparedQuery(this.client, query.sql, query.params, (_a = query.typings) !== null && _a !== void 0 ? _a : [], this.options, fields, name, undefined);
74
+ }
75
+ prepareQueryWithTransaction(query, fields, name, transactionId) {
76
+ var _a;
77
+ return new AwsDataApiPreparedQuery(this.client, query.sql, query.params, (_a = query.typings) !== null && _a !== void 0 ? _a : [], this.options, fields, name, transactionId);
78
+ }
79
+ executeWithTransaction(query, transactionId) {
80
+ return this.prepareQueryWithTransaction(this.dialect.sqlToQuery(query), undefined, undefined, transactionId).execute();
81
+ }
82
+ execute(query) {
83
+ return this.prepareQuery(this.dialect.sqlToQuery(query), undefined, undefined).execute();
84
+ }
85
+ beginTransaction() {
86
+ return __awaiter(this, void 0, void 0, function* () {
87
+ const transactionRes = yield this.client.send(new client_rds_data_1.BeginTransactionCommand(this.rawQuery));
88
+ return transactionRes.transactionId;
89
+ });
90
+ }
91
+ commitTransaction(transactionId) {
92
+ return __awaiter(this, void 0, void 0, function* () {
93
+ yield this.client.send(new client_rds_data_1.CommitTransactionCommand(Object.assign(Object.assign({}, this.rawQuery), { transactionId })));
94
+ });
95
+ }
96
+ rollbackTransaction(transactionId) {
97
+ return __awaiter(this, void 0, void 0, function* () {
98
+ yield this.client.send(new client_rds_data_1.RollbackTransactionCommand(Object.assign(Object.assign({}, this.rawQuery), { transactionId })));
99
+ });
100
+ }
101
+ }
102
+ exports.AwsDataApiSession = AwsDataApiSession;
103
+ //# sourceMappingURL=session.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/aws-data-api/pg/session.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,7 @@ export declare class MySqlDelete<TTable extends AnyMySqlTable, TReturning = unde
18
18
  private config;
19
19
  constructor(table: TTable, session: MySqlSession, dialect: MySqlDialect);
20
20
  where(where: SQL | undefined): Omit<this, 'where'>;
21
- toSQL(): Query;
21
+ toSQL(): Omit<Query, 'typings'>;
22
22
  private _prepare;
23
23
  prepare(name: string): PreparedQuery<PreparedQueryConfig & {
24
24
  execute: MySqlRawQueryResult;
@@ -1 +1 @@
1
- {"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/delete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC7G,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAE/C,MAAM,WAAW,iBAAiB;IACjC,KAAK,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;IACxB,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,CAAC,EAAE,mBAAmB,CAAC;CAChC;AAED,MAAM,WAAW,WAAW,CAC3B,MAAM,SAAS,aAAa,EAC5B,UAAU,GAAG,SAAS,CACrB,SAAQ,YAAY,CAAC,mBAAmB,CAAC;CAAG;AAE9C,qBAAa,WAAW,CACvB,MAAM,SAAS,aAAa,EAC5B,UAAU,GAAG,SAAS,CACrB,SAAQ,YAAY,CAAC,mBAAmB,CAAE,YAAW,UAAU;IAI/D,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IALhB,OAAO,CAAC,MAAM,CAAoB;gBAGzB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY;IAM9B,KAAK,CACJ,KAAK,EAAE,GAAG,GAAG,SAAS,GACpB,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;IAqBtB,KAAK,IAAI,KAAK;IAId,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CACnC,mBAAmB,GAAG;QACrB,OAAO,EAAE,mBAAmB,CAAC;KAC7B,CACD;IAIQ,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAEtD;CACF"}
1
+ {"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/delete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC7G,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAE/C,MAAM,WAAW,iBAAiB;IACjC,KAAK,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;IACxB,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,CAAC,EAAE,mBAAmB,CAAC;CAChC;AAED,MAAM,WAAW,WAAW,CAC3B,MAAM,SAAS,aAAa,EAC5B,UAAU,GAAG,SAAS,CACrB,SAAQ,YAAY,CAAC,mBAAmB,CAAC;CAAG;AAE9C,qBAAa,WAAW,CACvB,MAAM,SAAS,aAAa,EAC5B,UAAU,GAAG,SAAS,CACrB,SAAQ,YAAY,CAAC,mBAAmB,CAAE,YAAW,UAAU;IAI/D,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IALhB,OAAO,CAAC,MAAM,CAAoB;gBAGzB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY;IAM9B,KAAK,CACJ,KAAK,EAAE,GAAG,GAAG,SAAS,GACpB,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;IAqBtB,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;IAK/B,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CACnC,mBAAmB,GAAG;QACrB,OAAO,EAAE,mBAAmB,CAAC;KAC7B,CACD;IAIQ,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAEtD;CACF"}
@@ -1,4 +1,15 @@
1
1
  "use strict";
2
+ var __rest = (this && this.__rest) || function (s, e) {
3
+ var t = {};
4
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
5
+ t[p] = s[p];
6
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
7
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
8
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
9
+ t[p[i]] = s[p[i]];
10
+ }
11
+ return t;
12
+ };
2
13
  Object.defineProperty(exports, "__esModule", { value: true });
3
14
  exports.MySqlDelete = void 0;
4
15
  const query_promise_1 = require("../../query-promise");
@@ -32,10 +43,11 @@ class MySqlDelete extends query_promise_1.QueryPromise {
32
43
  return this.dialect.buildDeleteQuery(this.config);
33
44
  }
34
45
  toSQL() {
35
- return this.dialect.sqlToQuery(this.getSQL());
46
+ const _a = this.dialect.sqlToQuery(this.getSQL()), { typings } = _a, rest = __rest(_a, ["typings"]);
47
+ return rest;
36
48
  }
37
49
  _prepare(name) {
38
- return this.session.prepareQuery(this.toSQL(), this.config.returning, name);
50
+ return this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), this.config.returning, name);
39
51
  }
40
52
  prepare(name) {
41
53
  return this._prepare(name);
@@ -1 +1 @@
1
- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/delete.ts"],"names":[],"mappings":";;;AAIA,mDAA+C;AAc/C,MAAa,WAGX,SAAQ,4BAAiC;IAG1C,YACS,KAAa,EACb,OAAqB,EACrB,OAAqB;QAE7B,KAAK,EAAE,CAAC;QAJA,UAAK,GAAL,KAAK,CAAQ;QACb,YAAO,GAAP,OAAO,CAAc;QACrB,YAAO,GAAP,OAAO,CAAc;QAiDrB,YAAO,GAA2C,CAAC,iBAAiB,EAAE,EAAE;YAChF,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC,CAAC;QAhDD,IAAI,CAAC,MAAM,GAAG,EAAE,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CACJ,KAAsB;QAEtB,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,qFAAqF;IACrF,mDAAmD;IACnD,4BAA4B;IAC5B,4FAA4F;IAC5F,aAAa;IACb,wEAAwE;IACxE,6DAA6D;IAC7D,wDAAwD;IACxD,gBAAgB;IAChB,IAAI;IAEJ,gBAAgB;IAChB,MAAM;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,KAAK;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,CAAC;IAEO,QAAQ,CAAC,IAAa;QAK7B,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC7E,CAAC;IAED,OAAO,CAAC,IAAY;QAKnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;CAKD;AA7DD,kCA6DC"}
1
+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/delete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAIA,mDAA+C;AAc/C,MAAa,WAGX,SAAQ,4BAAiC;IAG1C,YACS,KAAa,EACb,OAAqB,EACrB,OAAqB;QAE7B,KAAK,EAAE,CAAC;QAJA,UAAK,GAAL,KAAK,CAAQ;QACb,YAAO,GAAP,OAAO,CAAc;QACrB,YAAO,GAAP,OAAO,CAAc;QAkDrB,YAAO,GAA2C,CAAC,iBAAiB,EAAE,EAAE;YAChF,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC,CAAC;QAjDD,IAAI,CAAC,MAAM,GAAG,EAAE,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CACJ,KAAsB;QAEtB,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,qFAAqF;IACrF,mDAAmD;IACnD,4BAA4B;IAC5B,4FAA4F;IAC5F,aAAa;IACb,wEAAwE;IACxE,6DAA6D;IAC7D,wDAAwD;IACxD,gBAAgB;IAChB,IAAI;IAEJ,gBAAgB;IAChB,MAAM;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,KAAK;QACJ,MAAM,KAAsB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAA5D,EAAE,OAAO,OAAmD,EAA9C,IAAI,cAAlB,WAAmB,CAAyC,CAAC;QACnE,OAAO,IAAI,CAAA;IACZ,CAAC;IAEO,QAAQ,CAAC,IAAa;QAK7B,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACvG,CAAC;IAED,OAAO,CAAC,IAAY;QAKnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;CAKD;AA9DD,kCA8DC"}
@@ -34,7 +34,7 @@ export declare class MySqlInsert<TTable extends AnyMySqlTable, TReturning = unde
34
34
  onDuplicateKeyUpdate(config: {
35
35
  set: MySqlUpdateSetSource<TTable>;
36
36
  }): this;
37
- toSQL(): Query;
37
+ toSQL(): Omit<Query, 'typings'>;
38
38
  private _prepare;
39
39
  prepare(name: string): PreparedQuery<PreparedQueryConfig & {
40
40
  execute: MySqlRawQueryResult;
@@ -1 +1 @@
1
- {"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC7G,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAO,UAAU,EAAE,MAAM,OAAO,CAAC;AAExE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,MAAM,WAAW,iBAAiB,CAAC,MAAM,SAAS,aAAa,GAAG,aAAa;IAC9E,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;IACtC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,SAAS,CAAC,EAAE,mBAAmB,CAAC;CAChC;AAED,oBAAY,oBAAoB,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;AAEpE,oBAAY,gBAAgB,CAAC,MAAM,SAAS,aAAa,IAAI;KAC3D,GAAG,IAAI,MAAM,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,WAAW;CAClG,CAAC;AAEF,qBAAa,kBAAkB,CAAC,MAAM,SAAS,aAAa;IAE1D,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAFP,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY;IAG9B,MAAM,CAAC,GAAG,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC;CAiBlE;AAED,MAAM,WAAW,WAAW,CAAC,MAAM,SAAS,aAAa,EAAE,UAAU,GAAG,SAAS,CAChF,SAAQ,YAAY,CAAC,mBAAmB,CAAC,EAAE,UAAU;CACpD;AACF,qBAAa,WAAW,CAAC,MAAM,SAAS,aAAa,EAAE,UAAU,GAAG,SAAS,CAAE,SAAQ,YAAY,CAAC,mBAAmB,CACtH,YAAW,UAAU;IAUpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IAThB,UAAkB,MAAM,EAAE,MAAM,CAAC;IACjC,UAAkB,OAAO,EAAE,UAAU,CAAC;IAEtC,OAAO,CAAC,MAAM,CAA4B;gBAGzC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EAC3B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY;IAuB9B,oBAAoB,CAAC,MAAM,EAAE;QAE5B,GAAG,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;KAClC,GAAG,IAAI;IAWR,KAAK,IAAI,KAAK;IAId,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CACnC,mBAAmB,GAAG;QACrB,OAAO,EAAE,mBAAmB,CAAC;KAC7B,CACD;IAIQ,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAEtD;CACF"}
1
+ {"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC7G,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAO,UAAU,EAAE,MAAM,OAAO,CAAC;AAExE,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,MAAM,WAAW,iBAAiB,CAAC,MAAM,SAAS,aAAa,GAAG,aAAa;IAC9E,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;IACtC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,SAAS,CAAC,EAAE,mBAAmB,CAAC;CAChC;AAED,oBAAY,oBAAoB,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;AAEpE,oBAAY,gBAAgB,CAAC,MAAM,SAAS,aAAa,IAAI;KAC3D,GAAG,IAAI,MAAM,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,WAAW;CAClG,CAAC;AAEF,qBAAa,kBAAkB,CAAC,MAAM,SAAS,aAAa;IAE1D,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAFP,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY;IAG9B,MAAM,CAAC,GAAG,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC;CAiBlE;AAED,MAAM,WAAW,WAAW,CAAC,MAAM,SAAS,aAAa,EAAE,UAAU,GAAG,SAAS,CAChF,SAAQ,YAAY,CAAC,mBAAmB,CAAC,EAAE,UAAU;CACpD;AACF,qBAAa,WAAW,CAAC,MAAM,SAAS,aAAa,EAAE,UAAU,GAAG,SAAS,CAAE,SAAQ,YAAY,CAAC,mBAAmB,CACtH,YAAW,UAAU;IAUpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IAThB,UAAkB,MAAM,EAAE,MAAM,CAAC;IACjC,UAAkB,OAAO,EAAE,UAAU,CAAC;IAEtC,OAAO,CAAC,MAAM,CAA4B;gBAGzC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EAC3B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY;IAuB9B,oBAAoB,CAAC,MAAM,EAAE;QAE5B,GAAG,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;KAClC,GAAG,IAAI;IAWR,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;IAK/B,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CACnC,mBAAmB,GAAG;QACrB,OAAO,EAAE,mBAAmB,CAAC;KAC7B,CACD;IAIQ,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAEtD;CACF"}
@@ -1,4 +1,15 @@
1
1
  "use strict";
2
+ var __rest = (this && this.__rest) || function (s, e) {
3
+ var t = {};
4
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
5
+ t[p] = s[p];
6
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
7
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
8
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
9
+ t[p[i]] = s[p[i]];
10
+ }
11
+ return t;
12
+ };
2
13
  Object.defineProperty(exports, "__esModule", { value: true });
3
14
  exports.MySqlInsert = exports.MySqlInsertBuilder = void 0;
4
15
  const utils_1 = require("../utils");
@@ -65,10 +76,11 @@ class MySqlInsert extends query_promise_1.QueryPromise {
65
76
  return this.dialect.buildInsertQuery(this.config);
66
77
  }
67
78
  toSQL() {
68
- return this.dialect.sqlToQuery(this.getSQL());
79
+ const _a = this.dialect.sqlToQuery(this.getSQL()), { typings } = _a, rest = __rest(_a, ["typings"]);
80
+ return rest;
69
81
  }
70
82
  _prepare(name) {
71
- return this.session.prepareQuery(this.toSQL(), this.config.returning, name);
83
+ return this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), this.config.returning, name);
72
84
  }
73
85
  prepare(name) {
74
86
  return this._prepare(name);
@@ -1 +1 @@
1
- {"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/insert.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/insert.ts"],"names":[],"mappings":"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"}
@@ -29,7 +29,7 @@ export declare class MySqlSelect<TTable extends AnyMySqlTable, TResult = InferMo
29
29
  orderBy(...columns: SQL[]): Omit<this, 'where' | `${JoinType}Join` | 'orderBy'>;
30
30
  limit(limit: number): Omit<this, 'where' | `${JoinType}Join` | 'limit'>;
31
31
  offset(offset: number): Omit<this, 'where' | `${JoinType}Join` | 'offset'>;
32
- toSQL(): Query;
32
+ toSQL(): Omit<Query, 'typings'>;
33
33
  private _prepare;
34
34
  prepare(name: string): PreparedQuery<PreparedQueryConfig & {
35
35
  execute: SelectResult<TResult, TSelectMode, TJoinsNotNullable>[];
@@ -1 +1 @@
1
- {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE/E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAG/C,OAAO,EAEN,MAAM,EACN,eAAe,EACf,QAAQ,EACR,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,WAAW,CAC3B,MAAM,SAAS,aAAa,EAC5B,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,EAC5B,WAAW,SAAS,UAAU,GAAG,QAAQ,EACzC,iBAAiB,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,CAC7G,SAAQ,YAAY,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,CAAC,EAAE,UAAU;CAAG;AAE9F,qBAAa,WAAW,CACvB,MAAM,SAAS,aAAa,EAE5B,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,EAC5B,WAAW,SAAS,UAAU,GAAG,QAAQ,EACzC,iBAAiB,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,CAC7G,SAAQ,YAAY,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,CAAE,YAAW,UAAU;IAYnG,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IAZhB,UAAkB,MAAM,EAAE,MAAM,CAAC;IACjC,UAAkB,WAAW,EAAE,WAAW,CAAC;IAC3C,UAAkB,OAAO,EAAE,OAAO,CAAC;IAEnC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,gBAAgB,CAA0B;gBAGjD,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACjC,MAAM,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EAC3B,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY;IAY9B,OAAO,CAAC,UAAU;IA+ClB,QAAQ,kEAA2B;IAEnC,SAAS,mEAA4B;IAErC,SAAS,mEAA4B;IAErC,QAAQ,kEAA2B;IAEnC,MAAM,CAAC,OAAO,SAAS,YAAY,EAClC,MAAM,EAAE,OAAO,GACb,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,CAAC,EAAE,QAAQ,CAAC;IAM7E,KAAK,CAAC,KAAK,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,CAAC;IAKtE,OAAO,CAAC,GAAG,OAAO,EAAE,CAAC,cAAc,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,CAAC;IAKtF,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,GAAG,SAAS,CAAC;IAK/E,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,GAAG,OAAO,CAAC;IAKvE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,GAAG,QAAQ,CAAC;IAU1E,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;IAK/B,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CACnC,mBAAmB,GAAG;QACrB,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,CAAC;KACjE,CACD;IAIQ,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAEtD;CACF"}