@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
|
@@ -1,18 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
6
|
-
const errors_1 = require("@slonik/errors");
|
|
7
|
-
const createBinarySqlFragment = (token, greatestParameterPosition) => {
|
|
1
|
+
import { FragmentToken } from '../tokens.js';
|
|
2
|
+
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder.js';
|
|
3
|
+
import { InvalidInputError } from '@slonik/errors';
|
|
4
|
+
export const createBinarySqlFragment = (token, greatestParameterPosition) => {
|
|
8
5
|
if (!Buffer.isBuffer(token.data)) {
|
|
9
|
-
throw new
|
|
6
|
+
throw new InvalidInputError('Binary value must be a buffer.');
|
|
10
7
|
}
|
|
11
8
|
return {
|
|
12
|
-
sql:
|
|
13
|
-
type:
|
|
9
|
+
sql: formatSlonikPlaceholder(greatestParameterPosition + 1),
|
|
10
|
+
type: FragmentToken,
|
|
14
11
|
values: [token.data],
|
|
15
12
|
};
|
|
16
13
|
};
|
|
17
|
-
exports.createBinarySqlFragment = createBinarySqlFragment;
|
|
18
14
|
//# sourceMappingURL=createBinarySqlFragment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createBinarySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createBinarySqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createBinarySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createBinarySqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,KAAqB,EACrB,yBAAiC,EACf,EAAE;IACpB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,iBAAiB,CAAC,gCAAgC,CAAC,CAAC;IAChE,CAAC;IAED,OAAO;QACL,GAAG,EAAE,uBAAuB,CAAC,yBAAyB,GAAG,CAAC,CAAC;QAC3D,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;KACrB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { DateSqlToken, SqlFragmentToken } from '../types.js';
|
|
2
2
|
export declare const createDateSqlFragment: (token: DateSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createDateSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createDateSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createDateSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createDateSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createDateSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,qBAAqB,GAChC,OAAO,YAAY,EACnB,2BAA2B,MAAM,KAChC,gBAYF,CAAC"}
|
|
@@ -1,18 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
6
|
-
const errors_1 = require("@slonik/errors");
|
|
7
|
-
const createDateSqlFragment = (token, greatestParameterPosition) => {
|
|
1
|
+
import { FragmentToken } from '../tokens.js';
|
|
2
|
+
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder.js';
|
|
3
|
+
import { InvalidInputError } from '@slonik/errors';
|
|
4
|
+
export const createDateSqlFragment = (token, greatestParameterPosition) => {
|
|
8
5
|
if (!(token.date instanceof Date)) {
|
|
9
|
-
throw new
|
|
6
|
+
throw new InvalidInputError('Date parameter value must be an instance of Date.');
|
|
10
7
|
}
|
|
11
8
|
return {
|
|
12
|
-
sql:
|
|
13
|
-
type:
|
|
9
|
+
sql: formatSlonikPlaceholder(greatestParameterPosition + 1) + '::date',
|
|
10
|
+
type: FragmentToken,
|
|
14
11
|
values: [token.date.toISOString().slice(0, 10)],
|
|
15
12
|
};
|
|
16
13
|
};
|
|
17
|
-
exports.createDateSqlFragment = createDateSqlFragment;
|
|
18
14
|
//# sourceMappingURL=createDateSqlFragment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createDateSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createDateSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createDateSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createDateSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAmB,EACnB,yBAAiC,EACf,EAAE;IACpB,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,iBAAiB,CACzB,mDAAmD,CACpD,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,EAAE,uBAAuB,CAAC,yBAAyB,GAAG,CAAC,CAAC,GAAG,QAAQ;QACtE,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { FragmentSqlToken, SqlFragmentToken } from '../types.js';
|
|
2
2
|
export declare const createFragmentSqlFragment: (token: FragmentSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createFragmentSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createFragmentSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createFragmentSqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createFragmentSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createFragmentSqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAItE,eAAO,MAAM,yBAAyB,GACpC,OAAO,gBAAgB,EACvB,2BAA2B,MAAM,KAChC,gBAwCF,CAAC"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
7
|
-
const errors_1 = require("@slonik/errors");
|
|
8
|
-
const createFragmentSqlFragment = (token, greatestParameterPosition) => {
|
|
1
|
+
import { slonikPlaceholderRegexRule } from '../regexRules/slonikPlaceholderRegexRule.js';
|
|
2
|
+
import { FragmentToken } from '../tokens.js';
|
|
3
|
+
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder.js';
|
|
4
|
+
import { UnexpectedStateError } from '@slonik/errors';
|
|
5
|
+
export const createFragmentSqlFragment = (token, greatestParameterPosition) => {
|
|
9
6
|
let sql = '';
|
|
10
7
|
let leastMatchedParameterPosition = Number.POSITIVE_INFINITY;
|
|
11
8
|
let greatestMatchedParameterPosition = 0;
|
|
12
|
-
sql += token.sql.replaceAll(
|
|
9
|
+
sql += token.sql.replaceAll(slonikPlaceholderRegexRule, (match, g1) => {
|
|
13
10
|
const parameterPosition = Number.parseInt(g1, 10);
|
|
14
11
|
if (parameterPosition > greatestMatchedParameterPosition) {
|
|
15
12
|
greatestMatchedParameterPosition = parameterPosition;
|
|
@@ -17,20 +14,19 @@ const createFragmentSqlFragment = (token, greatestParameterPosition) => {
|
|
|
17
14
|
if (parameterPosition < leastMatchedParameterPosition) {
|
|
18
15
|
leastMatchedParameterPosition = parameterPosition;
|
|
19
16
|
}
|
|
20
|
-
return
|
|
17
|
+
return formatSlonikPlaceholder(parameterPosition + greatestParameterPosition);
|
|
21
18
|
});
|
|
22
19
|
if (greatestMatchedParameterPosition > token.values.length) {
|
|
23
|
-
throw new
|
|
20
|
+
throw new UnexpectedStateError('The greatest parameter position is greater than the number of parameter values.');
|
|
24
21
|
}
|
|
25
22
|
if (leastMatchedParameterPosition !== Number.POSITIVE_INFINITY &&
|
|
26
23
|
leastMatchedParameterPosition !== 1) {
|
|
27
|
-
throw new
|
|
24
|
+
throw new UnexpectedStateError('Parameter position must start at 1.');
|
|
28
25
|
}
|
|
29
26
|
return {
|
|
30
27
|
sql,
|
|
31
|
-
type:
|
|
28
|
+
type: FragmentToken,
|
|
32
29
|
values: token.values,
|
|
33
30
|
};
|
|
34
31
|
};
|
|
35
|
-
exports.createFragmentSqlFragment = createFragmentSqlFragment;
|
|
36
32
|
//# sourceMappingURL=createFragmentSqlFragment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createFragmentSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createFragmentSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createFragmentSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createFragmentSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,KAAuB,EACvB,yBAAiC,EACf,EAAE;IACpB,IAAI,GAAG,GAAG,EAAE,CAAC;IAEb,IAAI,6BAA6B,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC7D,IAAI,gCAAgC,GAAG,CAAC,CAAC;IAEzC,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,0BAA0B,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACpE,MAAM,iBAAiB,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAElD,IAAI,iBAAiB,GAAG,gCAAgC,EAAE,CAAC;YACzD,gCAAgC,GAAG,iBAAiB,CAAC;QACvD,CAAC;QAED,IAAI,iBAAiB,GAAG,6BAA6B,EAAE,CAAC;YACtD,6BAA6B,GAAG,iBAAiB,CAAC;QACpD,CAAC;QAED,OAAO,uBAAuB,CAC5B,iBAAiB,GAAG,yBAAyB,CAC9C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,gCAAgC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC3D,MAAM,IAAI,oBAAoB,CAC5B,iFAAiF,CAClF,CAAC;IACJ,CAAC;IAED,IACE,6BAA6B,KAAK,MAAM,CAAC,iBAAiB;QAC1D,6BAA6B,KAAK,CAAC,EACnC,CAAC;QACD,MAAM,IAAI,oBAAoB,CAAC,qCAAqC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO;QACL,GAAG;QACH,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { IdentifierSqlToken, SqlFragmentToken } from '../types.js';
|
|
2
2
|
export declare const createIdentifierSqlFragment: (token: IdentifierSqlToken) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createIdentifierSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createIdentifierSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIdentifierSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createIdentifierSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIdentifierSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIxE,eAAO,MAAM,2BAA2B,GACtC,OAAO,kBAAkB,KACxB,gBAkBF,CAAC"}
|
|
@@ -1,23 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const escapeIdentifier_1 = require("../utilities/escapeIdentifier");
|
|
6
|
-
const errors_1 = require("@slonik/errors");
|
|
7
|
-
const createIdentifierSqlFragment = (token) => {
|
|
1
|
+
import { FragmentToken } from '../tokens.js';
|
|
2
|
+
import { escapeIdentifier } from '../utilities/escapeIdentifier.js';
|
|
3
|
+
import { InvalidInputError } from '@slonik/errors';
|
|
4
|
+
export const createIdentifierSqlFragment = (token) => {
|
|
8
5
|
const sql = token.names
|
|
9
6
|
.map((identifierName) => {
|
|
10
7
|
if (typeof identifierName !== 'string') {
|
|
11
|
-
throw new
|
|
8
|
+
throw new InvalidInputError('Identifier name array member type must be a string.');
|
|
12
9
|
}
|
|
13
|
-
return
|
|
10
|
+
return escapeIdentifier(identifierName);
|
|
14
11
|
})
|
|
15
12
|
.join('.');
|
|
16
13
|
return {
|
|
17
14
|
sql,
|
|
18
|
-
type:
|
|
15
|
+
type: FragmentToken,
|
|
19
16
|
values: [],
|
|
20
17
|
};
|
|
21
18
|
};
|
|
22
|
-
exports.createIdentifierSqlFragment = createIdentifierSqlFragment;
|
|
23
19
|
//# sourceMappingURL=createIdentifierSqlFragment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createIdentifierSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIdentifierSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createIdentifierSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIdentifierSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,KAAyB,EACP,EAAE;IACpB,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK;SACpB,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;QACtB,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE,CAAC;YACvC,MAAM,IAAI,iBAAiB,CACzB,qDAAqD,CACtD,CAAC;QACJ,CAAC;QAED,OAAO,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC1C,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,OAAO;QACL,GAAG;QACH,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,EAAE;KACX,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { IntervalSqlToken, SqlFragmentToken } from '../types.js';
|
|
2
2
|
export declare const createIntervalSqlFragment: (token: IntervalSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createIntervalSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createIntervalSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIntervalSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createIntervalSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIntervalSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAgCtE,eAAO,MAAM,yBAAyB,GACpC,OAAO,gBAAgB,EACvB,2BAA2B,MAAM,KAChC,gBAoCF,CAAC"}
|
|
@@ -1,19 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const errors_1 = require("@slonik/errors");
|
|
7
|
-
const zod_1 = require("zod");
|
|
8
|
-
const IntervalInput = zod_1.z
|
|
1
|
+
import { FragmentToken } from '../tokens.js';
|
|
2
|
+
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder.js';
|
|
3
|
+
import { InvalidInputError } from '@slonik/errors';
|
|
4
|
+
import { z } from 'zod';
|
|
5
|
+
const IntervalInput = z
|
|
9
6
|
.object({
|
|
10
|
-
days:
|
|
11
|
-
hours:
|
|
12
|
-
minutes:
|
|
13
|
-
months:
|
|
14
|
-
seconds:
|
|
15
|
-
weeks:
|
|
16
|
-
years:
|
|
7
|
+
days: z.number().optional(),
|
|
8
|
+
hours: z.number().optional(),
|
|
9
|
+
minutes: z.number().optional(),
|
|
10
|
+
months: z.number().optional(),
|
|
11
|
+
seconds: z.number().optional(),
|
|
12
|
+
weeks: z.number().optional(),
|
|
13
|
+
years: z.number().optional(),
|
|
17
14
|
})
|
|
18
15
|
.strict();
|
|
19
16
|
const intervalFragments = [
|
|
@@ -29,13 +26,13 @@ const tokenMap = {
|
|
|
29
26
|
minutes: 'mins',
|
|
30
27
|
seconds: 'secs',
|
|
31
28
|
};
|
|
32
|
-
const createIntervalSqlFragment = (token, greatestParameterPosition) => {
|
|
29
|
+
export const createIntervalSqlFragment = (token, greatestParameterPosition) => {
|
|
33
30
|
let intervalInput;
|
|
34
31
|
try {
|
|
35
32
|
intervalInput = IntervalInput.parse(token.interval);
|
|
36
33
|
}
|
|
37
34
|
catch {
|
|
38
|
-
throw new
|
|
35
|
+
throw new InvalidInputError('Interval input must not contain unknown properties.');
|
|
39
36
|
}
|
|
40
37
|
const values = [];
|
|
41
38
|
const intervalTokens = [];
|
|
@@ -46,14 +43,13 @@ const createIntervalSqlFragment = (token, greatestParameterPosition) => {
|
|
|
46
43
|
const mappedToken = tokenMap[intervalFragment] ?? intervalFragment;
|
|
47
44
|
intervalTokens.push(mappedToken +
|
|
48
45
|
' => ' +
|
|
49
|
-
|
|
46
|
+
formatSlonikPlaceholder(greatestParameterPosition + values.length));
|
|
50
47
|
}
|
|
51
48
|
}
|
|
52
49
|
return {
|
|
53
50
|
sql: 'make_interval(' + intervalTokens.join(', ') + ')',
|
|
54
|
-
type:
|
|
51
|
+
type: FragmentToken,
|
|
55
52
|
values,
|
|
56
53
|
};
|
|
57
54
|
};
|
|
58
|
-
exports.createIntervalSqlFragment = createIntervalSqlFragment;
|
|
59
55
|
//# sourceMappingURL=createIntervalSqlFragment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createIntervalSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIntervalSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createIntervalSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createIntervalSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,aAAa,GAAG,CAAC;KACpB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,MAAM,iBAAiB,GAAG;IACxB,OAAO;IACP,QAAQ;IACR,OAAO;IACP,MAAM;IACN,OAAO;IACP,SAAS;IACT,SAAS;CACV,CAAC;AAEF,MAAM,QAAQ,GAAG;IACf,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,KAAuB,EACvB,yBAAiC,EACf,EAAE;IACpB,IAAI,aAAa,CAAC;IAElB,IAAI,CAAC;QACH,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,iBAAiB,CACzB,qDAAqD,CACtD,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAE9C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEnB,MAAM,WAAW,GAAG,QAAQ,CAAC,gBAAgB,CAAC,IAAI,gBAAgB,CAAC;YAEnE,cAAc,CAAC,IAAI,CACjB,WAAW;gBACT,MAAM;gBACN,uBAAuB,CAAC,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,CACrE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EAAE,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG;QACvD,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { JsonBinarySqlToken, JsonSqlToken, SqlFragmentToken } from '../types.js';
|
|
2
2
|
export declare const createJsonSqlFragment: (token: JsonBinarySqlToken | JsonSqlToken, greatestParameterPosition: number, binary: boolean) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createJsonSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createJsonSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"createJsonSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAWrB,eAAO,MAAM,qBAAqB,GAChC,OAAO,kBAAkB,GAAG,YAAY,EACxC,2BAA2B,MAAM,EACjC,QAAQ,OAAO,KACd,gBA8CF,CAAC"}
|
|
@@ -1,51 +1,47 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
const errors_1 = require("@slonik/errors");
|
|
10
|
-
const serialize_error_1 = require("serialize-error");
|
|
11
|
-
const log = Logger_1.Logger.child({
|
|
1
|
+
import { Logger } from '../Logger.js';
|
|
2
|
+
import { FragmentToken } from '../tokens.js';
|
|
3
|
+
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder.js';
|
|
4
|
+
import { isPlainObject } from '../utilities/isPlainObject.js';
|
|
5
|
+
import { safeStringify } from '../utilities/safeStringify.js';
|
|
6
|
+
import { InvalidInputError } from '@slonik/errors';
|
|
7
|
+
import { serializeError } from 'serialize-error';
|
|
8
|
+
const log = Logger.child({
|
|
12
9
|
namespace: 'createJsonSqlFragment',
|
|
13
10
|
});
|
|
14
|
-
const createJsonSqlFragment = (token, greatestParameterPosition, binary) => {
|
|
11
|
+
export const createJsonSqlFragment = (token, greatestParameterPosition, binary) => {
|
|
15
12
|
let value;
|
|
16
13
|
if (token.value === undefined) {
|
|
17
|
-
throw new
|
|
14
|
+
throw new InvalidInputError('JSON payload must not be undefined.');
|
|
18
15
|
}
|
|
19
16
|
else if (token.value === null) {
|
|
20
17
|
value = 'null';
|
|
21
18
|
// @todo Deep check Array.
|
|
22
19
|
}
|
|
23
|
-
else if (!
|
|
20
|
+
else if (!isPlainObject(token.value) &&
|
|
24
21
|
!Array.isArray(token.value) &&
|
|
25
22
|
!['boolean', 'number', 'string'].includes(typeof token.value)) {
|
|
26
|
-
throw new
|
|
23
|
+
throw new InvalidInputError('JSON payload must be a primitive value or a plain object.');
|
|
27
24
|
}
|
|
28
25
|
else {
|
|
29
26
|
try {
|
|
30
|
-
value =
|
|
27
|
+
value = safeStringify(token.value);
|
|
31
28
|
}
|
|
32
29
|
catch (error) {
|
|
33
30
|
log.error({
|
|
34
|
-
error:
|
|
31
|
+
error: serializeError(error),
|
|
35
32
|
}, 'payload cannot be stringified');
|
|
36
|
-
throw new
|
|
33
|
+
throw new InvalidInputError('JSON payload cannot be stringified.');
|
|
37
34
|
}
|
|
38
35
|
if (value === undefined) {
|
|
39
|
-
throw new
|
|
36
|
+
throw new InvalidInputError('JSON payload cannot be stringified. The resulting value is undefined.');
|
|
40
37
|
}
|
|
41
38
|
}
|
|
42
39
|
return {
|
|
43
|
-
sql:
|
|
40
|
+
sql: formatSlonikPlaceholder(greatestParameterPosition + 1) +
|
|
44
41
|
'::' +
|
|
45
42
|
(binary ? 'jsonb' : 'json'),
|
|
46
|
-
type:
|
|
43
|
+
type: FragmentToken,
|
|
47
44
|
values: [value],
|
|
48
45
|
};
|
|
49
46
|
};
|
|
50
|
-
exports.createJsonSqlFragment = createJsonSqlFragment;
|
|
51
47
|
//# sourceMappingURL=createJsonSqlFragment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createJsonSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createJsonSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createJsonSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAM7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC;IACvB,SAAS,EAAE,uBAAuB;CACnC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAwC,EACxC,yBAAiC,EACjC,MAAe,EACG,EAAE;IACpB,IAAI,KAAK,CAAC;IAEV,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,IAAI,iBAAiB,CAAC,qCAAqC,CAAC,CAAC;IACrE,CAAC;SAAM,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;QAChC,KAAK,GAAG,MAAM,CAAC;QAEf,0BAA0B;IAC5B,CAAC;SAAM,IACL,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC;QAC3B,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;QAC3B,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,KAAK,CAAC,EAC7D,CAAC;QACD,MAAM,IAAI,iBAAiB,CACzB,2DAA2D,CAC5D,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CACP;gBACE,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC;aAC7B,EACD,+BAA+B,CAChC,CAAC;YAEF,MAAM,IAAI,iBAAiB,CAAC,qCAAqC,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,iBAAiB,CACzB,uEAAuE,CACxE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EACD,uBAAuB,CAAC,yBAAyB,GAAG,CAAC,CAAC;YACtD,IAAI;YACJ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAC7B,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,KAAK,CAAC;KAChB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { ListSqlToken, SqlFragmentToken } from '../types.js';
|
|
2
2
|
export declare const createListSqlFragment: (token: ListSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createListSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createListSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"createListSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,YAAY,EAEZ,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAMrB,eAAO,MAAM,qBAAqB,GAChC,OAAO,YAAY,EACnB,2BAA2B,MAAM,KAChC,gBAiCF,CAAC"}
|
|
@@ -1,40 +1,36 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const
|
|
9
|
-
const isSqlToken_1 = require("../utilities/isSqlToken");
|
|
10
|
-
const errors_1 = require("@slonik/errors");
|
|
11
|
-
const createListSqlFragment = (token, greatestParameterPosition) => {
|
|
1
|
+
import { createPrimitiveValueExpressions } from '../factories/createPrimitiveValueExpressions.js';
|
|
2
|
+
import { createSqlTokenSqlFragment } from '../factories/createSqlTokenSqlFragment.js';
|
|
3
|
+
import { FragmentToken } from '../tokens.js';
|
|
4
|
+
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder.js';
|
|
5
|
+
import { isPrimitiveValueExpression } from '../utilities/isPrimitiveValueExpression.js';
|
|
6
|
+
import { isSqlToken } from '../utilities/isSqlToken.js';
|
|
7
|
+
import { InvalidInputError } from '@slonik/errors';
|
|
8
|
+
export const createListSqlFragment = (token, greatestParameterPosition) => {
|
|
12
9
|
const values = [];
|
|
13
10
|
const placeholders = [];
|
|
14
11
|
let placeholderIndex = greatestParameterPosition;
|
|
15
12
|
if (token.members.length === 0) {
|
|
16
|
-
throw new
|
|
13
|
+
throw new InvalidInputError('Value list must have at least 1 member.');
|
|
17
14
|
}
|
|
18
15
|
for (const member of token.members) {
|
|
19
|
-
if (
|
|
20
|
-
const sqlFragment =
|
|
16
|
+
if (isSqlToken(member)) {
|
|
17
|
+
const sqlFragment = createSqlTokenSqlFragment(member, placeholderIndex);
|
|
21
18
|
placeholders.push(sqlFragment.sql);
|
|
22
19
|
placeholderIndex += sqlFragment.values.length;
|
|
23
20
|
values.push(...sqlFragment.values);
|
|
24
21
|
}
|
|
25
|
-
else if (
|
|
26
|
-
placeholders.push(
|
|
22
|
+
else if (isPrimitiveValueExpression(member)) {
|
|
23
|
+
placeholders.push(formatSlonikPlaceholder(++placeholderIndex));
|
|
27
24
|
values.push(member);
|
|
28
25
|
}
|
|
29
26
|
else {
|
|
30
|
-
throw new
|
|
27
|
+
throw new InvalidInputError('Invalid list member type. Must be a SQL token or a primitive value expression.');
|
|
31
28
|
}
|
|
32
29
|
}
|
|
33
30
|
return {
|
|
34
31
|
sql: placeholders.join(token.glue.sql),
|
|
35
|
-
type:
|
|
36
|
-
values:
|
|
32
|
+
type: FragmentToken,
|
|
33
|
+
values: createPrimitiveValueExpressions(values),
|
|
37
34
|
};
|
|
38
35
|
};
|
|
39
|
-
exports.createListSqlFragment = createListSqlFragment;
|
|
40
36
|
//# sourceMappingURL=createListSqlFragment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createListSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createListSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createListSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAM7C,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,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAmB,EACnB,yBAAiC,EACf,EAAE;IACpB,MAAM,MAAM,GAA+B,EAAE,CAAC;IAC9C,MAAM,YAAY,GAA2C,EAAE,CAAC;IAEhE,IAAI,gBAAgB,GAAG,yBAAyB,CAAC;IAEjD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,iBAAiB,CAAC,yCAAyC,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACvB,MAAM,WAAW,GAAG,yBAAyB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;YAExE,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACnC,gBAAgB,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;YAC9C,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;aAAM,IAAI,0BAA0B,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9C,YAAY,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;YAE/D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,iBAAiB,CACzB,gFAAgF,CACjF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;QACtC,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,+BAA+B,CAAC,MAAM,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { QuerySqlToken, SqlFragmentToken } from '../types.js';
|
|
2
2
|
export declare const createQuerySqlFragment: (token: QuerySqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createQuerySqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createQuerySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createQuerySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAInE,eAAO,MAAM,sBAAsB,GACjC,OAAO,aAAa,EACpB,2BAA2B,MAAM,KAChC,gBAwCF,CAAC"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
7
|
-
const errors_1 = require("@slonik/errors");
|
|
8
|
-
const createQuerySqlFragment = (token, greatestParameterPosition) => {
|
|
1
|
+
import { slonikPlaceholderRegexRule } from '../regexRules/slonikPlaceholderRegexRule.js';
|
|
2
|
+
import { FragmentToken } from '../tokens.js';
|
|
3
|
+
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder.js';
|
|
4
|
+
import { UnexpectedStateError } from '@slonik/errors';
|
|
5
|
+
export const createQuerySqlFragment = (token, greatestParameterPosition) => {
|
|
9
6
|
let sql = '';
|
|
10
7
|
let leastMatchedParameterPosition = Number.POSITIVE_INFINITY;
|
|
11
8
|
let greatestMatchedParameterPosition = 0;
|
|
12
|
-
sql += token.sql.replaceAll(
|
|
9
|
+
sql += token.sql.replaceAll(slonikPlaceholderRegexRule, (match, g1) => {
|
|
13
10
|
const parameterPosition = Number.parseInt(g1, 10);
|
|
14
11
|
if (parameterPosition > greatestMatchedParameterPosition) {
|
|
15
12
|
greatestMatchedParameterPosition = parameterPosition;
|
|
@@ -17,20 +14,19 @@ const createQuerySqlFragment = (token, greatestParameterPosition) => {
|
|
|
17
14
|
if (parameterPosition < leastMatchedParameterPosition) {
|
|
18
15
|
leastMatchedParameterPosition = parameterPosition;
|
|
19
16
|
}
|
|
20
|
-
return
|
|
17
|
+
return formatSlonikPlaceholder(parameterPosition + greatestParameterPosition);
|
|
21
18
|
});
|
|
22
19
|
if (greatestMatchedParameterPosition > token.values.length) {
|
|
23
|
-
throw new
|
|
20
|
+
throw new UnexpectedStateError('The greatest parameter position is greater than the number of parameter values.');
|
|
24
21
|
}
|
|
25
22
|
if (leastMatchedParameterPosition !== Number.POSITIVE_INFINITY &&
|
|
26
23
|
leastMatchedParameterPosition !== 1) {
|
|
27
|
-
throw new
|
|
24
|
+
throw new UnexpectedStateError('Parameter position must start at 1.');
|
|
28
25
|
}
|
|
29
26
|
return {
|
|
30
27
|
sql,
|
|
31
|
-
type:
|
|
28
|
+
type: FragmentToken,
|
|
32
29
|
values: token.values,
|
|
33
30
|
};
|
|
34
31
|
};
|
|
35
|
-
exports.createQuerySqlFragment = createQuerySqlFragment;
|
|
36
32
|
//# sourceMappingURL=createQuerySqlFragment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createQuerySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createQuerySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createQuerySqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAAoB,EACpB,yBAAiC,EACf,EAAE;IACpB,IAAI,GAAG,GAAG,EAAE,CAAC;IAEb,IAAI,6BAA6B,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAC7D,IAAI,gCAAgC,GAAG,CAAC,CAAC;IAEzC,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,0BAA0B,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACpE,MAAM,iBAAiB,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAElD,IAAI,iBAAiB,GAAG,gCAAgC,EAAE,CAAC;YACzD,gCAAgC,GAAG,iBAAiB,CAAC;QACvD,CAAC;QAED,IAAI,iBAAiB,GAAG,6BAA6B,EAAE,CAAC;YACtD,6BAA6B,GAAG,iBAAiB,CAAC;QACpD,CAAC;QAED,OAAO,uBAAuB,CAC5B,iBAAiB,GAAG,yBAAyB,CAC9C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,gCAAgC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC3D,MAAM,IAAI,oBAAoB,CAC5B,iFAAiF,CAClF,CAAC;IACJ,CAAC;IAED,IACE,6BAA6B,KAAK,MAAM,CAAC,iBAAiB;QAC1D,6BAA6B,KAAK,CAAC,EACnC,CAAC;QACD,MAAM,IAAI,oBAAoB,CAAC,qCAAqC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO;QACL,GAAG;QACH,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { SqlFragmentToken, TimestampSqlToken } from '../types.js';
|
|
2
2
|
export declare const createTimestampSqlFragment: (token: TimestampSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createTimestampSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTimestampSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createTimestampSqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIvE,eAAO,MAAM,0BAA0B,GACrC,OAAO,iBAAiB,EACxB,2BAA2B,MAAM,KAChC,gBAeF,CAAC"}
|
|
@@ -1,20 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
|
|
6
|
-
const errors_1 = require("@slonik/errors");
|
|
7
|
-
const createTimestampSqlFragment = (token, greatestParameterPosition) => {
|
|
1
|
+
import { FragmentToken } from '../tokens.js';
|
|
2
|
+
import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder.js';
|
|
3
|
+
import { InvalidInputError } from '@slonik/errors';
|
|
4
|
+
export const createTimestampSqlFragment = (token, greatestParameterPosition) => {
|
|
8
5
|
if (!(token.date instanceof Date)) {
|
|
9
|
-
throw new
|
|
6
|
+
throw new InvalidInputError('Timestamp parameter value must be an instance of Date.');
|
|
10
7
|
}
|
|
11
8
|
return {
|
|
12
9
|
sql: 'to_timestamp(' +
|
|
13
|
-
|
|
10
|
+
formatSlonikPlaceholder(greatestParameterPosition + 1) +
|
|
14
11
|
')',
|
|
15
|
-
type:
|
|
16
|
-
values: [String(token.date.getTime() /
|
|
12
|
+
type: FragmentToken,
|
|
13
|
+
values: [String(token.date.getTime() / 1_000)],
|
|
17
14
|
};
|
|
18
15
|
};
|
|
19
|
-
exports.createTimestampSqlFragment = createTimestampSqlFragment;
|
|
20
16
|
//# sourceMappingURL=createTimestampSqlFragment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTimestampSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createTimestampSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createTimestampSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,KAAwB,EACxB,yBAAiC,EACf,EAAE;IACpB,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,iBAAiB,CACzB,wDAAwD,CACzD,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,EACD,eAAe;YACf,uBAAuB,CAAC,yBAAyB,GAAG,CAAC,CAAC;YACtD,GAAG;QACL,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;KAC/C,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { SqlFragmentToken, UnnestSqlToken } from '../types.js';
|
|
2
2
|
export declare const createUnnestSqlFragment: (token: UnnestSqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createUnnestSqlFragment.d.ts.map
|