@slonik/sql-tag 48.12.3 → 48.13.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -1
- package/dist/Logger.js +2 -2
- package/dist/factories/createPrimitiveValueExpressions.d.ts +1 -1
- package/dist/factories/createPrimitiveValueExpressions.js +10 -10
- package/dist/factories/createSqlTag.d.ts +2 -2
- package/dist/factories/createSqlTag.d.ts.map +1 -1
- package/dist/factories/createSqlTag.js +16 -16
- package/dist/factories/createSqlTag.js.map +1 -1
- package/dist/factories/createSqlTag.test/array.test.js +44 -44
- package/dist/factories/createSqlTag.test/array.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/date.test.js +9 -9
- package/dist/factories/createSqlTag.test/date.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/identifier.test.js +11 -14
- package/dist/factories/createSqlTag.test/identifier.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/interval.test.js +10 -10
- package/dist/factories/createSqlTag.test/join.test.js +24 -24
- package/dist/factories/createSqlTag.test/join.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/json.test.js +27 -27
- package/dist/factories/createSqlTag.test/json.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/jsonb.test.js +27 -27
- package/dist/factories/createSqlTag.test/jsonb.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/literalValue.test.js +5 -5
- package/dist/factories/createSqlTag.test/literalValue.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/sql.test.js +37 -37
- package/dist/factories/createSqlTag.test/sql.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/timestamp.test.js +9 -9
- package/dist/factories/createSqlTag.test/timestamp.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/type.test.js +4 -4
- package/dist/factories/createSqlTag.test/typeAlias.test.js +8 -8
- package/dist/factories/createSqlTag.test/unnest.test.js +25 -25
- package/dist/factories/createSqlTag.test/unnest.test.js.map +1 -1
- package/dist/factories/createSqlTag.test/uuid.test.js +10 -10
- 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 +28 -67
- package/dist/factories/createSqlTokenSqlFragment.js.map +1 -1
- package/dist/index.d.ts +5 -5
- package/dist/index.js +4 -4
- package/dist/sqlFragmentFactories/createArraySqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createArraySqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createArraySqlFragment.js +15 -15
- package/dist/sqlFragmentFactories/createArraySqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createBinarySqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createBinarySqlFragment.js +4 -4
- package/dist/sqlFragmentFactories/createDateSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createDateSqlFragment.d.ts.map +1 -1
- package/dist/sqlFragmentFactories/createDateSqlFragment.js +5 -5
- 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 +7 -7
- 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 +6 -6
- 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 +10 -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 +16 -18
- 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 +9 -9
- 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 +7 -7
- 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 +5 -7
- 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 +19 -20
- package/dist/sqlFragmentFactories/createUnnestSqlFragment.js.map +1 -1
- package/dist/sqlFragmentFactories/createUuidSqlFragment.d.ts +1 -1
- package/dist/sqlFragmentFactories/createUuidSqlFragment.js +5 -5
- package/dist/tokens.d.ts.map +1 -1
- package/dist/tokens.js +14 -14
- package/dist/tokens.js.map +1 -1
- package/dist/types.d.ts +5 -5
- package/dist/types.d.ts.map +1 -1
- package/dist/utilities/countArrayDimensions.js +1 -1
- package/dist/utilities/countArrayDimensions.test.js +6 -6
- package/dist/utilities/escapeIdentifier.test.js +5 -5
- package/dist/utilities/escapeLiteralValue.js +2 -2
- package/dist/utilities/escapeLiteralValue.test.js +7 -7
- package/dist/utilities/formatSlonikPlaceholder.js +1 -1
- package/dist/utilities/isPlainObject.js +1 -1
- package/dist/utilities/isPrimitiveValueExpression.js +4 -4
- package/dist/utilities/isSqlToken.d.ts +1 -1
- package/dist/utilities/isSqlToken.d.ts.map +1 -1
- package/dist/utilities/isSqlToken.js +9 -9
- package/dist/utilities/isSqlToken.js.map +1 -1
- package/dist/utilities/safeStringify.js +3 -3
- package/dist/utilities/stripArrayNotation.js +1 -1
- package/dist/utilities/stripArrayNotation.test.js +6 -6
- package/package.json +35 -39
- package/src/Logger.ts +2 -2
- package/src/declarations.d.ts +2 -2
- package/src/factories/createPrimitiveValueExpressions.ts +11 -11
- package/src/factories/createSqlTag.test/array.test.ts +54 -66
- package/src/factories/createSqlTag.test/date.test.ts +9 -11
- package/src/factories/createSqlTag.test/identifier.test.ts +11 -14
- package/src/factories/createSqlTag.test/interval.test.ts +10 -10
- package/src/factories/createSqlTag.test/join.test.ts +25 -31
- package/src/factories/createSqlTag.test/json.test.ts +27 -30
- package/src/factories/createSqlTag.test/jsonb.test.ts +27 -30
- package/src/factories/createSqlTag.test/literalValue.test.ts +5 -7
- package/src/factories/createSqlTag.test/sql.test.ts +38 -41
- package/src/factories/createSqlTag.test/timestamp.test.ts +9 -14
- package/src/factories/createSqlTag.test/type.test.ts +4 -4
- package/src/factories/createSqlTag.test/typeAlias.test.ts +9 -9
- package/src/factories/createSqlTag.test/unnest.test.ts +25 -34
- package/src/factories/createSqlTag.test/uuid.test.ts +10 -12
- package/src/factories/createSqlTag.ts +26 -47
- package/src/factories/createSqlTokenSqlFragment.ts +30 -74
- package/src/index.ts +5 -5
- package/src/sqlFragmentFactories/createArraySqlFragment.ts +17 -22
- package/src/sqlFragmentFactories/createBinarySqlFragment.ts +5 -5
- package/src/sqlFragmentFactories/createDateSqlFragment.ts +6 -8
- package/src/sqlFragmentFactories/createFragmentSqlFragment.ts +9 -11
- package/src/sqlFragmentFactories/createIdentifierSqlFragment.ts +8 -12
- package/src/sqlFragmentFactories/createIntervalSqlFragment.ts +11 -23
- package/src/sqlFragmentFactories/createJsonSqlFragment.ts +17 -25
- package/src/sqlFragmentFactories/createListSqlFragment.ts +10 -14
- package/src/sqlFragmentFactories/createQuerySqlFragment.ts +9 -11
- package/src/sqlFragmentFactories/createTimestampSqlFragment.ts +6 -11
- package/src/sqlFragmentFactories/createUnnestSqlFragment.ts +20 -29
- package/src/sqlFragmentFactories/createUuidSqlFragment.ts +6 -6
- package/src/tokens.ts +14 -16
- package/src/types.ts +65 -87
- package/src/utilities/countArrayDimensions.test.ts +6 -6
- package/src/utilities/countArrayDimensions.ts +1 -1
- package/src/utilities/escapeIdentifier.test.ts +5 -5
- package/src/utilities/escapeLiteralValue.test.ts +7 -7
- package/src/utilities/escapeLiteralValue.ts +2 -2
- package/src/utilities/formatSlonikPlaceholder.ts +1 -1
- package/src/utilities/isPlainObject.ts +1 -1
- package/src/utilities/isPrimitiveValueExpression.ts +4 -4
- package/src/utilities/isSqlToken.ts +10 -12
- package/src/utilities/safeStringify.ts +3 -3
- package/src/utilities/stripArrayNotation.test.ts +6 -6
- package/src/utilities/stripArrayNotation.ts +1 -1
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { FragmentToken } from
|
|
2
|
-
import { createSqlTag } from
|
|
3
|
-
import test from
|
|
1
|
+
import { FragmentToken } from "../../tokens.js";
|
|
2
|
+
import { createSqlTag } from "../createSqlTag.js";
|
|
3
|
+
import test from "ava";
|
|
4
4
|
const sql = createSqlTag();
|
|
5
|
-
test(
|
|
5
|
+
test("creates an unnest expression using primitive values (type name identifier)", (t) => {
|
|
6
6
|
const query = sql.fragment `SELECT * FROM ${sql.unnest([
|
|
7
7
|
[1, 2, 3],
|
|
8
8
|
[4, 5, 6],
|
|
9
|
-
], [
|
|
9
|
+
], ["int4", "int4", "int4"])}`;
|
|
10
10
|
t.deepEqual(query, {
|
|
11
11
|
sql: 'SELECT * FROM unnest($slonik_1::"int4"[], $slonik_2::"int4"[], $slonik_3::"int4"[])',
|
|
12
12
|
type: FragmentToken,
|
|
@@ -17,13 +17,13 @@ test('creates an unnest expression using primitive values (type name identifier)
|
|
|
17
17
|
],
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
|
-
test(
|
|
20
|
+
test("creates an unnest expression using primitive values (sql token)", (t) => {
|
|
21
21
|
const query = sql.fragment `SELECT * FROM ${sql.unnest([
|
|
22
22
|
[1, 2, 3],
|
|
23
23
|
[4, 5, 6],
|
|
24
24
|
], [sql.fragment `integer`, sql.fragment `integer`, sql.fragment `integer`])}`;
|
|
25
25
|
t.deepEqual(query, {
|
|
26
|
-
sql:
|
|
26
|
+
sql: "SELECT * FROM unnest($slonik_1::integer[], $slonik_2::integer[], $slonik_3::integer[])",
|
|
27
27
|
type: FragmentToken,
|
|
28
28
|
values: [
|
|
29
29
|
[1, 4],
|
|
@@ -32,13 +32,13 @@ test('creates an unnest expression using primitive values (sql token)', (t) => {
|
|
|
32
32
|
],
|
|
33
33
|
});
|
|
34
34
|
});
|
|
35
|
-
test(
|
|
35
|
+
test("treats type as sql.identifier", (t) => {
|
|
36
36
|
const query = sql.fragment `SELECT bar, baz FROM ${sql.unnest([
|
|
37
37
|
[1, 3],
|
|
38
38
|
[2, 4],
|
|
39
39
|
], [
|
|
40
|
-
[
|
|
41
|
-
[
|
|
40
|
+
["foo", "int4"],
|
|
41
|
+
["foo", "int4"],
|
|
42
42
|
])} AS foo(bar, baz)`;
|
|
43
43
|
t.deepEqual(query, {
|
|
44
44
|
sql: 'SELECT bar, baz FROM unnest($slonik_1::"foo"."int4"[], $slonik_2::"foo"."int4"[]) AS foo(bar, baz)',
|
|
@@ -49,11 +49,11 @@ test('treats type as sql.identifier', (t) => {
|
|
|
49
49
|
],
|
|
50
50
|
});
|
|
51
51
|
});
|
|
52
|
-
test(
|
|
52
|
+
test("creates an unnest expression using arrays", (t) => {
|
|
53
53
|
const query = sql.fragment `SELECT * FROM ${sql.unnest([
|
|
54
54
|
[1, 2, 3],
|
|
55
55
|
[4, 5, 6],
|
|
56
|
-
], [
|
|
56
|
+
], ["int4", "int4", "int4"])}`;
|
|
57
57
|
t.deepEqual(query, {
|
|
58
58
|
sql: 'SELECT * FROM unnest($slonik_1::"int4"[], $slonik_2::"int4"[], $slonik_3::"int4"[])',
|
|
59
59
|
type: FragmentToken,
|
|
@@ -64,11 +64,11 @@ test('creates an unnest expression using arrays', (t) => {
|
|
|
64
64
|
],
|
|
65
65
|
});
|
|
66
66
|
});
|
|
67
|
-
test(
|
|
67
|
+
test("creates incremental alias names if no alias names are provided", (t) => {
|
|
68
68
|
const query = sql.fragment `SELECT * FROM ${sql.unnest([
|
|
69
69
|
[1, 2, 3],
|
|
70
70
|
[4, 5, 6],
|
|
71
|
-
], [
|
|
71
|
+
], ["int4", "int4", "int4"])}`;
|
|
72
72
|
t.deepEqual(query, {
|
|
73
73
|
sql: 'SELECT * FROM unnest($slonik_1::"int4"[], $slonik_2::"int4"[], $slonik_3::"int4"[])',
|
|
74
74
|
type: FragmentToken,
|
|
@@ -79,39 +79,39 @@ test('creates incremental alias names if no alias names are provided', (t) => {
|
|
|
79
79
|
],
|
|
80
80
|
});
|
|
81
81
|
});
|
|
82
|
-
test(
|
|
83
|
-
const query = sql.fragment `SELECT * FROM ${sql.unnest([[[[1], [2], [3]]]], [
|
|
82
|
+
test("recognizes an array of arrays array", (t) => {
|
|
83
|
+
const query = sql.fragment `SELECT * FROM ${sql.unnest([[[[1], [2], [3]]]], ["int4[]"])}`;
|
|
84
84
|
t.deepEqual(query, {
|
|
85
85
|
sql: 'SELECT * FROM unnest($slonik_1::"int4"[][])',
|
|
86
86
|
type: FragmentToken,
|
|
87
87
|
values: [[[[1], [2], [3]]]],
|
|
88
88
|
});
|
|
89
89
|
});
|
|
90
|
-
test(
|
|
90
|
+
test("throws if tuple member is not a primitive value expression", (t) => {
|
|
91
91
|
const error = t.throws(() => {
|
|
92
92
|
sql.fragment `SELECT * FROM ${sql.unnest([
|
|
93
93
|
[() => { }, 2, 3],
|
|
94
94
|
[4, 5],
|
|
95
|
-
], [
|
|
95
|
+
], ["int4", "int4", "int4"])}`;
|
|
96
96
|
});
|
|
97
|
-
t.is(error?.message,
|
|
97
|
+
t.is(error?.message, "Invalid unnest tuple member type. Must be a primitive value expression.");
|
|
98
98
|
});
|
|
99
|
-
test(
|
|
99
|
+
test("throws if tuple member length varies in a list of tuples", (t) => {
|
|
100
100
|
const error = t.throws(() => {
|
|
101
101
|
sql.fragment `SELECT * FROM ${sql.unnest([
|
|
102
102
|
[1, 2, 3],
|
|
103
103
|
[4, 5],
|
|
104
|
-
], [
|
|
104
|
+
], ["int4", "int4", "int4"])}`;
|
|
105
105
|
});
|
|
106
|
-
t.is(error?.message,
|
|
106
|
+
t.is(error?.message, "Each tuple in a list of tuples must have an equal number of members.");
|
|
107
107
|
});
|
|
108
|
-
test(
|
|
108
|
+
test("throws if tuple member length does not match column types length", (t) => {
|
|
109
109
|
const error = t.throws(() => {
|
|
110
110
|
sql.fragment `SELECT * FROM ${sql.unnest([
|
|
111
111
|
[1, 2, 3],
|
|
112
112
|
[4, 5, 6],
|
|
113
|
-
], [
|
|
113
|
+
], ["int4", "int4"])}`;
|
|
114
114
|
});
|
|
115
|
-
t.is(error?.message,
|
|
115
|
+
t.is(error?.message, "Column types length must match tuple member length.");
|
|
116
116
|
});
|
|
117
117
|
//# sourceMappingURL=unnest.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unnest.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/unnest.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"unnest.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/unnest.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import { FragmentToken } from
|
|
2
|
-
import { createSqlTag } from
|
|
3
|
-
import test from
|
|
1
|
+
import { FragmentToken } from "../../tokens.js";
|
|
2
|
+
import { createSqlTag } from "../createSqlTag.js";
|
|
3
|
+
import test from "ava";
|
|
4
4
|
const sql = createSqlTag();
|
|
5
|
-
test(
|
|
6
|
-
const query = sql.fragment `SELECT ${sql.uuid(
|
|
5
|
+
test("binds a uuid", (t) => {
|
|
6
|
+
const query = sql.fragment `SELECT ${sql.uuid("00000000-0000-0000-0000-000000000000")}`;
|
|
7
7
|
t.deepEqual(query, {
|
|
8
|
-
sql:
|
|
8
|
+
sql: "SELECT $slonik_1::uuid",
|
|
9
9
|
type: FragmentToken,
|
|
10
|
-
values: [
|
|
10
|
+
values: ["00000000-0000-0000-0000-000000000000"],
|
|
11
11
|
});
|
|
12
12
|
});
|
|
13
|
-
test(
|
|
13
|
+
test("throws if not valid uuid", (t) => {
|
|
14
14
|
const error = t.throws(() => {
|
|
15
|
-
sql.fragment `SELECT ${sql.uuid(
|
|
15
|
+
sql.fragment `SELECT ${sql.uuid("1")}`;
|
|
16
16
|
});
|
|
17
|
-
t.is(error?.message,
|
|
17
|
+
t.is(error?.message, "UUID parameter value must be a valid UUID.");
|
|
18
18
|
});
|
|
19
19
|
//# sourceMappingURL=uuid.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uuid.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/uuid.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,
|
|
1
|
+
{"version":3,"file":"uuid.test.js","sourceRoot":"","sources":["../../../src/factories/createSqlTag.test/uuid.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,CAAC,sCAAsC,CAAC,EAAE,CAAC;IAEvF,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE;QACjB,GAAG,EAAE,wBAAwB;QAC7B,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,sCAAsC,CAAC;KACjD,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC,EAAE,EAAE;IACrC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;QAC1B,GAAG,CAAC,QAAQ,CAAA,UAAU,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,4CAA4C,CAAC,CAAC;AACrE,CAAC,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { SqlFragmentToken, SqlToken as SqlTokenType } from
|
|
1
|
+
import type { SqlFragmentToken, SqlToken as SqlTokenType } from "../types.js";
|
|
2
2
|
export declare const createSqlTokenSqlFragment: (token: SqlTokenType, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createSqlTokenSqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSqlTokenSqlFragment.d.ts","sourceRoot":"","sources":["../../src/factories/createSqlTokenSqlFragment.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAWV,gBAAgB,EAChB,QAAQ,IAAI,YAAY,EAIzB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"createSqlTokenSqlFragment.d.ts","sourceRoot":"","sources":["../../src/factories/createSqlTokenSqlFragment.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAWV,gBAAgB,EAChB,QAAQ,IAAI,YAAY,EAIzB,MAAM,aAAa,CAAC;AAqBrB,eAAO,MAAM,yBAAyB,GACpC,OAAO,YAAY,EACnB,2BAA2B,MAAM,KAChC,gBAQF,CAAC"}
|
|
@@ -1,76 +1,37 @@
|
|
|
1
|
-
import { createArraySqlFragment } from
|
|
2
|
-
import { createBinarySqlFragment } from
|
|
3
|
-
import { createDateSqlFragment } from
|
|
4
|
-
import { createFragmentSqlFragment } from
|
|
5
|
-
import { createIdentifierSqlFragment } from
|
|
6
|
-
import { createIntervalSqlFragment } from
|
|
7
|
-
import { createJsonSqlFragment } from
|
|
8
|
-
import { createListSqlFragment } from
|
|
9
|
-
import { createQuerySqlFragment } from
|
|
10
|
-
import { createTimestampSqlFragment } from
|
|
11
|
-
import { createUnnestSqlFragment } from
|
|
12
|
-
import { createUuidSqlFragment } from
|
|
13
|
-
import { ArrayToken, BinaryToken, DateToken, FragmentToken, IdentifierToken, IntervalToken, JsonBinaryToken, JsonToken, ListToken, QueryToken, TimestampToken, UnnestToken, UuidToken, } from
|
|
14
|
-
import { UnexpectedStateError } from
|
|
1
|
+
import { createArraySqlFragment } from "../sqlFragmentFactories/createArraySqlFragment.js";
|
|
2
|
+
import { createBinarySqlFragment } from "../sqlFragmentFactories/createBinarySqlFragment.js";
|
|
3
|
+
import { createDateSqlFragment } from "../sqlFragmentFactories/createDateSqlFragment.js";
|
|
4
|
+
import { createFragmentSqlFragment } from "../sqlFragmentFactories/createFragmentSqlFragment.js";
|
|
5
|
+
import { createIdentifierSqlFragment } from "../sqlFragmentFactories/createIdentifierSqlFragment.js";
|
|
6
|
+
import { createIntervalSqlFragment } from "../sqlFragmentFactories/createIntervalSqlFragment.js";
|
|
7
|
+
import { createJsonSqlFragment } from "../sqlFragmentFactories/createJsonSqlFragment.js";
|
|
8
|
+
import { createListSqlFragment } from "../sqlFragmentFactories/createListSqlFragment.js";
|
|
9
|
+
import { createQuerySqlFragment } from "../sqlFragmentFactories/createQuerySqlFragment.js";
|
|
10
|
+
import { createTimestampSqlFragment } from "../sqlFragmentFactories/createTimestampSqlFragment.js";
|
|
11
|
+
import { createUnnestSqlFragment } from "../sqlFragmentFactories/createUnnestSqlFragment.js";
|
|
12
|
+
import { createUuidSqlFragment } from "../sqlFragmentFactories/createUuidSqlFragment.js";
|
|
13
|
+
import { ArrayToken, BinaryToken, DateToken, FragmentToken, IdentifierToken, IntervalToken, JsonBinaryToken, JsonToken, ListToken, QueryToken, TimestampToken, UnnestToken, UuidToken, } from "../tokens.js";
|
|
14
|
+
import { UnexpectedStateError } from "@slonik/errors";
|
|
15
15
|
const tokenHandlers = new Map([
|
|
16
|
-
[
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
],
|
|
20
|
-
[
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
],
|
|
24
|
-
[
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
],
|
|
28
|
-
[
|
|
29
|
-
FragmentToken,
|
|
30
|
-
(token, pos) => createFragmentSqlFragment(token, pos),
|
|
31
|
-
],
|
|
32
|
-
[
|
|
33
|
-
IdentifierToken,
|
|
34
|
-
(token) => createIdentifierSqlFragment(token),
|
|
35
|
-
],
|
|
36
|
-
[
|
|
37
|
-
IntervalToken,
|
|
38
|
-
(token, pos) => createIntervalSqlFragment(token, pos),
|
|
39
|
-
],
|
|
40
|
-
[
|
|
41
|
-
JsonBinaryToken,
|
|
42
|
-
(token, pos) => createJsonSqlFragment(token, pos, true),
|
|
43
|
-
],
|
|
44
|
-
[
|
|
45
|
-
JsonToken,
|
|
46
|
-
(token, pos) => createJsonSqlFragment(token, pos, false),
|
|
47
|
-
],
|
|
48
|
-
[
|
|
49
|
-
ListToken,
|
|
50
|
-
(token, pos) => createListSqlFragment(token, pos),
|
|
51
|
-
],
|
|
52
|
-
[
|
|
53
|
-
QueryToken,
|
|
54
|
-
(token, pos) => createQuerySqlFragment(token, pos),
|
|
55
|
-
],
|
|
56
|
-
[
|
|
57
|
-
TimestampToken,
|
|
58
|
-
(token, pos) => createTimestampSqlFragment(token, pos),
|
|
59
|
-
],
|
|
60
|
-
[
|
|
61
|
-
UnnestToken,
|
|
62
|
-
(token, pos) => createUnnestSqlFragment(token, pos),
|
|
63
|
-
],
|
|
64
|
-
[
|
|
65
|
-
UuidToken,
|
|
66
|
-
(token, pos) => createUuidSqlFragment(token, pos),
|
|
67
|
-
],
|
|
16
|
+
[ArrayToken, (token, pos) => createArraySqlFragment(token, pos)],
|
|
17
|
+
[BinaryToken, (token, pos) => createBinarySqlFragment(token, pos)],
|
|
18
|
+
[DateToken, (token, pos) => createDateSqlFragment(token, pos)],
|
|
19
|
+
[FragmentToken, (token, pos) => createFragmentSqlFragment(token, pos)],
|
|
20
|
+
[IdentifierToken, (token) => createIdentifierSqlFragment(token)],
|
|
21
|
+
[IntervalToken, (token, pos) => createIntervalSqlFragment(token, pos)],
|
|
22
|
+
[JsonBinaryToken, (token, pos) => createJsonSqlFragment(token, pos, true)],
|
|
23
|
+
[JsonToken, (token, pos) => createJsonSqlFragment(token, pos, false)],
|
|
24
|
+
[ListToken, (token, pos) => createListSqlFragment(token, pos)],
|
|
25
|
+
[QueryToken, (token, pos) => createQuerySqlFragment(token, pos)],
|
|
26
|
+
[TimestampToken, (token, pos) => createTimestampSqlFragment(token, pos)],
|
|
27
|
+
[UnnestToken, (token, pos) => createUnnestSqlFragment(token, pos)],
|
|
28
|
+
[UuidToken, (token, pos) => createUuidSqlFragment(token, pos)],
|
|
68
29
|
]);
|
|
69
30
|
export const createSqlTokenSqlFragment = (token, greatestParameterPosition) => {
|
|
70
31
|
const handler = tokenHandlers.get(token.type);
|
|
71
32
|
if (handler) {
|
|
72
33
|
return handler(token, greatestParameterPosition);
|
|
73
34
|
}
|
|
74
|
-
throw new UnexpectedStateError(
|
|
35
|
+
throw new UnexpectedStateError("Unexpected token type.");
|
|
75
36
|
};
|
|
76
37
|
//# sourceMappingURL=createSqlTokenSqlFragment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSqlTokenSqlFragment.js","sourceRoot":"","sources":["../../src/factories/createSqlTokenSqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,sDAAsD,CAAC;AACjG,OAAO,EAAE,2BAA2B,EAAE,MAAM,wDAAwD,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,MAAM,sDAAsD,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AACnG,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,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;AAkBtB,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"createSqlTokenSqlFragment.js","sourceRoot":"","sources":["../../src/factories/createSqlTokenSqlFragment.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export { createSqlTag } from
|
|
2
|
-
export { createSqlTokenSqlFragment } from
|
|
3
|
-
export { ArrayToken, BinaryToken, ComparisonPredicateToken, DateToken, FragmentToken, IdentifierToken, IntervalToken, JsonBinaryToken, JsonToken, ListToken, QueryToken, TimestampToken, UnnestToken, UuidToken, } from
|
|
4
|
-
export { type ArraySqlToken, type BinarySqlToken, type DateSqlToken, type FragmentSqlToken, type IdentifierSqlToken, type IntervalInput, type IntervalSqlToken, type JsonBinarySqlToken, type JsonSqlToken, type ListSqlToken, type PrimitiveValueExpression, type QuerySqlToken, type SerializableValue, type SqlFragmentToken, type SqlTag, type SqlToken, type TimestampSqlToken, type UnnestSqlToken, type UuidSqlToken, type ValueExpression, } from
|
|
5
|
-
export { isSqlToken } from
|
|
1
|
+
export { createSqlTag } from "./factories/createSqlTag.js";
|
|
2
|
+
export { createSqlTokenSqlFragment } from "./factories/createSqlTokenSqlFragment.js";
|
|
3
|
+
export { ArrayToken, BinaryToken, ComparisonPredicateToken, DateToken, FragmentToken, IdentifierToken, IntervalToken, JsonBinaryToken, JsonToken, ListToken, QueryToken, TimestampToken, UnnestToken, UuidToken, } from "./tokens.js";
|
|
4
|
+
export { type ArraySqlToken, type BinarySqlToken, type DateSqlToken, type FragmentSqlToken, type IdentifierSqlToken, type IntervalInput, type IntervalSqlToken, type JsonBinarySqlToken, type JsonSqlToken, type ListSqlToken, type PrimitiveValueExpression, type QuerySqlToken, type SerializableValue, type SqlFragmentToken, type SqlTag, type SqlToken, type TimestampSqlToken, type UnnestSqlToken, type UuidSqlToken, type ValueExpression, } from "./types.js";
|
|
5
|
+
export { isSqlToken } from "./utilities/isSqlToken.js";
|
|
6
6
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export { createSqlTag } from
|
|
2
|
-
export { createSqlTokenSqlFragment } from
|
|
3
|
-
export { ArrayToken, BinaryToken, ComparisonPredicateToken, DateToken, FragmentToken, IdentifierToken, IntervalToken, JsonBinaryToken, JsonToken, ListToken, QueryToken, TimestampToken, UnnestToken, UuidToken, } from
|
|
4
|
-
export { isSqlToken } from
|
|
1
|
+
export { createSqlTag } from "./factories/createSqlTag.js";
|
|
2
|
+
export { createSqlTokenSqlFragment } from "./factories/createSqlTokenSqlFragment.js";
|
|
3
|
+
export { ArrayToken, BinaryToken, ComparisonPredicateToken, DateToken, FragmentToken, IdentifierToken, IntervalToken, JsonBinaryToken, JsonToken, ListToken, QueryToken, TimestampToken, UnnestToken, UuidToken, } from "./tokens.js";
|
|
4
|
+
export { isSqlToken } from "./utilities/isSqlToken.js";
|
|
5
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { ArraySqlToken, SqlFragmentToken } from
|
|
1
|
+
import type { ArraySqlToken, SqlFragmentToken } from "../types.js";
|
|
2
2
|
export declare const createArraySqlFragment: (token: ArraySqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createArraySqlFragment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createArraySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createArraySqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAOnE,eAAO,MAAM,sBAAsB,GACjC,OAAO,aAAa,EACpB,2BAA2B,MAAM,KAChC,
|
|
1
|
+
{"version":3,"file":"createArraySqlFragment.d.ts","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createArraySqlFragment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAOnE,eAAO,MAAM,sBAAsB,GACjC,OAAO,aAAa,EACpB,2BAA2B,MAAM,KAChC,gBAmDF,CAAC"}
|
|
@@ -1,38 +1,38 @@
|
|
|
1
|
-
import { createSqlTokenSqlFragment } from
|
|
2
|
-
import { FragmentToken } from
|
|
3
|
-
import { escapeIdentifier } from
|
|
4
|
-
import { formatSlonikPlaceholder } from
|
|
5
|
-
import { isPrimitiveValueExpression } from
|
|
6
|
-
import { isSqlToken } from
|
|
7
|
-
import { InvalidInputError, UnexpectedStateError } from
|
|
1
|
+
import { createSqlTokenSqlFragment } from "../factories/createSqlTokenSqlFragment.js";
|
|
2
|
+
import { FragmentToken } from "../tokens.js";
|
|
3
|
+
import { escapeIdentifier } from "../utilities/escapeIdentifier.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, UnexpectedStateError } from "@slonik/errors";
|
|
8
8
|
export const createArraySqlFragment = (token, greatestParameterPosition) => {
|
|
9
9
|
let placeholderIndex = greatestParameterPosition;
|
|
10
10
|
for (const value of token.values) {
|
|
11
|
-
if (token.memberType ===
|
|
11
|
+
if (token.memberType === "bytea") {
|
|
12
12
|
if (Buffer.isBuffer(value)) {
|
|
13
13
|
continue;
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
16
|
-
throw new InvalidInputError(
|
|
16
|
+
throw new InvalidInputError("Invalid array member type. Non-buffer value bound to bytea type.");
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
if (!isPrimitiveValueExpression(value)) {
|
|
20
|
-
throw new InvalidInputError(
|
|
20
|
+
throw new InvalidInputError("Invalid array member type. Must be a primitive value expression.");
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
const values = [token.values];
|
|
24
24
|
placeholderIndex++;
|
|
25
|
-
let sql = formatSlonikPlaceholder(placeholderIndex) +
|
|
25
|
+
let sql = formatSlonikPlaceholder(placeholderIndex) + "::";
|
|
26
26
|
if (isSqlToken(token.memberType) &&
|
|
27
|
-
Symbol.keyFor(token.memberType.type) ===
|
|
27
|
+
Symbol.keyFor(token.memberType.type) === "SLONIK_TOKEN_FRAGMENT") {
|
|
28
28
|
const sqlFragment = createSqlTokenSqlFragment(token.memberType, placeholderIndex);
|
|
29
29
|
if (sqlFragment.values.length > 0) {
|
|
30
|
-
throw new UnexpectedStateError(
|
|
30
|
+
throw new UnexpectedStateError("Type is not expected to have a value binding.");
|
|
31
31
|
}
|
|
32
32
|
sql += sqlFragment.sql;
|
|
33
33
|
}
|
|
34
|
-
else if (typeof token.memberType ===
|
|
35
|
-
sql += escapeIdentifier(token.memberType) +
|
|
34
|
+
else if (typeof token.memberType === "string") {
|
|
35
|
+
sql += escapeIdentifier(token.memberType) + "[]";
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
38
|
throw new InvalidInputError('Unsupported `memberType`. `memberType` must be a string or SqlToken of "SLONIK_TOKEN_FRAGMENT" type.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createArraySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createArraySqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,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,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEzE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAAoB,EACpB,yBAAiC,EACf,EAAE;IACpB,IAAI,gBAAgB,GAAG,yBAAyB,CAAC;IAEjD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjC,IAAI,KAAK,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,SAAS;YACX,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,iBAAiB,CACzB,kEAAkE,CACnE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,iBAAiB,CACzB,kEAAkE,CACnE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE9B,gBAAgB,EAAE,CAAC;IAEnB,IAAI,GAAG,GAAG,uBAAuB,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAE3D,IACE,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC;QAC5B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,uBAAuB,EAChE,CAAC;QACD,MAAM,WAAW,GAAG,yBAAyB,
|
|
1
|
+
{"version":3,"file":"createArraySqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createArraySqlFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,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,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEzE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAAoB,EACpB,yBAAiC,EACf,EAAE;IACpB,IAAI,gBAAgB,GAAG,yBAAyB,CAAC;IAEjD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjC,IAAI,KAAK,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,SAAS;YACX,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,iBAAiB,CACzB,kEAAkE,CACnE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,iBAAiB,CACzB,kEAAkE,CACnE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE9B,gBAAgB,EAAE,CAAC;IAEnB,IAAI,GAAG,GAAG,uBAAuB,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAE3D,IACE,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC;QAC5B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,uBAAuB,EAChE,CAAC;QACD,MAAM,WAAW,GAAG,yBAAyB,CAAC,KAAK,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAElF,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,oBAAoB,CAAC,+CAA+C,CAAC,CAAC;QAClF,CAAC;QAED,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC;IACzB,CAAC;SAAM,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QAChD,GAAG,IAAI,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,iBAAiB,CACzB,sGAAsG,CACvG,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG;QACH,IAAI,EAAE,aAAa;QACnB,MAAM;KACP,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { BinarySqlToken, SqlFragmentToken } from
|
|
1
|
+
import type { BinarySqlToken, SqlFragmentToken } from "../types.js";
|
|
2
2
|
export declare const createBinarySqlFragment: (token: BinarySqlToken, greatestParameterPosition: number) => SqlFragmentToken;
|
|
3
3
|
//# sourceMappingURL=createBinarySqlFragment.d.ts.map
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { FragmentToken } from
|
|
2
|
-
import { formatSlonikPlaceholder } from
|
|
3
|
-
import { InvalidInputError } from
|
|
1
|
+
import { FragmentToken } from "../tokens.js";
|
|
2
|
+
import { formatSlonikPlaceholder } from "../utilities/formatSlonikPlaceholder.js";
|
|
3
|
+
import { InvalidInputError } from "@slonik/errors";
|
|
4
4
|
export const createBinarySqlFragment = (token, greatestParameterPosition) => {
|
|
5
5
|
if (!Buffer.isBuffer(token.data)) {
|
|
6
|
-
throw new InvalidInputError(
|
|
6
|
+
throw new InvalidInputError("Binary value must be a buffer.");
|
|
7
7
|
}
|
|
8
8
|
return {
|
|
9
9
|
sql: formatSlonikPlaceholder(greatestParameterPosition + 1),
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { DateSqlToken, SqlFragmentToken } from
|
|
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,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIlE,eAAO,MAAM,qBAAqB,GAChC,OAAO,YAAY,EACnB,2BAA2B,MAAM,KAChC,
|
|
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,gBAUF,CAAC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { FragmentToken } from
|
|
2
|
-
import { formatSlonikPlaceholder } from
|
|
3
|
-
import { InvalidInputError } from
|
|
1
|
+
import { FragmentToken } from "../tokens.js";
|
|
2
|
+
import { formatSlonikPlaceholder } from "../utilities/formatSlonikPlaceholder.js";
|
|
3
|
+
import { InvalidInputError } from "@slonik/errors";
|
|
4
4
|
export const createDateSqlFragment = (token, greatestParameterPosition) => {
|
|
5
5
|
if (!(token.date instanceof Date)) {
|
|
6
|
-
throw new InvalidInputError(
|
|
6
|
+
throw new InvalidInputError("Date parameter value must be an instance of Date.");
|
|
7
7
|
}
|
|
8
8
|
return {
|
|
9
|
-
sql: formatSlonikPlaceholder(greatestParameterPosition + 1) +
|
|
9
|
+
sql: formatSlonikPlaceholder(greatestParameterPosition + 1) + "::date",
|
|
10
10
|
type: FragmentToken,
|
|
11
11
|
values: [token.date.toISOString().slice(0, 10)],
|
|
12
12
|
};
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,CAAC,mDAAmD,CAAC,CAAC;IACnF,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 type { FragmentSqlToken, SqlFragmentToken } from
|
|
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,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAItE,eAAO,MAAM,yBAAyB,GACpC,OAAO,gBAAgB,EACvB,2BAA2B,MAAM,KAChC,
|
|
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,gBAsCF,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { slonikPlaceholderRegexRule } from
|
|
2
|
-
import { FragmentToken } from
|
|
3
|
-
import { formatSlonikPlaceholder } from
|
|
4
|
-
import { UnexpectedStateError } from
|
|
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
5
|
export const createFragmentSqlFragment = (token, greatestParameterPosition) => {
|
|
6
|
-
let sql =
|
|
6
|
+
let sql = "";
|
|
7
7
|
let leastMatchedParameterPosition = Number.POSITIVE_INFINITY;
|
|
8
8
|
let greatestMatchedParameterPosition = 0;
|
|
9
9
|
sql += token.sql.replaceAll(slonikPlaceholderRegexRule, (match, g1) => {
|
|
@@ -17,11 +17,11 @@ export const createFragmentSqlFragment = (token, greatestParameterPosition) => {
|
|
|
17
17
|
return formatSlonikPlaceholder(parameterPosition + greatestParameterPosition);
|
|
18
18
|
});
|
|
19
19
|
if (greatestMatchedParameterPosition > token.values.length) {
|
|
20
|
-
throw new UnexpectedStateError(
|
|
20
|
+
throw new UnexpectedStateError("The greatest parameter position is greater than the number of parameter values.");
|
|
21
21
|
}
|
|
22
22
|
if (leastMatchedParameterPosition !== Number.POSITIVE_INFINITY &&
|
|
23
23
|
leastMatchedParameterPosition !== 1) {
|
|
24
|
-
throw new UnexpectedStateError(
|
|
24
|
+
throw new UnexpectedStateError("Parameter position must start at 1.");
|
|
25
25
|
}
|
|
26
26
|
return {
|
|
27
27
|
sql,
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,CAAC,iBAAiB,GAAG,yBAAyB,CAAC,CAAC;IAChF,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 type { IdentifierSqlToken, SqlFragmentToken } from
|
|
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,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIxE,eAAO,MAAM,2BAA2B,
|
|
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,GAAI,OAAO,kBAAkB,KAAG,gBAgBvE,CAAC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { FragmentToken } from
|
|
2
|
-
import { escapeIdentifier } from
|
|
3
|
-
import { InvalidInputError } from
|
|
1
|
+
import { FragmentToken } from "../tokens.js";
|
|
2
|
+
import { escapeIdentifier } from "../utilities/escapeIdentifier.js";
|
|
3
|
+
import { InvalidInputError } from "@slonik/errors";
|
|
4
4
|
export const createIdentifierSqlFragment = (token) => {
|
|
5
5
|
const sql = token.names
|
|
6
6
|
.map((identifierName) => {
|
|
7
|
-
if (typeof identifierName !==
|
|
8
|
-
throw new InvalidInputError(
|
|
7
|
+
if (typeof identifierName !== "string") {
|
|
8
|
+
throw new InvalidInputError("Identifier name array member type must be a string.");
|
|
9
9
|
}
|
|
10
10
|
return escapeIdentifier(identifierName);
|
|
11
11
|
})
|
|
12
|
-
.join(
|
|
12
|
+
.join(".");
|
|
13
13
|
return {
|
|
14
14
|
sql,
|
|
15
15
|
type: FragmentToken,
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,CAAC,KAAyB,EAAoB,EAAE;IACzF,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,CAAC,qDAAqD,CAAC,CAAC;QACrF,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 type { IntervalSqlToken, SqlFragmentToken } from
|
|
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,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
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;AAwBtE,eAAO,MAAM,yBAAyB,GACpC,OAAO,gBAAgB,EACvB,2BAA2B,MAAM,KAChC,gBAgCF,CAAC"}
|