drizzle-orm 0.17.5 → 0.17.6-424dea5
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/package.json +1 -1
- package/pg-core/dialect.d.ts +2 -1
- package/pg-core/dialect.d.ts.map +1 -1
- package/pg-core/dialect.js +24 -1
- package/pg-core/dialect.js.map +1 -1
- package/sql/index.d.ts +1 -1
- package/sql/index.d.ts.map +1 -1
- package/sql/index.js +3 -28
- package/sql/index.js.map +1 -1
package/package.json
CHANGED
package/pg-core/dialect.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { MigrationMeta } from '../migrator';
|
|
|
2
2
|
import { PgDeleteConfig, PgInsertConfig, PgUpdateConfig, PgUpdateSet } from './query-builders';
|
|
3
3
|
import { PgSelectConfig } from './query-builders/select.types';
|
|
4
4
|
import { AnyPgTable } from './table';
|
|
5
|
-
import { Query, SQL } from '../sql';
|
|
5
|
+
import { DriverValueEncoder, Query, QueryTypingsValue, SQL } from '../sql';
|
|
6
6
|
import { PgSession } from './session';
|
|
7
7
|
export declare class PgDialect {
|
|
8
8
|
migrate(migrations: MigrationMeta[], session: PgSession): Promise<void>;
|
|
@@ -25,6 +25,7 @@ export declare class PgDialect {
|
|
|
25
25
|
private buildSelection;
|
|
26
26
|
buildSelectQuery({ fields, where, table, joins, orderBy, groupBy, limit, offset }: PgSelectConfig): SQL;
|
|
27
27
|
buildInsertQuery({ table, values, onConflict, returning }: PgInsertConfig): SQL;
|
|
28
|
+
prepareTyping(encoder: DriverValueEncoder<unknown, unknown>): QueryTypingsValue;
|
|
28
29
|
sqlToQuery(sql: SQL): Query;
|
|
29
30
|
}
|
|
30
31
|
//# sourceMappingURL=dialect.d.ts.map
|
package/pg-core/dialect.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/pg-core/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAI3C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvG,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAQ,KAAK,EAAE,GAAG,EAAoC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/pg-core/dialect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAI3C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvG,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAQ,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAoC,MAAM,OAAO,CAAC;AAElH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,qBAAa,SAAS;IACf,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC7E,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,cAAc,GAAG,GAAG;IAUlE,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,GAAG,GAAG;IAkBxD,gBAAgB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,cAAc,GAAG,GAAG;IAYvE;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IA8CtB,gBAAgB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,GAAG;IA4DvG,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,cAAc,GAAG,GAAG;IAoC/E,aAAa,CAAC,OAAO,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,iBAAiB;IAoB/E,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAM3B"}
|
package/pg-core/dialect.js
CHANGED
|
@@ -216,11 +216,34 @@ class PgDialect {
|
|
|
216
216
|
const onConflictSql = onConflict ? (0, sql_1.sql) ` on conflict ${onConflict}` : undefined;
|
|
217
217
|
return (0, sql_1.sql) `insert into ${table} ${insertOrder} values ${valuesSql}${onConflictSql}${returningSql}`;
|
|
218
218
|
}
|
|
219
|
+
prepareTyping(encoder) {
|
|
220
|
+
if (encoder instanceof columns_1.PgJsonb || encoder instanceof columns_1.PgJson) {
|
|
221
|
+
return 'json';
|
|
222
|
+
}
|
|
223
|
+
else if (encoder instanceof columns_1.PgNumeric) {
|
|
224
|
+
return 'decimal';
|
|
225
|
+
}
|
|
226
|
+
else if (encoder instanceof columns_1.PgTime) {
|
|
227
|
+
return 'time';
|
|
228
|
+
}
|
|
229
|
+
else if (encoder instanceof columns_1.PgTimestamp) {
|
|
230
|
+
return 'timestamp';
|
|
231
|
+
}
|
|
232
|
+
else if (encoder instanceof columns_1.PgDate) {
|
|
233
|
+
return 'date';
|
|
234
|
+
}
|
|
235
|
+
else if (encoder instanceof columns_1.PgUUID) {
|
|
236
|
+
return 'uuid';
|
|
237
|
+
}
|
|
238
|
+
else {
|
|
239
|
+
return 'none';
|
|
240
|
+
}
|
|
241
|
+
}
|
|
219
242
|
sqlToQuery(sql) {
|
|
220
243
|
return sql.toQuery({
|
|
221
244
|
escapeName: this.escapeName,
|
|
222
245
|
escapeParam: this.escapeParam,
|
|
223
|
-
});
|
|
246
|
+
}, this.prepareTyping);
|
|
224
247
|
}
|
|
225
248
|
}
|
|
226
249
|
exports.PgDialect = PgDialect;
|
package/pg-core/dialect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/pg-core/dialect.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,qCAA6C;AAG7C,+
|
|
1
|
+
{"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/pg-core/dialect.ts"],"names":[],"mappings":"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"}
|
package/sql/index.d.ts
CHANGED
|
@@ -26,7 +26,7 @@ export declare class SQL implements SQLWrapper {
|
|
|
26
26
|
readonly queryChunks: Chunk[];
|
|
27
27
|
protected $brand: 'SQL';
|
|
28
28
|
constructor(queryChunks: Chunk[]);
|
|
29
|
-
toQuery({ escapeName, escapeParam }: BuildQueryConfig): Query;
|
|
29
|
+
toQuery({ escapeName, escapeParam }: BuildQueryConfig, prepareTyping?: (encoder: DriverValueEncoder<unknown, unknown>) => QueryTypingsValue): Query;
|
|
30
30
|
getSQL(): SQL;
|
|
31
31
|
as<TDecoder extends DriverValueDecoder<any, any> | DriverValueDecoder<any, any>['mapFromDriverValue']>(decoder: TDecoder): SQLResponse<GetDecoderColumnData<TDecoder>>;
|
|
32
32
|
as<TData>(): SQLResponse<TData>;
|
package/sql/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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"}
|
package/sql/index.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.fillPlaceholders = exports.placeholder = exports.Placeholder = exports.SQLResponse = exports.sql = exports.param = exports.Param = exports.noopMapper = exports.noopEncoder = exports.noopDecoder = exports.name = exports.Name = exports.SQL = exports.isSQLWrapper = exports.FakePrimitiveParam = void 0;
|
|
4
|
-
const mysql_core_1 = require("../mysql-core");
|
|
5
|
-
const pg_core_1 = require("../pg-core");
|
|
6
4
|
const column_1 = require("../column");
|
|
7
5
|
const table_1 = require("../table");
|
|
8
6
|
/**
|
|
@@ -18,35 +16,11 @@ function isSQLWrapper(value) {
|
|
|
18
16
|
&& typeof value.getSQL === 'function';
|
|
19
17
|
}
|
|
20
18
|
exports.isSQLWrapper = isSQLWrapper;
|
|
21
|
-
function prepareTyping(encoder) {
|
|
22
|
-
if (encoder instanceof pg_core_1.PgJsonb || encoder instanceof pg_core_1.PgJson
|
|
23
|
-
|| encoder instanceof mysql_core_1.MySqlJson) {
|
|
24
|
-
return 'json';
|
|
25
|
-
}
|
|
26
|
-
else if (encoder instanceof mysql_core_1.MySqlDecimal || encoder instanceof pg_core_1.PgNumeric) {
|
|
27
|
-
return 'decimal';
|
|
28
|
-
}
|
|
29
|
-
else if (encoder instanceof pg_core_1.PgTime || encoder instanceof mysql_core_1.MySqlTime) {
|
|
30
|
-
return 'time';
|
|
31
|
-
}
|
|
32
|
-
else if (encoder instanceof pg_core_1.PgTimestamp || encoder instanceof mysql_core_1.MySqlTimestamp) {
|
|
33
|
-
return 'timestamp';
|
|
34
|
-
}
|
|
35
|
-
else if (encoder instanceof pg_core_1.PgDate || encoder instanceof mysql_core_1.MySqlDate) {
|
|
36
|
-
return 'date';
|
|
37
|
-
}
|
|
38
|
-
else if (encoder instanceof pg_core_1.PgUUID) {
|
|
39
|
-
return 'uuid';
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
return 'none';
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
19
|
class SQL {
|
|
46
20
|
constructor(queryChunks) {
|
|
47
21
|
this.queryChunks = queryChunks;
|
|
48
22
|
}
|
|
49
|
-
toQuery({ escapeName, escapeParam }) {
|
|
23
|
+
toQuery({ escapeName, escapeParam }, prepareTyping) {
|
|
50
24
|
const params = [];
|
|
51
25
|
const typings = [];
|
|
52
26
|
const chunks = this.queryChunks.map((chunk) => {
|
|
@@ -67,7 +41,8 @@ class SQL {
|
|
|
67
41
|
}
|
|
68
42
|
else if (chunk instanceof Param) {
|
|
69
43
|
params.push(chunk.encoder.mapToDriverValue(chunk.value));
|
|
70
|
-
|
|
44
|
+
if (typeof prepareTyping !== 'undefined')
|
|
45
|
+
typings.push(prepareTyping(chunk.encoder));
|
|
71
46
|
return escapeParam(params.length - 1, chunk.value);
|
|
72
47
|
}
|
|
73
48
|
else {
|
package/sql/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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"}
|