@slonik/sql-tag 47.3.2 → 48.1.0
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/dist/Logger.js +2 -5
- package/dist/Logger.js.map +1 -1
- package/dist/factories/createPrimitiveValueExpressions.d.ts +1 -1
- package/dist/factories/createPrimitiveValueExpressions.d.ts.map +1 -1
- package/dist/factories/createPrimitiveValueExpressions.js +8 -12
- package/dist/factories/createPrimitiveValueExpressions.js.map +1 -1
- package/dist/factories/createSqlTag.d.ts +3 -3
- package/dist/factories/createSqlTag.d.ts.map +1 -1
- package/dist/factories/createSqlTag.js +39 -43
- package/dist/factories/createSqlTag.js.map +1 -1
- package/dist/factories/createSqlTag.test/array.test.js +18 -23
- package/dist/factories/createSqlTag.test/array.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/date.test.js +7 -12
- package/dist/factories/createSqlTag.test/date.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/identifier.test.js +9 -14
- package/dist/factories/createSqlTag.test/identifier.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/interval.test.js +9 -14
- package/dist/factories/createSqlTag.test/interval.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/join.test.js +21 -26
- package/dist/factories/createSqlTag.test/join.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/json.test.js +21 -26
- package/dist/factories/createSqlTag.test/json.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/jsonb.test.js +21 -26
- package/dist/factories/createSqlTag.test/jsonb.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/literalValue.test.js +6 -11
- package/dist/factories/createSqlTag.test/literalValue.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/sql.test.js +17 -22
- package/dist/factories/createSqlTag.test/sql.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/timestamp.test.js +7 -12
- package/dist/factories/createSqlTag.test/timestamp.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/type.test.js +7 -12
- package/dist/factories/createSqlTag.test/type.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/typeAlias.test.js +12 -17
- package/dist/factories/createSqlTag.test/typeAlias.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/unnest.test.js +19 -24
- package/dist/factories/createSqlTag.test/unnest.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/uuid.test.js +7 -12
- package/dist/factories/createSqlTag.test/uuid.test.js.map +1 -1
- package/dist/factories/createSqlTokenSqlFragment.d.ts +1 -1
- package/dist/factories/createSqlTokenSqlFragment.d.ts.map +1 -1
- package/dist/factories/createSqlTokenSqlFragment.js +55 -59
- package/dist/factories/createSqlTokenSqlFragment.js.map +1 -1
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -24
- package/dist/index.js.map +1 -1
- package/dist/regexRules/slonikPlaceholderRegexRule.js +1 -4
- package/dist/regexRules/slonikPlaceholderRegexRule.js.map +1 -1
- package/dist/sqlFragmentFactories/createArraySqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createArraySqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createArraySqlFragment.js +18 -22
- package/dist/sqlFragmentFactories/createArraySqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createBinarySqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createBinarySqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createBinarySqlFragment.js +7 -11
- package/dist/sqlFragmentFactories/createBinarySqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createDateSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createDateSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createDateSqlFragment.js +7 -11
- package/dist/sqlFragmentFactories/createDateSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.js +10 -14
- package/dist/sqlFragmentFactories/createFragmentSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.js +7 -11
- package/dist/sqlFragmentFactories/createIdentifierSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.js +16 -20
- package/dist/sqlFragmentFactories/createIntervalSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createJsonSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createJsonSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createJsonSqlFragment.js +18 -22
- package/dist/sqlFragmentFactories/createJsonSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createListSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createListSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createListSqlFragment.js +16 -20
- package/dist/sqlFragmentFactories/createListSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createQuerySqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createQuerySqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createQuerySqlFragment.js +10 -14
- package/dist/sqlFragmentFactories/createQuerySqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.js +8 -12
- package/dist/sqlFragmentFactories/createTimestampSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.js +17 -21
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createUuidSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createUuidSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createUuidSqlFragment.js +7 -11
- package/dist/sqlFragmentFactories/createUuidSqlFragment.js.map +1 -1
- package/dist/tokens.js +14 -17
- package/dist/tokens.js.map +1 -1
- package/dist/types.d.ts +6 -6
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +1 -2
- package/dist/utilities/countArrayDimensions.js +1 -5
- package/dist/utilities/countArrayDimensions.js.map +1 -1
- package/dist/utilities/countArrayDimensions.test.js +6 -11
- package/dist/utilities/countArrayDimensions.test.js.map +1 -1
- package/dist/utilities/escapeIdentifier.js +1 -5
- package/dist/utilities/escapeIdentifier.js.map +1 -1
- package/dist/utilities/escapeIdentifier.test.js +6 -11
- package/dist/utilities/escapeIdentifier.test.js.map +1 -1
- package/dist/utilities/escapeLiteralValue.js +1 -5
- package/dist/utilities/escapeLiteralValue.js.map +1 -1
- package/dist/utilities/escapeLiteralValue.test.js +7 -12
- package/dist/utilities/escapeLiteralValue.test.js.map +1 -1
- package/dist/utilities/formatSlonikPlaceholder.js +1 -5
- package/dist/utilities/formatSlonikPlaceholder.js.map +1 -1
- package/dist/utilities/hasOwnProperty.js +1 -5
- package/dist/utilities/hasOwnProperty.js.map +1 -1
- package/dist/utilities/isPlainObject.js +1 -5
- package/dist/utilities/isPlainObject.js.map +1 -1
- package/dist/utilities/isPrimitiveValueExpression.js +1 -5
- package/dist/utilities/isPrimitiveValueExpression.js.map +1 -1
- package/dist/utilities/isSqlToken.d.ts +1 -1
- package/dist/utilities/isSqlToken.d.ts.map +1 -1
- package/dist/utilities/isSqlToken.js +20 -24
- package/dist/utilities/isSqlToken.js.map +1 -1
- package/dist/utilities/safeStringify.js +3 -7
- package/dist/utilities/safeStringify.js.map +1 -1
- package/dist/utilities/stripArrayNotation.js +1 -5
- package/dist/utilities/stripArrayNotation.js.map +1 -1
- package/dist/utilities/stripArrayNotation.test.js +6 -11
- package/dist/utilities/stripArrayNotation.test.js.map +1 -1
- package/package.json +17 -36
- package/src/factories/createPrimitiveValueExpressions.ts +3 -3
- package/src/factories/createSqlTag.test/array.test.ts +2 -2
- package/src/factories/createSqlTag.test/date.test.ts +2 -2
- package/src/factories/createSqlTag.test/identifier.test.ts +2 -2
- package/src/factories/createSqlTag.test/interval.test.ts +2 -2
- package/src/factories/createSqlTag.test/join.test.ts +2 -2
- package/src/factories/createSqlTag.test/json.test.ts +2 -2
- package/src/factories/createSqlTag.test/jsonb.test.ts +2 -2
- package/src/factories/createSqlTag.test/literalValue.test.ts +2 -2
- package/src/factories/createSqlTag.test/sql.test.ts +4 -3
- package/src/factories/createSqlTag.test/timestamp.test.ts +2 -2
- package/src/factories/createSqlTag.test/type.test.ts +1 -1
- package/src/factories/createSqlTag.test/typeAlias.test.ts +3 -2
- package/src/factories/createSqlTag.test/unnest.test.ts +2 -2
- package/src/factories/createSqlTag.test/uuid.test.ts +2 -2
- package/src/factories/createSqlTag.ts +17 -16
- package/src/factories/createSqlTokenSqlFragment.ts +14 -14
- package/src/index.ts +5 -5
- package/src/sqlFragmentFactories/createArraySqlFragment.ts +7 -7
- package/src/sqlFragmentFactories/createBinarySqlFragment.ts +3 -3
- package/src/sqlFragmentFactories/createDateSqlFragment.ts +3 -3
- package/src/sqlFragmentFactories/createFragmentSqlFragment.ts +4 -4
- package/src/sqlFragmentFactories/createIdentifierSqlFragment.ts +3 -3
- package/src/sqlFragmentFactories/createIntervalSqlFragment.ts +3 -3
- package/src/sqlFragmentFactories/createJsonSqlFragment.ts +10 -10
- package/src/sqlFragmentFactories/createListSqlFragment.ts +11 -11
- package/src/sqlFragmentFactories/createQuerySqlFragment.ts +4 -4
- package/src/sqlFragmentFactories/createTimestampSqlFragment.ts +3 -3
- package/src/sqlFragmentFactories/createUnnestSqlFragment.ts +11 -11
- package/src/sqlFragmentFactories/createUuidSqlFragment.ts +3 -3
- package/src/types.ts +9 -6
- package/src/utilities/countArrayDimensions.test.ts +1 -1
- package/src/utilities/escapeIdentifier.test.ts +1 -1
- package/src/utilities/escapeLiteralValue.test.ts +1 -1
- package/src/utilities/isSqlToken.ts +3 -3
- package/src/utilities/stripArrayNotation.test.ts +1 -1
package/dist/Logger.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.Logger = void 0;
|
|
4
|
-
const roarr_1 = require("roarr");
|
|
5
|
-
exports.Logger = roarr_1.Roarr.child({
|
|
1
|
+
import { Roarr } from 'roarr';
|
|
2
|
+
export const Logger = Roarr.child({
|
|
6
3
|
package: '@slonik/sql-tag',
|
|
7
4
|
});
|
|
8
5
|
//# sourceMappingURL=Logger.js.map
|
package/dist/Logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../src/Logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../src/Logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;IAChC,OAAO,EAAE,iBAAiB;CAC3B,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { PrimitiveValueExpression } from '../types.js';
|
|
2
2
|
export declare const createPrimitiveValueExpressions: (values: readonly unknown[]) => readonly PrimitiveValueExpression[];
|
|
3
3
|
//# sourceMappingURL=createPrimitiveValueExpressions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPrimitiveValueExpressions.d.ts","sourceRoot":"","sources":["../../src/factories/createPrimitiveValueExpressions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createPrimitiveValueExpressions.d.ts","sourceRoot":"","sources":["../../src/factories/createPrimitiveValueExpressions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAQ5D,eAAO,MAAM,+BAA+B,GAC1C,QAAQ,SAAS,OAAO,EAAE,KACzB,SAAS,wBAAwB,EA+BnC,CAAC"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const safeStringify_1 = require("../utilities/safeStringify");
|
|
6
|
-
const errors_1 = require("@slonik/errors");
|
|
7
|
-
const log = Logger_1.Logger.child({
|
|
1
|
+
import { Logger } from '../Logger.js';
|
|
2
|
+
import { safeStringify } from '../utilities/safeStringify.js';
|
|
3
|
+
import { UnexpectedStateError } from '@slonik/errors';
|
|
4
|
+
const log = Logger.child({
|
|
8
5
|
namespace: 'createPrimitiveValueExpressions',
|
|
9
6
|
});
|
|
10
|
-
const createPrimitiveValueExpressions = (values) => {
|
|
7
|
+
export const createPrimitiveValueExpressions = (values) => {
|
|
11
8
|
const primitiveValueExpressions = [];
|
|
12
9
|
for (const value of values) {
|
|
13
10
|
if (Array.isArray(value) ||
|
|
@@ -21,13 +18,12 @@ const createPrimitiveValueExpressions = (values) => {
|
|
|
21
18
|
}
|
|
22
19
|
else {
|
|
23
20
|
log.warn({
|
|
24
|
-
value: JSON.parse(
|
|
25
|
-
values: JSON.parse(
|
|
21
|
+
value: JSON.parse(safeStringify(value)),
|
|
22
|
+
values: JSON.parse(safeStringify(values)),
|
|
26
23
|
}, 'unexpected value expression');
|
|
27
|
-
throw new
|
|
24
|
+
throw new UnexpectedStateError('Unexpected value expression.');
|
|
28
25
|
}
|
|
29
26
|
}
|
|
30
27
|
return primitiveValueExpressions;
|
|
31
28
|
};
|
|
32
|
-
exports.createPrimitiveValueExpressions = createPrimitiveValueExpressions;
|
|
33
29
|
//# sourceMappingURL=createPrimitiveValueExpressions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPrimitiveValueExpressions.js","sourceRoot":"","sources":["../../src/factories/createPrimitiveValueExpressions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createPrimitiveValueExpressions.js","sourceRoot":"","sources":["../../src/factories/createPrimitiveValueExpressions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC;IACvB,SAAS,EAAE,iCAAiC;CAC7C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAC7C,MAA0B,EACW,EAAE;IACvC,MAAM,yBAAyB,GAG3B,EAAE,CAAC;IAEP,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IACE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YACpB,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;YACtB,OAAO,KAAK,KAAK,QAAQ;YACzB,OAAO,KAAK,KAAK,QAAQ;YACzB,OAAO,KAAK,KAAK,SAAS;YAC1B,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI,EACd,CAAC;YACD,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,IAAI,CACN;gBACE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBACvC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;aAC1C,EACD,6BAA6B,CAC9B,CAAC;YAEF,MAAM,IAAI,oBAAoB,CAAC,8BAA8B,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,OAAO,yBAAyB,CAAC;AACnC,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
export declare const createSqlTag: <K extends PropertyKey, P extends
|
|
1
|
+
import type { SqlTag } from '../types.js';
|
|
2
|
+
import type { StandardSchemaV1 } from '@standard-schema/spec';
|
|
3
|
+
export declare const createSqlTag: <K extends PropertyKey, P extends StandardSchemaV1, Z extends Record<K, P>>(configuration?: {
|
|
4
4
|
typeAliases?: Z;
|
|
5
5
|
}) => SqlTag<Z>;
|
|
6
6
|
//# sourceMappingURL=createSqlTag.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSqlTag.d.ts","sourceRoot":"","sources":["../../src/factories/createSqlTag.ts"],"names":[],"mappings":"AAiBA,OAAO,
|
|
1
|
+
{"version":3,"file":"createSqlTag.d.ts","sourceRoot":"","sources":["../../src/factories/createSqlTag.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAEV,MAAM,EAEP,MAAM,aAAa,CAAC;AAQrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAgF9D,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,WAAW,EACrB,CAAC,SAAS,gBAAgB,EAC1B,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAEtB,gBAAe;IACb,WAAW,CAAC,EAAE,CAAC,CAAC;CACZ,KACL,MAAM,CAAC,CAAC,CA4HV,CAAC"}
|
|
@@ -1,22 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const
|
|
12
|
-
const errors_1 = require("@slonik/errors");
|
|
13
|
-
const zod_1 = require("zod");
|
|
14
|
-
const log = Logger_1.Logger.child({
|
|
1
|
+
import { Logger } from '../Logger.js';
|
|
2
|
+
import { ArrayToken, BinaryToken, DateToken, FragmentToken, IdentifierToken, IntervalToken, JsonBinaryToken, JsonToken, ListToken, QueryToken, TimestampToken, UnnestToken, UuidToken, } from '../tokens.js';
|
|
3
|
+
import { escapeLiteralValue } from '../utilities/escapeLiteralValue.js';
|
|
4
|
+
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder.js';
|
|
5
|
+
import { isPrimitiveValueExpression } from '../utilities/isPrimitiveValueExpression.js';
|
|
6
|
+
import { isSqlToken } from '../utilities/isSqlToken.js';
|
|
7
|
+
import { safeStringify } from '../utilities/safeStringify.js';
|
|
8
|
+
import { createSqlTokenSqlFragment } from './createSqlTokenSqlFragment.js';
|
|
9
|
+
import { InvalidInputError } from '@slonik/errors';
|
|
10
|
+
import { z } from 'zod';
|
|
11
|
+
const log = Logger.child({
|
|
15
12
|
namespace: 'sql',
|
|
16
13
|
});
|
|
17
14
|
const createFragment = (parts, values) => {
|
|
18
15
|
if (!Array.isArray(parts.raw) || !Object.isFrozen(parts.raw)) {
|
|
19
|
-
throw new
|
|
16
|
+
throw new InvalidInputError('Function must be called as a template literal.');
|
|
20
17
|
}
|
|
21
18
|
let rawSql = '';
|
|
22
19
|
const parameterValues = [];
|
|
@@ -30,17 +27,17 @@ const createFragment = (parts, values) => {
|
|
|
30
27
|
if (token === undefined) {
|
|
31
28
|
log.debug({
|
|
32
29
|
index,
|
|
33
|
-
parts: JSON.parse(
|
|
34
|
-
values: JSON.parse(
|
|
30
|
+
parts: JSON.parse(safeStringify(parts)),
|
|
31
|
+
values: JSON.parse(safeStringify(values)),
|
|
35
32
|
}, 'bound values');
|
|
36
|
-
throw new
|
|
33
|
+
throw new InvalidInputError(`SQL tag cannot be bound to undefined value at index ${index}.`);
|
|
37
34
|
}
|
|
38
|
-
else if (
|
|
39
|
-
rawSql +=
|
|
35
|
+
else if (isPrimitiveValueExpression(token)) {
|
|
36
|
+
rawSql += formatSlonikPlaceholder(parameterValues.length + 1);
|
|
40
37
|
parameterValues.push(token);
|
|
41
38
|
}
|
|
42
|
-
else if (
|
|
43
|
-
const sqlFragment =
|
|
39
|
+
else if (isSqlToken(token)) {
|
|
40
|
+
const sqlFragment = createSqlTokenSqlFragment(token, parameterValues.length);
|
|
44
41
|
rawSql += sqlFragment.sql;
|
|
45
42
|
for (const value of sqlFragment.values) {
|
|
46
43
|
parameterValues.push(value);
|
|
@@ -50,7 +47,7 @@ const createFragment = (parts, values) => {
|
|
|
50
47
|
log.error({
|
|
51
48
|
constructedSql: rawSql,
|
|
52
49
|
index,
|
|
53
|
-
offendingToken: JSON.parse(
|
|
50
|
+
offendingToken: JSON.parse(safeStringify(token)),
|
|
54
51
|
}, 'unexpected value expression');
|
|
55
52
|
throw new TypeError('Unexpected value expression.');
|
|
56
53
|
}
|
|
@@ -60,76 +57,76 @@ const createFragment = (parts, values) => {
|
|
|
60
57
|
values: parameterValues,
|
|
61
58
|
};
|
|
62
59
|
};
|
|
63
|
-
const createSqlTag = (configuration = {}) => {
|
|
60
|
+
export const createSqlTag = (configuration = {}) => {
|
|
64
61
|
const typeAliases = configuration.typeAliases;
|
|
65
62
|
return {
|
|
66
63
|
array: (values, memberType) => {
|
|
67
64
|
return Object.freeze({
|
|
68
65
|
memberType,
|
|
69
|
-
type:
|
|
66
|
+
type: ArrayToken,
|
|
70
67
|
values,
|
|
71
68
|
});
|
|
72
69
|
},
|
|
73
70
|
binary: (data) => {
|
|
74
71
|
return Object.freeze({
|
|
75
72
|
data,
|
|
76
|
-
type:
|
|
73
|
+
type: BinaryToken,
|
|
77
74
|
});
|
|
78
75
|
},
|
|
79
76
|
date: (date) => {
|
|
80
77
|
return Object.freeze({
|
|
81
78
|
date,
|
|
82
|
-
type:
|
|
79
|
+
type: DateToken,
|
|
83
80
|
});
|
|
84
81
|
},
|
|
85
82
|
fragment: (parts, ...args) => {
|
|
86
83
|
return Object.freeze({
|
|
87
84
|
...createFragment(parts, args),
|
|
88
|
-
type:
|
|
85
|
+
type: FragmentToken,
|
|
89
86
|
});
|
|
90
87
|
},
|
|
91
88
|
identifier: (names) => {
|
|
92
89
|
return Object.freeze({
|
|
93
90
|
names,
|
|
94
|
-
type:
|
|
91
|
+
type: IdentifierToken,
|
|
95
92
|
});
|
|
96
93
|
},
|
|
97
94
|
interval: (interval) => {
|
|
98
95
|
return Object.freeze({
|
|
99
96
|
interval,
|
|
100
|
-
type:
|
|
97
|
+
type: IntervalToken,
|
|
101
98
|
});
|
|
102
99
|
},
|
|
103
100
|
join: (members, glue) => {
|
|
104
101
|
return Object.freeze({
|
|
105
102
|
glue,
|
|
106
103
|
members,
|
|
107
|
-
type:
|
|
104
|
+
type: ListToken,
|
|
108
105
|
});
|
|
109
106
|
},
|
|
110
107
|
json: (value) => {
|
|
111
108
|
return Object.freeze({
|
|
112
|
-
type:
|
|
109
|
+
type: JsonToken,
|
|
113
110
|
value,
|
|
114
111
|
});
|
|
115
112
|
},
|
|
116
113
|
jsonb: (value) => {
|
|
117
114
|
return Object.freeze({
|
|
118
|
-
type:
|
|
115
|
+
type: JsonBinaryToken,
|
|
119
116
|
value,
|
|
120
117
|
});
|
|
121
118
|
},
|
|
122
119
|
literalValue: (value) => {
|
|
123
120
|
return Object.freeze({
|
|
124
|
-
sql:
|
|
125
|
-
type:
|
|
121
|
+
sql: escapeLiteralValue(value),
|
|
122
|
+
type: FragmentToken,
|
|
126
123
|
values: [],
|
|
127
124
|
});
|
|
128
125
|
},
|
|
129
126
|
timestamp: (date) => {
|
|
130
127
|
return Object.freeze({
|
|
131
128
|
date,
|
|
132
|
-
type:
|
|
129
|
+
type: TimestampToken,
|
|
133
130
|
});
|
|
134
131
|
},
|
|
135
132
|
type: (parser) => {
|
|
@@ -137,7 +134,7 @@ const createSqlTag = (configuration = {}) => {
|
|
|
137
134
|
return Object.freeze({
|
|
138
135
|
...createFragment(parts, args),
|
|
139
136
|
parser,
|
|
140
|
-
type:
|
|
137
|
+
type: QueryToken,
|
|
141
138
|
});
|
|
142
139
|
};
|
|
143
140
|
},
|
|
@@ -149,7 +146,7 @@ const createSqlTag = (configuration = {}) => {
|
|
|
149
146
|
return Object.freeze({
|
|
150
147
|
...createFragment(parts, args),
|
|
151
148
|
parser: typeAliases[parserAlias],
|
|
152
|
-
type:
|
|
149
|
+
type: QueryToken,
|
|
153
150
|
});
|
|
154
151
|
};
|
|
155
152
|
},
|
|
@@ -157,23 +154,22 @@ const createSqlTag = (configuration = {}) => {
|
|
|
157
154
|
return Object.freeze({
|
|
158
155
|
columnTypes,
|
|
159
156
|
tuples,
|
|
160
|
-
type:
|
|
157
|
+
type: UnnestToken,
|
|
161
158
|
});
|
|
162
159
|
},
|
|
163
160
|
unsafe: (parts, ...args) => {
|
|
164
161
|
return Object.freeze({
|
|
165
162
|
...createFragment(parts, args),
|
|
166
|
-
parser:
|
|
167
|
-
type:
|
|
163
|
+
parser: z.any(),
|
|
164
|
+
type: QueryToken,
|
|
168
165
|
});
|
|
169
166
|
},
|
|
170
167
|
uuid: (uuid) => {
|
|
171
168
|
return Object.freeze({
|
|
172
|
-
type:
|
|
169
|
+
type: UuidToken,
|
|
173
170
|
uuid: uuid,
|
|
174
171
|
});
|
|
175
172
|
},
|
|
176
173
|
};
|
|
177
174
|
};
|
|
178
|
-
exports.createSqlTag = createSqlTag;
|
|
179
175
|
//# sourceMappingURL=createSqlTag.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSqlTag.js","sourceRoot":"","sources":["../../src/factories/createSqlTag.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createSqlTag.js","sourceRoot":"","sources":["../../src/factories/createSqlTag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EACL,UAAU,EACV,WAAW,EACX,SAAS,EACT,aAAa,EACb,eAAe,EACf,aAAa,EACb,eAAe,EACf,SAAS,EACT,SAAS,EACT,UAAU,EACV,cAAc,EACd,WAAW,EACX,SAAS,GACV,MAAM,cAAc,CAAC;AAMtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC;IACvB,SAAS,EAAE,KAAK;CACjB,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CACrB,KAA2B,EAC3B,MAAkC,EAClC,EAAE;IACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,iBAAiB,CACzB,gDAAgD,CACjD,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,MAAM,eAAe,GAA+B,EAAE,CAAC;IAEvD,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAE9B,MAAM,IAAI,IAAI,CAAC;QAEf,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YAC1B,SAAS;QACX,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,GAAG,CAAC,KAAK,CACP;gBACE,KAAK;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBACvC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;aAC1C,EACD,cAAc,CACf,CAAC;YAEF,MAAM,IAAI,iBAAiB,CACzB,uDAAuD,KAAK,GAAG,CAChE,CAAC;QACJ,CAAC;aAAM,IAAI,0BAA0B,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,uBAAuB,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAE9D,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;aAAM,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM,WAAW,GAAG,yBAAyB,CAC3C,KAAK,EACL,eAAe,CAAC,MAAM,CACvB,CAAC;YAEF,MAAM,IAAI,WAAW,CAAC,GAAG,CAAC;YAE1B,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;gBACvC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,KAAK,CACP;gBACE,cAAc,EAAE,MAAM;gBACtB,KAAK;gBACL,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;aACjD,EACD,6BAA6B,CAC9B,CAAC;YAEF,MAAM,IAAI,SAAS,CAAC,8BAA8B,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EAAE,MAAM;QACX,MAAM,EAAE,eAAe;KACxB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAK1B,gBAEI,EAAE,EACK,EAAE;IACb,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;IAE9C,OAAO;QACL,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE;YAC5B,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,UAAU;gBACV,IAAI,EAAE,UAAU;gBAChB,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QACD,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACf,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,IAAI;gBACJ,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,IAAI;gBACJ,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;QACL,CAAC;QACD,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;YAC3B,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC;gBAC9B,IAAI,EAAE,aAAa;aACpB,CAAC,CAAC;QACL,CAAC;QACD,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;YACpB,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,KAAK;gBACL,IAAI,EAAE,eAAe;aACtB,CAAC,CAAC;QACL,CAAC;QACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;YACrB,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,QAAQ;gBACR,IAAI,EAAE,aAAa;aACpB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;YACtB,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,IAAI;gBACJ,OAAO;gBACP,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;YACd,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,IAAI,EAAE,SAAS;gBACf,KAAK;aACN,CAAC,CAAC;QACL,CAAC;QACD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,IAAI,EAAE,eAAe;gBACrB,KAAK;aACN,CAAC,CAAC;QACL,CAAC;QACD,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;YACtB,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,GAAG,EAAE,kBAAkB,CAAC,KAAK,CAAC;gBAC9B,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE,EAAE;aACX,CAAC,CAAC;QACL,CAAC;QACD,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAClB,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,IAAI;gBACJ,IAAI,EAAE,cAAc;aACrB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;YACf,OAAO,CACL,KAA2B,EAC3B,GAAG,IAAgC,EACnC,EAAE;gBACF,OAAO,MAAM,CAAC,MAAM,CAAC;oBACnB,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC;oBAC9B,MAAM;oBACN,IAAI,EAAE,UAAU;iBACjB,CAAC,CAAC;YACL,CAAC,CAAC;QACJ,CAAC;QACD,SAAS,EAAE,CAAC,WAAW,EAAE,EAAE;YACzB,IAAI,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CACb,cAAc,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAC3D,CAAC;YACJ,CAAC;YAED,OAAO,CACL,KAA2B,EAC3B,GAAG,IAAgC,EACnC,EAAE;gBACF,OAAO,MAAM,CAAC,MAAM,CAAC;oBACnB,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC;oBAC9B,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC;oBAChC,IAAI,EAAE,UAAU;iBACjB,CAAC,CAAC;YACL,CAAC,CAAC;QACJ,CAAC;QACD,MAAM,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;YAC9B,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,WAAW;gBACX,MAAM;gBACN,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;QACL,CAAC;QACD,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;YACzB,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC;gBAC9B,MAAM,EAAE,CAAC,CAAC,GAAG,EAAE;gBACf,IAAI,EAAE,UAAU;aACjB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,IAAY;aACnB,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,64 +1,59 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const tokens_1 = require("../../tokens");
|
|
7
|
-
const createSqlTag_1 = require("../createSqlTag");
|
|
8
|
-
const ava_1 = __importDefault(require("ava"));
|
|
9
|
-
const sql = (0, createSqlTag_1.createSqlTag)();
|
|
10
|
-
(0, ava_1.default)('binds an empty array', (t) => {
|
|
1
|
+
import { FragmentToken } from '../../tokens.js';
|
|
2
|
+
import { createSqlTag } from '../createSqlTag.js';
|
|
3
|
+
import test from 'ava';
|
|
4
|
+
const sql = createSqlTag();
|
|
5
|
+
test('binds an empty array', (t) => {
|
|
11
6
|
const query = sql.fragment `SELECT ${sql.array([], 'int4')}`;
|
|
12
7
|
t.deepEqual(query, {
|
|
13
8
|
sql: 'SELECT $slonik_1::"int4"[]',
|
|
14
|
-
type:
|
|
9
|
+
type: FragmentToken,
|
|
15
10
|
values: [[]],
|
|
16
11
|
});
|
|
17
12
|
});
|
|
18
|
-
(
|
|
13
|
+
test('binds bigint', (t) => {
|
|
19
14
|
const query = sql.fragment `SELECT ${sql.array(
|
|
20
15
|
// eslint-disable-next-line unicorn/numeric-separators-style
|
|
21
16
|
[9007199254740999n], 'int8')}`;
|
|
22
17
|
t.deepEqual(query, {
|
|
23
18
|
sql: 'SELECT $slonik_1::"int8"[]',
|
|
24
|
-
type:
|
|
19
|
+
type: FragmentToken,
|
|
25
20
|
// eslint-disable-next-line unicorn/numeric-separators-style
|
|
26
21
|
values: [[BigInt(9007199254740999n)]],
|
|
27
22
|
});
|
|
28
23
|
});
|
|
29
|
-
(
|
|
24
|
+
test('binds an array with multiple values', (t) => {
|
|
30
25
|
const query = sql.fragment `SELECT ${sql.array([1, 2, 3], 'int4')}`;
|
|
31
26
|
t.deepEqual(query, {
|
|
32
27
|
sql: 'SELECT $slonik_1::"int4"[]',
|
|
33
|
-
type:
|
|
28
|
+
type: FragmentToken,
|
|
34
29
|
values: [[1, 2, 3]],
|
|
35
30
|
});
|
|
36
31
|
});
|
|
37
|
-
(
|
|
32
|
+
test('binds an array with bytea values', (t) => {
|
|
38
33
|
const query = sql.fragment `SELECT ${sql.array([Buffer.from('foo')], 'bytea')}`;
|
|
39
34
|
t.deepEqual(query, {
|
|
40
35
|
sql: 'SELECT $slonik_1::"bytea"[]',
|
|
41
|
-
type:
|
|
36
|
+
type: FragmentToken,
|
|
42
37
|
values: [[Buffer.from('foo')]],
|
|
43
38
|
});
|
|
44
39
|
});
|
|
45
|
-
(
|
|
40
|
+
test('offsets positional parameter indexes', (t) => {
|
|
46
41
|
const query = sql.fragment `SELECT ${1}, ${sql.array([1, 2, 3], 'int4')}, ${3}`;
|
|
47
42
|
t.deepEqual(query, {
|
|
48
43
|
sql: 'SELECT $slonik_1, $slonik_2::"int4"[], $slonik_3',
|
|
49
|
-
type:
|
|
44
|
+
type: FragmentToken,
|
|
50
45
|
values: [1, [1, 2, 3], 3],
|
|
51
46
|
});
|
|
52
47
|
});
|
|
53
|
-
(
|
|
48
|
+
test('binds a SQL token', (t) => {
|
|
54
49
|
const query = sql.fragment `SELECT ${sql.array([1, 2, 3], sql.fragment `int[]`)}`;
|
|
55
50
|
t.deepEqual(query, {
|
|
56
51
|
sql: 'SELECT $slonik_1::int[]',
|
|
57
|
-
type:
|
|
52
|
+
type: FragmentToken,
|
|
58
53
|
values: [[1, 2, 3]],
|
|
59
54
|
});
|
|
60
55
|
});
|
|
61
|
-
(
|
|
56
|
+
test('throws if array member is not a primitive value expression', (t) => {
|
|
62
57
|
const error = t.throws(() => {
|
|
63
58
|
sql.fragment `SELECT ${sql.array([
|
|
64
59
|
// @ts-expect-error - intentional
|
|
@@ -67,7 +62,7 @@ const sql = (0, createSqlTag_1.createSqlTag)();
|
|
|
67
62
|
});
|
|
68
63
|
t.is(error?.message, 'Invalid array member type. Must be a primitive value expression.');
|
|
69
64
|
});
|
|
70
|
-
(
|
|
65
|
+
test('throws if memberType is not a string or SqlToken of different type than "SLONIK_TOKEN_FRAGMENT"', (t) => {
|
|
71
66
|
const error = t.throws(() => {
|
|
72
67
|
// @ts-expect-error - intentional
|
|
73
68
|
sql.fragment `SELECT ${sql.array([1, 2, 3], sql.identifier(['int']))}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/array.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"array.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/array.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const tokens_1 = require("../../tokens");
|
|
7
|
-
const createSqlTag_1 = require("../createSqlTag");
|
|
8
|
-
const ava_1 = __importDefault(require("ava"));
|
|
9
|
-
const sql = (0, createSqlTag_1.createSqlTag)();
|
|
10
|
-
(0, ava_1.default)('binds a date', (t) => {
|
|
1
|
+
import { FragmentToken } from '../../tokens.js';
|
|
2
|
+
import { createSqlTag } from '../createSqlTag.js';
|
|
3
|
+
import test from 'ava';
|
|
4
|
+
const sql = createSqlTag();
|
|
5
|
+
test('binds a date', (t) => {
|
|
11
6
|
const query = sql.fragment `SELECT ${sql.date(new Date('2022-08-19T03:27:24.951Z'))}`;
|
|
12
7
|
t.deepEqual(query, {
|
|
13
8
|
sql: 'SELECT $slonik_1::date',
|
|
14
|
-
type:
|
|
9
|
+
type: FragmentToken,
|
|
15
10
|
values: ['2022-08-19'],
|
|
16
11
|
});
|
|
17
12
|
});
|
|
18
|
-
(
|
|
13
|
+
test('throws if not instance of Date', (t) => {
|
|
19
14
|
const error = t.throws(() => {
|
|
20
15
|
// @ts-expect-error - intentional
|
|
21
16
|
sql.fragment `SELECT ${sql.date(1)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/date.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"date.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/date.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,IAAI,MAAM,KAAK,CAAC;AAEvB,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;AAE3B,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE;IACzB,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAA,UAAU,GAAG,CAAC,IAAI,CAC1C,IAAI,IAAI,CAAC,0BAA0B,CAAC,CACrC,EAAE,CAAC;IAEJ,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE;QACjB,GAAG,EAAE,wBAAwB;QAC7B,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,YAAY,CAAC;KACvB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gCAAgC,EAAE,CAAC,CAAC,EAAE,EAAE;IAC3C,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;QAC1B,iCAAiC;QACjC,GAAG,CAAC,QAAQ,CAAA,UAAU,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,mDAAmD,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC"}
|
|
@@ -1,32 +1,27 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const tokens_1 = require("../../tokens");
|
|
7
|
-
const createSqlTag_1 = require("../createSqlTag");
|
|
8
|
-
const ava_1 = __importDefault(require("ava"));
|
|
9
|
-
const sql = (0, createSqlTag_1.createSqlTag)();
|
|
10
|
-
(0, ava_1.default)('creates an object describing a query with inlined identifiers', (t) => {
|
|
1
|
+
import { FragmentToken } from '../../tokens.js';
|
|
2
|
+
import { createSqlTag } from '../createSqlTag.js';
|
|
3
|
+
import test from 'ava';
|
|
4
|
+
const sql = createSqlTag();
|
|
5
|
+
test('creates an object describing a query with inlined identifiers', (t) => {
|
|
11
6
|
const query = sql.fragment `SELECT ${'foo'} FROM ${sql.identifier(['bar'])}`;
|
|
12
7
|
t.deepEqual(query, {
|
|
13
8
|
sql: 'SELECT $slonik_1 FROM "bar"',
|
|
14
|
-
type:
|
|
9
|
+
type: FragmentToken,
|
|
15
10
|
values: ['foo'],
|
|
16
11
|
});
|
|
17
12
|
});
|
|
18
|
-
(
|
|
13
|
+
test('creates an object describing a query with inlined identifiers (specifier)', (t) => {
|
|
19
14
|
const query = sql.fragment `SELECT ${'foo'} FROM ${sql.identifier([
|
|
20
15
|
'bar',
|
|
21
16
|
'baz',
|
|
22
17
|
])}`;
|
|
23
18
|
t.deepEqual(query, {
|
|
24
19
|
sql: 'SELECT $slonik_1 FROM "bar"."baz"',
|
|
25
|
-
type:
|
|
20
|
+
type: FragmentToken,
|
|
26
21
|
values: ['foo'],
|
|
27
22
|
});
|
|
28
23
|
});
|
|
29
|
-
(
|
|
24
|
+
test('throws if an identifier name array member type is not a string', (t) => {
|
|
30
25
|
const error = t.throws(() => {
|
|
31
26
|
sql.fragment `${sql.identifier([
|
|
32
27
|
// @ts-expect-error - intentional
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identifier.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/identifier.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"identifier.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/identifier.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,IAAI,MAAM,KAAK,CAAC;AAEvB,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;AAE3B,IAAI,CAAC,+DAA+D,EAAE,CAAC,CAAC,EAAE,EAAE;IAC1E,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAA,UAAU,KAAK,SAAS,GAAG,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;IAE5E,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE;QACjB,GAAG,EAAE,6BAA6B;QAClC,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,KAAK,CAAC;KAChB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2EAA2E,EAAE,CAAC,CAAC,EAAE,EAAE;IACtF,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAA,UAAU,KAAK,SAAS,GAAG,CAAC,UAAU,CAAC;QAC/D,KAAK;QACL,KAAK;KACN,CAAC,EAAE,CAAC;IAEL,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE;QACjB,GAAG,EAAE,mCAAmC;QACxC,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,KAAK,CAAC;KAChB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,CAAC,CAAC,EAAE,EAAE;IAC3E,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;QAC1B,GAAG,CAAC,QAAQ,CAAA,GAAG,GAAG,CAAC,UAAU,CAAC;YAC5B,iCAAiC;YACjC,GAAG,EAAE,GAAE,CAAC;SACT,CAAC,EAAE,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,qDAAqD,CAAC,CAAC;AAC9E,CAAC,CAAC,CAAC"}
|
|
@@ -1,21 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const tokens_1 = require("../../tokens");
|
|
7
|
-
const createSqlTag_1 = require("../createSqlTag");
|
|
8
|
-
const ava_1 = __importDefault(require("ava"));
|
|
9
|
-
const sql = (0, createSqlTag_1.createSqlTag)();
|
|
10
|
-
(0, ava_1.default)('creates an empty make_interval invocation', (t) => {
|
|
1
|
+
import { FragmentToken } from '../../tokens.js';
|
|
2
|
+
import { createSqlTag } from '../createSqlTag.js';
|
|
3
|
+
import test from 'ava';
|
|
4
|
+
const sql = createSqlTag();
|
|
5
|
+
test('creates an empty make_interval invocation', (t) => {
|
|
11
6
|
const query = sql.fragment `SELECT ${sql.interval({})}`;
|
|
12
7
|
t.deepEqual(query, {
|
|
13
8
|
sql: 'SELECT make_interval()',
|
|
14
|
-
type:
|
|
9
|
+
type: FragmentToken,
|
|
15
10
|
values: [],
|
|
16
11
|
});
|
|
17
12
|
});
|
|
18
|
-
(
|
|
13
|
+
test('creates an interval', (t) => {
|
|
19
14
|
const query = sql.fragment `SELECT ${sql.interval({
|
|
20
15
|
days: 4,
|
|
21
16
|
hours: 5,
|
|
@@ -27,11 +22,11 @@ const sql = (0, createSqlTag_1.createSqlTag)();
|
|
|
27
22
|
})}`;
|
|
28
23
|
t.deepEqual(query, {
|
|
29
24
|
sql: 'SELECT make_interval(years => $slonik_1, months => $slonik_2, weeks => $slonik_3, days => $slonik_4, hours => $slonik_5, mins => $slonik_6, secs => $slonik_7)',
|
|
30
|
-
type:
|
|
25
|
+
type: FragmentToken,
|
|
31
26
|
values: [1, 2, 3, 4, 5, 6, 7],
|
|
32
27
|
});
|
|
33
28
|
});
|
|
34
|
-
(
|
|
29
|
+
test('throws if contains unknown properties', (t) => {
|
|
35
30
|
const error = t.throws(() => {
|
|
36
31
|
sql.fragment `SELECT ${sql.interval({
|
|
37
32
|
// @ts-expect-error - intentional
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interval.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/interval.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interval.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/interval.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,IAAI,MAAM,KAAK,CAAC;AAEvB,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;AAE3B,IAAI,CAAC,2CAA2C,EAAE,CAAC,CAAC,EAAE,EAAE;IACtD,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAA,UAAU,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;IAEvD,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE;QACjB,GAAG,EAAE,wBAAwB;QAC7B,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,EAAE;KACX,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC,EAAE,EAAE;IAChC,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAA,UAAU,GAAG,CAAC,QAAQ,CAAC;QAC/C,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,CAAC;QACT,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,CAAC;KACT,CAAC,EAAE,CAAC;IAEL,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE;QACjB,GAAG,EAAE,gKAAgK;QACrK,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KAC9B,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uCAAuC,EAAE,CAAC,CAAC,EAAE,EAAE;IAClD,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;QAC1B,GAAG,CAAC,QAAQ,CAAA,UAAU,GAAG,CAAC,QAAQ,CAAC;YACjC,iCAAiC;YACjC,GAAG,EAAE,KAAK;SACX,CAAC,EAAE,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,qDAAqD,CAAC,CAAC;AAC9E,CAAC,CAAC,CAAC"}
|