@math.gl/sql 5.0.0-beta.11 → 5.0.0-beta.12
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/arrow/aggregates.js +1 -1
- package/dist/arrow/aggregates.js.map +1 -1
- package/dist/arrow/buffers.js.map +1 -1
- package/dist/arrow/cast.d.ts +1 -1
- package/dist/arrow/cast.js +1 -1
- package/dist/arrow/cast.js.map +1 -1
- package/dist/arrow/compiler.d.ts.map +1 -1
- package/dist/arrow/compiler.js +146 -29
- package/dist/arrow/compiler.js.map +1 -1
- package/dist/arrow/index.cjs +124 -23
- package/dist/arrow/index.cjs.map +1 -1
- package/dist/arrow/index.d.ts.map +1 -1
- package/dist/arrow/index.js.map +1 -1
- package/dist/arrow/list-values.d.ts.map +1 -1
- package/dist/arrow/list-values.js +27 -6
- package/dist/arrow/list-values.js.map +1 -1
- package/dist/arrow/predicate.d.ts.map +1 -1
- package/dist/arrow/predicate.js.map +1 -1
- package/dist/arrow/query-arrow-sql.d.ts +2 -2
- package/dist/arrow/query-arrow-sql.d.ts.map +1 -1
- package/dist/arrow/query-arrow-sql.js +40 -8
- package/dist/arrow/query-arrow-sql.js.map +1 -1
- package/dist/arrow/query-arrow-table.d.ts +1 -1
- package/dist/arrow/query-arrow-table.d.ts.map +1 -1
- package/dist/arrow/query-arrow-table.js +1 -1
- package/dist/arrow/query-arrow-table.js.map +1 -1
- package/dist/arrow/query-worker.d.ts +1 -1
- package/dist/arrow/query-worker.d.ts.map +1 -1
- package/dist/arrow/query-worker.js +1 -1
- package/dist/arrow/query-worker.js.map +1 -1
- package/dist/arrow/registry.d.ts.map +1 -1
- package/dist/arrow/registry.js +1 -0
- package/dist/arrow/registry.js.map +1 -1
- package/dist/arrow/relational-query.js +2 -2
- package/dist/arrow/relational-query.js.map +1 -1
- package/dist/arrow/temporal-cast.js.map +1 -1
- package/dist/arrow/types.d.ts.map +1 -1
- package/dist/arrow/unnest-arrow-column.d.ts +22 -0
- package/dist/arrow/unnest-arrow-column.d.ts.map +1 -0
- package/dist/arrow/unnest-arrow-column.js +112 -0
- package/dist/arrow/unnest-arrow-column.js.map +1 -0
- package/dist/arrow/worker.cjs +130 -29
- package/dist/arrow/worker.cjs.map +1 -1
- package/dist/arrow/worker.d.ts +1 -1
- package/dist/arrow/worker.d.ts.map +1 -1
- package/dist/arrow/worker.js +1 -1
- package/dist/arrow/worker.js.map +1 -1
- package/dist/{color → color-functions}/index.cjs +2 -2
- package/dist/{color → color-functions}/index.cjs.map +1 -1
- package/dist/color-functions/index.d.ts.map +1 -0
- package/dist/color-functions/index.js.map +1 -0
- package/dist/expressions/ast.js +3 -1
- package/dist/expressions/ast.js.map +1 -1
- package/dist/expressions/expression-eval.d.ts +10 -1
- package/dist/expressions/expression-eval.d.ts.map +1 -1
- package/dist/expressions/expression-eval.js.map +1 -1
- package/dist/expressions/index.cjs +1 -1
- package/dist/expressions/index.cjs.map +1 -1
- package/dist/index.cjs +2792 -2363
- package/dist/index.cjs.map +3 -3
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/{math → math-functions}/index.cjs +2 -2
- package/dist/{math → math-functions}/index.cjs.map +1 -1
- package/dist/math-functions/index.d.ts.map +1 -0
- package/dist/math-functions/index.js.map +1 -0
- package/dist/parser/bind-sql-predicate.d.ts.map +1 -0
- package/dist/parser/bind-sql-predicate.js.map +1 -0
- package/dist/{sql → parser}/index.cjs +348 -129
- package/dist/parser/index.cjs.map +6 -0
- package/dist/{sql → parser}/index.d.ts +2 -0
- package/dist/parser/index.d.ts.map +1 -0
- package/dist/{sql → parser}/index.js +1 -0
- package/dist/parser/index.js.map +1 -0
- package/dist/parser/parameter-snapshots.d.ts +21 -0
- package/dist/parser/parameter-snapshots.d.ts.map +1 -0
- package/dist/parser/parameter-snapshots.js +85 -0
- package/dist/parser/parameter-snapshots.js.map +1 -0
- package/dist/{sql → parser}/parse-sql-expression.d.ts +8 -2
- package/dist/parser/parse-sql-expression.d.ts.map +1 -0
- package/dist/{sql → parser}/parse-sql-expression.js +51 -5
- package/dist/parser/parse-sql-expression.js.map +1 -0
- package/dist/parser/parse-sql-predicate.d.ts.map +1 -0
- package/dist/parser/parse-sql-predicate.js.map +1 -0
- package/dist/{sql → parser}/parse-sql-query.d.ts +2 -1
- package/dist/parser/parse-sql-query.d.ts.map +1 -0
- package/dist/{sql → parser}/parse-sql-query.js +21 -6
- package/dist/parser/parse-sql-query.js.map +1 -0
- package/dist/{sql → parser}/parse-sql-select.d.ts +4 -2
- package/dist/parser/parse-sql-select.d.ts.map +1 -0
- package/dist/{sql → parser}/parse-sql-select.js +6 -3
- package/dist/parser/parse-sql-select.js.map +1 -0
- package/dist/{sql → parser}/parse-sql-statement.d.ts +9 -5
- package/dist/parser/parse-sql-statement.d.ts.map +1 -0
- package/dist/{sql → parser}/parse-sql-statement.js +39 -14
- package/dist/parser/parse-sql-statement.js.map +1 -0
- package/dist/parser/query-types.d.ts.map +1 -0
- package/dist/parser/query-types.js.map +1 -0
- package/dist/parser/sql-parameters.d.ts +29 -0
- package/dist/parser/sql-parameters.d.ts.map +1 -0
- package/dist/parser/sql-parameters.js +110 -0
- package/dist/parser/sql-parameters.js.map +1 -0
- package/dist/parser/sql-parse-error.d.ts.map +1 -0
- package/dist/parser/sql-parse-error.js.map +1 -0
- package/dist/parser/sql-predicate-schema.d.ts.map +1 -0
- package/dist/parser/sql-predicate-schema.js.map +1 -0
- package/dist/parser/sql-predicate-types.d.ts.map +1 -0
- package/dist/parser/sql-predicate-types.js.map +1 -0
- package/dist/parser/sql-predicate.d.ts.map +1 -0
- package/dist/parser/sql-predicate.js.map +1 -0
- package/dist/scales/arrow-domains.d.ts +8 -1
- package/dist/scales/arrow-domains.d.ts.map +1 -1
- package/dist/scales/arrow-domains.js +48 -6
- package/dist/scales/arrow-domains.js.map +1 -1
- package/dist/scales/arrow-scales.d.ts +28 -4
- package/dist/scales/arrow-scales.d.ts.map +1 -1
- package/dist/scales/arrow-scales.js +158 -12
- package/dist/scales/arrow-scales.js.map +1 -1
- package/dist/scales/compile-scale.d.ts +1 -6
- package/dist/scales/compile-scale.d.ts.map +1 -1
- package/dist/scales/compile-scale.js +1 -191
- package/dist/scales/compile-scale.js.map +1 -1
- package/dist/scales/conformance.cjs +180 -0
- package/dist/scales/conformance.cjs.map +6 -0
- package/dist/scales/conformance.d.ts +26 -0
- package/dist/scales/conformance.d.ts.map +1 -0
- package/dist/scales/conformance.js +164 -0
- package/dist/scales/conformance.js.map +1 -0
- package/dist/scales/hdr-colors.d.ts +1 -12
- package/dist/scales/hdr-colors.d.ts.map +1 -1
- package/dist/scales/hdr-colors.js +1 -111
- package/dist/scales/hdr-colors.js.map +1 -1
- package/dist/scales/index.cjs +3738 -618
- package/dist/scales/index.cjs.map +3 -3
- package/dist/scales/index.d.ts +2 -1
- package/dist/scales/index.d.ts.map +1 -1
- package/dist/scales/index.js +2 -1
- package/dist/scales/index.js.map +1 -1
- package/dist/scales/palettes.d.ts +1 -4
- package/dist/scales/palettes.d.ts.map +1 -1
- package/dist/scales/palettes.js +1 -81
- package/dist/scales/palettes.js.map +1 -1
- package/dist/scales/parse-sql-scale.d.ts +14 -1
- package/dist/scales/parse-sql-scale.d.ts.map +1 -1
- package/dist/scales/parse-sql-scale.js +110 -18
- package/dist/scales/parse-sql-scale.js.map +1 -1
- package/dist/scales/quantile-sketch.d.ts +1 -21
- package/dist/scales/quantile-sketch.d.ts.map +1 -1
- package/dist/scales/quantile-sketch.js +1 -104
- package/dist/scales/quantile-sketch.js.map +1 -1
- package/dist/scales/scale-types.d.ts +1 -91
- package/dist/scales/scale-types.d.ts.map +1 -1
- package/dist/scales/scale-types.js +1 -115
- package/dist/scales/scale-types.js.map +1 -1
- package/dist/scales/streaming-domains.d.ts.map +1 -1
- package/dist/scales/streaming-domains.js +8 -2
- package/dist/scales/streaming-domains.js.map +1 -1
- package/package.json +19 -19
- package/src/arrow/aggregates.ts +1 -1
- package/src/arrow/buffers.ts +1 -1
- package/src/arrow/cast.ts +3 -3
- package/src/arrow/compiler.ts +155 -36
- package/src/arrow/index.ts +1 -1
- package/src/arrow/list-values.ts +28 -7
- package/src/arrow/predicate.ts +1 -1
- package/src/arrow/query-arrow-sql.ts +38 -10
- package/src/arrow/query-arrow-table.ts +3 -3
- package/src/arrow/query-worker.ts +5 -1
- package/src/arrow/registry.ts +1 -0
- package/src/arrow/relational-query.ts +2 -2
- package/src/arrow/temporal-cast.ts +1 -1
- package/src/arrow/types.ts +1 -1
- package/src/arrow/unnest-arrow-column.ts +145 -0
- package/src/arrow/worker.ts +6 -2
- package/src/expressions/ast.ts +3 -1
- package/src/expressions/expression-eval.ts +10 -1
- package/src/index.ts +14 -0
- package/src/{math → math-functions}/index.ts +2 -2
- package/src/{sql → parser}/index.ts +15 -0
- package/src/parser/parameter-snapshots.ts +103 -0
- package/src/{sql → parser}/parse-sql-expression.ts +49 -6
- package/src/{sql → parser}/parse-sql-query.ts +24 -6
- package/src/{sql → parser}/parse-sql-select.ts +14 -8
- package/src/{sql → parser}/parse-sql-statement.ts +42 -24
- package/src/{sql → parser}/query-types.ts +1 -1
- package/src/parser/sql-parameters.ts +174 -0
- package/src/scales/arrow-domains.ts +66 -7
- package/src/scales/arrow-scales.ts +221 -14
- package/src/scales/compile-scale.ts +1 -213
- package/src/scales/conformance.ts +186 -0
- package/src/scales/hdr-colors.ts +1 -122
- package/src/scales/index.ts +3 -1
- package/src/scales/palettes.ts +1 -82
- package/src/scales/parse-sql-scale.ts +126 -21
- package/src/scales/quantile-sketch.ts +1 -102
- package/src/scales/scale-types.ts +1 -220
- package/src/scales/streaming-domains.ts +8 -2
- package/dist/color/index.d.ts.map +0 -1
- package/dist/color/index.js.map +0 -1
- package/dist/math/index.d.ts.map +0 -1
- package/dist/math/index.js.map +0 -1
- package/dist/scales/arrow-scales.cjs +0 -3837
- package/dist/scales/arrow-scales.cjs.map +0 -6
- package/dist/sql/bind-sql-predicate.d.ts.map +0 -1
- package/dist/sql/bind-sql-predicate.js.map +0 -1
- package/dist/sql/index.cjs.map +0 -6
- package/dist/sql/index.d.ts.map +0 -1
- package/dist/sql/index.js.map +0 -1
- package/dist/sql/parse-sql-expression.d.ts.map +0 -1
- package/dist/sql/parse-sql-expression.js.map +0 -1
- package/dist/sql/parse-sql-predicate.d.ts.map +0 -1
- package/dist/sql/parse-sql-predicate.js.map +0 -1
- package/dist/sql/parse-sql-query.d.ts.map +0 -1
- package/dist/sql/parse-sql-query.js.map +0 -1
- package/dist/sql/parse-sql-select.d.ts.map +0 -1
- package/dist/sql/parse-sql-select.js.map +0 -1
- package/dist/sql/parse-sql-statement.d.ts.map +0 -1
- package/dist/sql/parse-sql-statement.js.map +0 -1
- package/dist/sql/query-types.d.ts.map +0 -1
- package/dist/sql/query-types.js.map +0 -1
- package/dist/sql/sql-parse-error.d.ts.map +0 -1
- package/dist/sql/sql-parse-error.js.map +0 -1
- package/dist/sql/sql-predicate-schema.d.ts.map +0 -1
- package/dist/sql/sql-predicate-schema.js.map +0 -1
- package/dist/sql/sql-predicate-types.d.ts.map +0 -1
- package/dist/sql/sql-predicate-types.js.map +0 -1
- package/dist/sql/sql-predicate.d.ts.map +0 -1
- package/dist/sql/sql-predicate.js.map +0 -1
- package/src/expressions/vendor/jsep/README.md +0 -22
- /package/dist/{color → color-functions}/index.d.ts +0 -0
- /package/dist/{color → color-functions}/index.js +0 -0
- /package/dist/{math → math-functions}/index.d.ts +0 -0
- /package/dist/{math → math-functions}/index.js +0 -0
- /package/dist/{sql → parser}/bind-sql-predicate.d.ts +0 -0
- /package/dist/{sql → parser}/bind-sql-predicate.js +0 -0
- /package/dist/{sql → parser}/parse-sql-predicate.d.ts +0 -0
- /package/dist/{sql → parser}/parse-sql-predicate.js +0 -0
- /package/dist/{sql → parser}/query-types.d.ts +0 -0
- /package/dist/{sql → parser}/query-types.js +0 -0
- /package/dist/{sql → parser}/sql-parse-error.d.ts +0 -0
- /package/dist/{sql → parser}/sql-parse-error.js +0 -0
- /package/dist/{sql → parser}/sql-predicate-schema.d.ts +0 -0
- /package/dist/{sql → parser}/sql-predicate-schema.js +0 -0
- /package/dist/{sql → parser}/sql-predicate-types.d.ts +0 -0
- /package/dist/{sql → parser}/sql-predicate-types.js +0 -0
- /package/dist/{sql → parser}/sql-predicate.d.ts +0 -0
- /package/dist/{sql → parser}/sql-predicate.js +0 -0
- /package/src/{color → color-functions}/index.ts +0 -0
- /package/src/{sql → parser}/bind-sql-predicate.ts +0 -0
- /package/src/{sql → parser}/parse-sql-predicate.ts +0 -0
- /package/src/{sql → parser}/sql-parse-error.ts +0 -0
- /package/src/{sql → parser}/sql-predicate-schema.ts +0 -0
- /package/src/{sql → parser}/sql-predicate-types.ts +0 -0
- /package/src/{sql → parser}/sql-predicate.ts +0 -0
|
@@ -16,12 +16,14 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
16
16
|
};
|
|
17
17
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
18
|
|
|
19
|
-
// dist/
|
|
19
|
+
// dist/parser/index.js
|
|
20
20
|
var index_exports = {};
|
|
21
21
|
__export(index_exports, {
|
|
22
22
|
SQLParseError: () => SQLParseError,
|
|
23
23
|
SQL_PREDICATE_JSON_SCHEMA: () => SQL_PREDICATE_JSON_SCHEMA,
|
|
24
|
+
areSQLParametersEqual: () => areSQLParametersEqual,
|
|
24
25
|
bindSQLPredicate: () => bindSQLPredicate,
|
|
26
|
+
getSQLParameterNames: () => getSQLParameterNames,
|
|
25
27
|
isSQLPredicate: () => isSQLPredicate,
|
|
26
28
|
isSQLPredicateParameter: () => isSQLPredicateParameter,
|
|
27
29
|
parseSQLExpression: () => parseSQLExpression,
|
|
@@ -30,10 +32,247 @@ __export(index_exports, {
|
|
|
30
32
|
parseSQLSelect: () => parseSQLSelect,
|
|
31
33
|
parseSQLSelectCompound: () => parseSQLSelectCompound,
|
|
32
34
|
parseSQLSelectStatement: () => parseSQLSelectStatement,
|
|
35
|
+
prepareSQLParameters: () => prepareSQLParameters,
|
|
33
36
|
validateSQLPredicate: () => validateSQLPredicate
|
|
34
37
|
});
|
|
35
38
|
module.exports = __toCommonJS(index_exports);
|
|
36
39
|
|
|
40
|
+
// dist/expressions/scalar-type.js
|
|
41
|
+
var COLUMNAR_SCALAR_TYPES = Object.freeze([
|
|
42
|
+
"int8",
|
|
43
|
+
"int16",
|
|
44
|
+
"int32",
|
|
45
|
+
"int64",
|
|
46
|
+
"uint8",
|
|
47
|
+
"uint16",
|
|
48
|
+
"uint32",
|
|
49
|
+
"uint64",
|
|
50
|
+
"float16",
|
|
51
|
+
"float32",
|
|
52
|
+
"float64",
|
|
53
|
+
"bool",
|
|
54
|
+
"utf8"
|
|
55
|
+
]);
|
|
56
|
+
function isColumnarScalarType(value) {
|
|
57
|
+
return typeof value === "string" && COLUMNAR_SCALAR_TYPES.includes(value);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
// dist/expressions/columnar-predicate.js
|
|
61
|
+
function isColumnarPredicateParameter(value) {
|
|
62
|
+
const parameterValue = value;
|
|
63
|
+
return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length === 1 && Object.prototype.hasOwnProperty.call(value, "parameter") && typeof parameterValue.parameter === "string" && parameterValue.parameter.length > 0;
|
|
64
|
+
}
|
|
65
|
+
function isColumnarPredicateValue(value) {
|
|
66
|
+
return typeof value === "boolean" || typeof value === "bigint" || typeof value === "string" || typeof value === "number" && Number.isFinite(value) || value instanceof Date && Number.isFinite(value.getTime()) || value instanceof Uint8Array;
|
|
67
|
+
}
|
|
68
|
+
function bindColumnarPredicateParameters(predicate, parameters) {
|
|
69
|
+
switch (predicate.op) {
|
|
70
|
+
case "and":
|
|
71
|
+
case "or":
|
|
72
|
+
return {
|
|
73
|
+
op: predicate.op,
|
|
74
|
+
args: predicate.args.map((child) => bindColumnarPredicateParameters(child, parameters))
|
|
75
|
+
};
|
|
76
|
+
case "not":
|
|
77
|
+
return {
|
|
78
|
+
op: "not",
|
|
79
|
+
args: [bindColumnarPredicateParameters(predicate.args[0], parameters)]
|
|
80
|
+
};
|
|
81
|
+
case "isNull":
|
|
82
|
+
return { op: "isNull", args: [copyColumnarPredicateProperty(predicate.args[0])] };
|
|
83
|
+
case "in":
|
|
84
|
+
return {
|
|
85
|
+
op: "in",
|
|
86
|
+
args: [
|
|
87
|
+
copyColumnarPredicateProperty(predicate.args[0]),
|
|
88
|
+
predicate.args[1].map((value) => bindColumnarPredicateValue(value, parameters))
|
|
89
|
+
]
|
|
90
|
+
};
|
|
91
|
+
default:
|
|
92
|
+
return {
|
|
93
|
+
op: predicate.op,
|
|
94
|
+
args: [
|
|
95
|
+
copyColumnarPredicateProperty(predicate.args[0]),
|
|
96
|
+
bindColumnarPredicateValue(predicate.args[1], parameters)
|
|
97
|
+
]
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
function bindColumnarPredicateValue(value, parameters) {
|
|
102
|
+
if (!isColumnarPredicateParameter(value))
|
|
103
|
+
return value;
|
|
104
|
+
if (!Object.prototype.hasOwnProperty.call(parameters, value.parameter)) {
|
|
105
|
+
throw new Error(`Columnar predicate parameter ":${value.parameter}" requires a value`);
|
|
106
|
+
}
|
|
107
|
+
const parameterValue = parameters[value.parameter];
|
|
108
|
+
if (isColumnarPredicateParameter(parameterValue)) {
|
|
109
|
+
throw new Error(`Columnar predicate parameter ":${value.parameter}" cannot reference another parameter`);
|
|
110
|
+
}
|
|
111
|
+
if (!isColumnarPredicateValue(parameterValue)) {
|
|
112
|
+
throw new Error(`Columnar predicate parameter ":${value.parameter}" has an unsupported value`);
|
|
113
|
+
}
|
|
114
|
+
return copyColumnarPredicateValue(parameterValue);
|
|
115
|
+
}
|
|
116
|
+
function copyColumnarPredicateProperty(property) {
|
|
117
|
+
return {
|
|
118
|
+
...property,
|
|
119
|
+
...property.casts ? { casts: [...property.casts] } : {},
|
|
120
|
+
property: typeof property.property === "string" ? property.property : [...property.property]
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
function copyColumnarPredicateValue(value) {
|
|
124
|
+
if (value instanceof Uint8Array)
|
|
125
|
+
return value.slice();
|
|
126
|
+
if (value instanceof Date)
|
|
127
|
+
return new Date(value.getTime());
|
|
128
|
+
return value;
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
// dist/parser/sql-parameters.js
|
|
132
|
+
function validateSQLParameterOptions(options) {
|
|
133
|
+
if (options.parameters !== void 0 && options.parseParameter !== void 0) {
|
|
134
|
+
throw new Error("SQL parameters and parseParameter are mutually exclusive");
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
function bindSQLParameter(name, options) {
|
|
138
|
+
if (options.parseParameter)
|
|
139
|
+
return options.parseParameter(name);
|
|
140
|
+
if (isSQLParameterSnapshot(options.parameters))
|
|
141
|
+
return snapshotParameter(options.parameters, name);
|
|
142
|
+
if (!Object.prototype.hasOwnProperty.call(options.parameters ?? {}, name)) {
|
|
143
|
+
throw new Error(`SQL parameter ":${name}" requires a value`);
|
|
144
|
+
}
|
|
145
|
+
const value = options.parameters[name];
|
|
146
|
+
if (isNumericArray(value) && !(value instanceof Uint8Array))
|
|
147
|
+
return typedArrayLiteral(value, name);
|
|
148
|
+
if (value && typeof value === "object" && "type" in value) {
|
|
149
|
+
if (value.type === "array" && isNumericArray(value.value))
|
|
150
|
+
return typedArrayLiteral(value.value, name);
|
|
151
|
+
if ((value.type === "utf8" || value.type === "binary") && value.value instanceof Uint8Array) {
|
|
152
|
+
const data = new Uint8Array(value.value);
|
|
153
|
+
if (value.type === "binary")
|
|
154
|
+
return literal(data);
|
|
155
|
+
try {
|
|
156
|
+
return {
|
|
157
|
+
type: "Literal",
|
|
158
|
+
value: new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(data),
|
|
159
|
+
utf8: data
|
|
160
|
+
};
|
|
161
|
+
} catch {
|
|
162
|
+
throw new Error(`SQL parameter ":${name}" requires valid UTF-8 bytes`);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
throw new Error(`SQL parameter ":${name}" has an unsupported binary format`);
|
|
166
|
+
}
|
|
167
|
+
if (Array.isArray(value)) {
|
|
168
|
+
if (value.length > 4096 || !(Array.from(value).every((item) => typeof item === "number" && Number.isFinite(item)) || Array.from(value).every((item) => typeof item === "string") || Array.from(value).every((item) => (Array.isArray(item) || isNumericArray(item)) && item.length <= 4096 && Array.from(item).every((component) => typeof component === "number" && Number.isFinite(component)))))
|
|
169
|
+
throw new Error(`SQL parameter ":${name}" has an unsupported array value`);
|
|
170
|
+
return arrayLiteral(value, name);
|
|
171
|
+
}
|
|
172
|
+
if (value !== null && !isColumnarPredicateValue(value)) {
|
|
173
|
+
throw new Error(`SQL parameter ":${name}" has an unsupported value`);
|
|
174
|
+
}
|
|
175
|
+
return literal(value instanceof Date ? new Date(value.getTime()) : value instanceof Uint8Array ? new Uint8Array(value) : value);
|
|
176
|
+
}
|
|
177
|
+
function arrayLiteral(values, name) {
|
|
178
|
+
return {
|
|
179
|
+
type: "ArrayExpression",
|
|
180
|
+
elements: Array.from(values, (value) => Array.isArray(value) ? arrayLiteral(value, name) : isNumericArray(value) ? typedArrayLiteral(value, name) : literal(value))
|
|
181
|
+
};
|
|
182
|
+
}
|
|
183
|
+
function literal(value) {
|
|
184
|
+
if (value instanceof Uint8Array || value instanceof Date)
|
|
185
|
+
return { type: "Literal", value };
|
|
186
|
+
return {
|
|
187
|
+
type: "Literal",
|
|
188
|
+
value,
|
|
189
|
+
raw: typeof value === "bigint" ? String(value) : JSON.stringify(value)
|
|
190
|
+
};
|
|
191
|
+
}
|
|
192
|
+
function isNumericArray(value) {
|
|
193
|
+
return value instanceof Float32Array || value instanceof Float64Array || value instanceof Int8Array || value instanceof Uint8Array || value instanceof Uint8ClampedArray || value instanceof Int16Array || value instanceof Uint16Array || value instanceof Int32Array || value instanceof Uint32Array;
|
|
194
|
+
}
|
|
195
|
+
function typedArrayLiteral(value, name) {
|
|
196
|
+
if (value.length > 4096 || !value.every(Number.isFinite)) {
|
|
197
|
+
throw new Error(`SQL parameter ":${name}" has an unsupported numeric array`);
|
|
198
|
+
}
|
|
199
|
+
const typedValues = value instanceof Uint8Array ? new Uint8Array(value) : value.slice();
|
|
200
|
+
return {
|
|
201
|
+
type: "ArrayExpression",
|
|
202
|
+
elements: Array.from(typedValues, (item) => literal(item)),
|
|
203
|
+
typedValues
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
// dist/parser/parameter-snapshots.js
|
|
208
|
+
var snapshots = /* @__PURE__ */ new WeakMap();
|
|
209
|
+
function prepareSQLParameters(parameters, options = {}) {
|
|
210
|
+
const previous = options.previous && storage(options.previous);
|
|
211
|
+
const entries = /* @__PURE__ */ new Map();
|
|
212
|
+
for (const name of Object.keys(parameters)) {
|
|
213
|
+
const expression = bindSQLParameter(name, { parameters });
|
|
214
|
+
encodeStrings(expression);
|
|
215
|
+
const old = previous == null ? void 0 : previous.get(name);
|
|
216
|
+
entries.set(name, old && equalValue(old, expression) ? old : expression);
|
|
217
|
+
}
|
|
218
|
+
if (options.previous && (previous == null ? void 0 : previous.size) === entries.size && [...entries].every(([name, value]) => previous.get(name) === value))
|
|
219
|
+
return options.previous;
|
|
220
|
+
const snapshot = Object.freeze({ kind: "sql-parameter-snapshot" });
|
|
221
|
+
snapshots.set(snapshot, entries);
|
|
222
|
+
return snapshot;
|
|
223
|
+
}
|
|
224
|
+
function areSQLParametersEqual(a, b, options = {}) {
|
|
225
|
+
const left = storage(a);
|
|
226
|
+
const right = storage(b);
|
|
227
|
+
if (a === b)
|
|
228
|
+
return true;
|
|
229
|
+
if (!options.names && left.size !== right.size)
|
|
230
|
+
return false;
|
|
231
|
+
return (options.names ?? [...left.keys()]).every((name) => left.has(name) === right.has(name) && equalValue(left.get(name), right.get(name)));
|
|
232
|
+
}
|
|
233
|
+
function isSQLParameterSnapshot(value) {
|
|
234
|
+
return Boolean(value && typeof value === "object" && snapshots.has(value));
|
|
235
|
+
}
|
|
236
|
+
function snapshotParameter(snapshot, name) {
|
|
237
|
+
const expression = storage(snapshot).get(name);
|
|
238
|
+
if (!expression)
|
|
239
|
+
throw new Error(`SQL parameter ":${name}" requires a value`);
|
|
240
|
+
return structuredClone(expression);
|
|
241
|
+
}
|
|
242
|
+
function storage(snapshot) {
|
|
243
|
+
const values = snapshots.get(snapshot);
|
|
244
|
+
if (!values)
|
|
245
|
+
throw new Error("Invalid SQL parameter snapshot");
|
|
246
|
+
return values;
|
|
247
|
+
}
|
|
248
|
+
function equalValue(a, b) {
|
|
249
|
+
if (Object.is(a, b))
|
|
250
|
+
return true;
|
|
251
|
+
if (!a || !b || typeof a !== "object" || typeof b !== "object" || a.constructor !== b.constructor)
|
|
252
|
+
return false;
|
|
253
|
+
if (a instanceof Date && b instanceof Date)
|
|
254
|
+
return a.getTime() === b.getTime();
|
|
255
|
+
const left = Object.keys(a);
|
|
256
|
+
const right = Object.keys(b);
|
|
257
|
+
return left.length === right.length && left.every((key) => Object.prototype.hasOwnProperty.call(b, key) && equalValue(a[key], b[key]));
|
|
258
|
+
}
|
|
259
|
+
function getSQLParameterNames(sql) {
|
|
260
|
+
const names = /* @__PURE__ */ new Set();
|
|
261
|
+
const tokens = /'(?:''|[^'])*'|"(?:""|[^"])*"|--[^\r\n]*|\/\*[\s\S]*?\*\/|::|:([A-Za-z_][A-Za-z0-9_]*)/g;
|
|
262
|
+
for (const match of sql.matchAll(tokens))
|
|
263
|
+
if (match[1])
|
|
264
|
+
names.add(match[1]);
|
|
265
|
+
return Object.freeze([...names]);
|
|
266
|
+
}
|
|
267
|
+
function encodeStrings(expression) {
|
|
268
|
+
if (expression.type === "Literal" && typeof expression.value === "string" && !expression.utf8) {
|
|
269
|
+
expression.utf8 = new TextEncoder().encode(expression.value);
|
|
270
|
+
} else if (expression.type === "ArrayExpression") {
|
|
271
|
+
for (const element of expression.elements)
|
|
272
|
+
encodeStrings(element);
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
|
|
37
276
|
// dist/diagnostic-log.js
|
|
38
277
|
function reportDiagnosticError(log, error) {
|
|
39
278
|
if (log) {
|
|
@@ -44,7 +283,7 @@ function reportDiagnosticError(log, error) {
|
|
|
44
283
|
}
|
|
45
284
|
}
|
|
46
285
|
|
|
47
|
-
// dist/
|
|
286
|
+
// dist/parser/sql-parse-error.js
|
|
48
287
|
var SQLParseError = class extends SyntaxError {
|
|
49
288
|
constructor(reason, source, offset) {
|
|
50
289
|
var _a;
|
|
@@ -62,7 +301,7 @@ var SQLParseError = class extends SyntaxError {
|
|
|
62
301
|
}
|
|
63
302
|
};
|
|
64
303
|
|
|
65
|
-
// dist/
|
|
304
|
+
// dist/parser/parse-sql-expression.js
|
|
66
305
|
var SQL_RESERVED_WORDS = /* @__PURE__ */ new Set([
|
|
67
306
|
"SELECT",
|
|
68
307
|
"ARRAY",
|
|
@@ -114,8 +353,8 @@ function sqlCastType(name, source = name, offset = 0) {
|
|
|
114
353
|
throw new SQLParseError(`Unsupported SQL CAST type: ${name}`, source, offset);
|
|
115
354
|
}
|
|
116
355
|
}
|
|
117
|
-
function parseSQLExpression(source) {
|
|
118
|
-
const reader = new SQLExpressionReader(source);
|
|
356
|
+
function parseSQLExpression(source, options = {}) {
|
|
357
|
+
const reader = new SQLExpressionReader(source, 0, options);
|
|
119
358
|
const expression = reader.expression();
|
|
120
359
|
reader.space();
|
|
121
360
|
if (reader.position !== source.length)
|
|
@@ -123,10 +362,12 @@ function parseSQLExpression(source) {
|
|
|
123
362
|
return expression;
|
|
124
363
|
}
|
|
125
364
|
var SQLExpressionReader = class {
|
|
126
|
-
constructor(source, start = 0) {
|
|
365
|
+
constructor(source, start = 0, parameterOptions = {}) {
|
|
127
366
|
this.source = source;
|
|
367
|
+
this.parameterOptions = parameterOptions;
|
|
128
368
|
this.tokens = 0;
|
|
129
369
|
this.depths = /* @__PURE__ */ new WeakMap();
|
|
370
|
+
validateSQLParameterOptions(parameterOptions);
|
|
130
371
|
this.position = start;
|
|
131
372
|
if (start === 0 && (typeof source !== "string" || !source.trim() || source.length > 65536))
|
|
132
373
|
throw new SQLParseError("SQL expression requires non-empty input of at most 65536 characters", "", 0);
|
|
@@ -212,6 +453,28 @@ var SQLExpressionReader = class {
|
|
|
212
453
|
}
|
|
213
454
|
if (minimum <= 3) {
|
|
214
455
|
const negate = this.word("NOT");
|
|
456
|
+
if (this.word("IN")) {
|
|
457
|
+
this.symbol("(");
|
|
458
|
+
const values = [];
|
|
459
|
+
do {
|
|
460
|
+
const item = this.expression(depth + 1);
|
|
461
|
+
if (item.type === "ArrayExpression") {
|
|
462
|
+
for (const element of item.elements) {
|
|
463
|
+
if (element.type !== "Literal")
|
|
464
|
+
throw this.error("SQL IN requires scalar values");
|
|
465
|
+
values.push(element);
|
|
466
|
+
}
|
|
467
|
+
} else
|
|
468
|
+
values.push(item);
|
|
469
|
+
if (values.length > 4096)
|
|
470
|
+
throw this.error("SQL IN exceeds 4096 values");
|
|
471
|
+
} while (this.take(","));
|
|
472
|
+
this.symbol(")");
|
|
473
|
+
left = values.length ? this.call("in", [left, ...values]) : this.node({ type: "Literal", value: false, raw: "false" });
|
|
474
|
+
if (negate)
|
|
475
|
+
left = this.node({ type: "UnaryExpression", operator: "!", argument: left }, [left]);
|
|
476
|
+
continue;
|
|
477
|
+
}
|
|
215
478
|
const insensitive = this.word("ILIKE");
|
|
216
479
|
if (insensitive || this.word("LIKE")) {
|
|
217
480
|
const pattern = this.expression(depth + 1, 4);
|
|
@@ -269,7 +532,7 @@ var SQLExpressionReader = class {
|
|
|
269
532
|
this.position += width[0].length;
|
|
270
533
|
this.token();
|
|
271
534
|
this.symbol("]");
|
|
272
|
-
const array = argument;
|
|
535
|
+
const array = argument.type === "ArrayExpression" ? { type: "CallExpression", callee: { name: "array" }, arguments: argument.elements } : argument;
|
|
273
536
|
if (array.type !== "CallExpression" || !/^array(?:_(?:float(?:16|32|64)|uint8))?$/.test(array.callee.name) || Number(width[0]) !== array.arguments.length)
|
|
274
537
|
throw this.error("ARRAY cast length must match the number of components");
|
|
275
538
|
const type = sqlCastType(match[0], this.source, start);
|
|
@@ -463,8 +726,21 @@ var SQLExpressionReader = class {
|
|
|
463
726
|
}
|
|
464
727
|
return this.call(name, args, fold);
|
|
465
728
|
}
|
|
729
|
+
/** Reads named value placeholders; quotes and identifiers use separate productions. */
|
|
466
730
|
extendedPrimary() {
|
|
467
|
-
|
|
731
|
+
if (this.source[this.position] !== ":")
|
|
732
|
+
return void 0;
|
|
733
|
+
const start = this.position;
|
|
734
|
+
const parameter = /^:([A-Za-z_][A-Za-z0-9_]*)/.exec(this.source.slice(start));
|
|
735
|
+
if (!parameter)
|
|
736
|
+
throw this.error("SQL named parameters require a name");
|
|
737
|
+
this.position += parameter[0].length;
|
|
738
|
+
this.token();
|
|
739
|
+
try {
|
|
740
|
+
return this.node(bindSQLParameter(parameter[1], this.parameterOptions));
|
|
741
|
+
} catch (error) {
|
|
742
|
+
throw this.error(error instanceof Error ? error.message : String(error), start);
|
|
743
|
+
}
|
|
468
744
|
}
|
|
469
745
|
/** Lowers field access to a portable expression call for Arrow binding. */
|
|
470
746
|
memberAccess(object, name) {
|
|
@@ -480,103 +756,12 @@ var SQLExpressionReader = class {
|
|
|
480
756
|
}
|
|
481
757
|
};
|
|
482
758
|
|
|
483
|
-
// dist/
|
|
484
|
-
var COLUMNAR_SCALAR_TYPES = Object.freeze([
|
|
485
|
-
"int8",
|
|
486
|
-
"int16",
|
|
487
|
-
"int32",
|
|
488
|
-
"int64",
|
|
489
|
-
"uint8",
|
|
490
|
-
"uint16",
|
|
491
|
-
"uint32",
|
|
492
|
-
"uint64",
|
|
493
|
-
"float16",
|
|
494
|
-
"float32",
|
|
495
|
-
"float64",
|
|
496
|
-
"bool",
|
|
497
|
-
"utf8"
|
|
498
|
-
]);
|
|
499
|
-
function isColumnarScalarType(value) {
|
|
500
|
-
return typeof value === "string" && COLUMNAR_SCALAR_TYPES.includes(value);
|
|
501
|
-
}
|
|
502
|
-
|
|
503
|
-
// dist/expressions/columnar-predicate.js
|
|
504
|
-
function isColumnarPredicateParameter(value) {
|
|
505
|
-
const parameterValue = value;
|
|
506
|
-
return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length === 1 && Object.prototype.hasOwnProperty.call(value, "parameter") && typeof parameterValue.parameter === "string" && parameterValue.parameter.length > 0;
|
|
507
|
-
}
|
|
508
|
-
function isColumnarPredicateValue(value) {
|
|
509
|
-
return typeof value === "boolean" || typeof value === "bigint" || typeof value === "string" || typeof value === "number" && Number.isFinite(value) || value instanceof Date && Number.isFinite(value.getTime()) || value instanceof Uint8Array;
|
|
510
|
-
}
|
|
511
|
-
function bindColumnarPredicateParameters(predicate, parameters) {
|
|
512
|
-
switch (predicate.op) {
|
|
513
|
-
case "and":
|
|
514
|
-
case "or":
|
|
515
|
-
return {
|
|
516
|
-
op: predicate.op,
|
|
517
|
-
args: predicate.args.map((child) => bindColumnarPredicateParameters(child, parameters))
|
|
518
|
-
};
|
|
519
|
-
case "not":
|
|
520
|
-
return {
|
|
521
|
-
op: "not",
|
|
522
|
-
args: [bindColumnarPredicateParameters(predicate.args[0], parameters)]
|
|
523
|
-
};
|
|
524
|
-
case "isNull":
|
|
525
|
-
return { op: "isNull", args: [copyColumnarPredicateProperty(predicate.args[0])] };
|
|
526
|
-
case "in":
|
|
527
|
-
return {
|
|
528
|
-
op: "in",
|
|
529
|
-
args: [
|
|
530
|
-
copyColumnarPredicateProperty(predicate.args[0]),
|
|
531
|
-
predicate.args[1].map((value) => bindColumnarPredicateValue(value, parameters))
|
|
532
|
-
]
|
|
533
|
-
};
|
|
534
|
-
default:
|
|
535
|
-
return {
|
|
536
|
-
op: predicate.op,
|
|
537
|
-
args: [
|
|
538
|
-
copyColumnarPredicateProperty(predicate.args[0]),
|
|
539
|
-
bindColumnarPredicateValue(predicate.args[1], parameters)
|
|
540
|
-
]
|
|
541
|
-
};
|
|
542
|
-
}
|
|
543
|
-
}
|
|
544
|
-
function bindColumnarPredicateValue(value, parameters) {
|
|
545
|
-
if (!isColumnarPredicateParameter(value))
|
|
546
|
-
return value;
|
|
547
|
-
if (!Object.prototype.hasOwnProperty.call(parameters, value.parameter)) {
|
|
548
|
-
throw new Error(`Columnar predicate parameter ":${value.parameter}" requires a value`);
|
|
549
|
-
}
|
|
550
|
-
const parameterValue = parameters[value.parameter];
|
|
551
|
-
if (isColumnarPredicateParameter(parameterValue)) {
|
|
552
|
-
throw new Error(`Columnar predicate parameter ":${value.parameter}" cannot reference another parameter`);
|
|
553
|
-
}
|
|
554
|
-
if (!isColumnarPredicateValue(parameterValue)) {
|
|
555
|
-
throw new Error(`Columnar predicate parameter ":${value.parameter}" has an unsupported value`);
|
|
556
|
-
}
|
|
557
|
-
return copyColumnarPredicateValue(parameterValue);
|
|
558
|
-
}
|
|
559
|
-
function copyColumnarPredicateProperty(property) {
|
|
560
|
-
return {
|
|
561
|
-
...property,
|
|
562
|
-
...property.casts ? { casts: [...property.casts] } : {},
|
|
563
|
-
property: typeof property.property === "string" ? property.property : [...property.property]
|
|
564
|
-
};
|
|
565
|
-
}
|
|
566
|
-
function copyColumnarPredicateValue(value) {
|
|
567
|
-
if (value instanceof Uint8Array)
|
|
568
|
-
return value.slice();
|
|
569
|
-
if (value instanceof Date)
|
|
570
|
-
return new Date(value.getTime());
|
|
571
|
-
return value;
|
|
572
|
-
}
|
|
573
|
-
|
|
574
|
-
// dist/sql/sql-predicate-types.js
|
|
759
|
+
// dist/parser/sql-predicate-types.js
|
|
575
760
|
function isSQLPredicateParameter(value) {
|
|
576
761
|
return isColumnarPredicateParameter(value);
|
|
577
762
|
}
|
|
578
763
|
|
|
579
|
-
// dist/
|
|
764
|
+
// dist/parser/sql-predicate-schema.js
|
|
580
765
|
var MAXIMUM_PREDICATE_DEPTH = 64;
|
|
581
766
|
var MAXIMUM_PREDICATE_NODES = 4096;
|
|
582
767
|
var SQL_PREDICATE_JSON_SCHEMA = {
|
|
@@ -794,7 +979,7 @@ function hasAllowedKeys(value, allowedKeys) {
|
|
|
794
979
|
return Object.keys(value).every((key) => allowedKeys.includes(key));
|
|
795
980
|
}
|
|
796
981
|
|
|
797
|
-
// dist/
|
|
982
|
+
// dist/parser/parse-sql-predicate.js
|
|
798
983
|
var MAXIMUM_SQL_LENGTH = 65536;
|
|
799
984
|
var MAXIMUM_SQL_TOKENS = 4096;
|
|
800
985
|
var MAXIMUM_EXPRESSION_DEPTH = 64;
|
|
@@ -1134,11 +1319,11 @@ function readQuotedToken(source, start, quote, escapedQuote) {
|
|
|
1134
1319
|
throw new SQLParseError("SQL predicate contains an unterminated quoted value", source, start);
|
|
1135
1320
|
}
|
|
1136
1321
|
|
|
1137
|
-
// dist/
|
|
1322
|
+
// dist/parser/parse-sql-select.js
|
|
1138
1323
|
var MAXIMUM_SQL_LENGTH2 = 65536;
|
|
1139
1324
|
var MAXIMUM_SELECT_TOKENS = 4096;
|
|
1140
1325
|
function parseSQLSelect(sql, options = {}) {
|
|
1141
|
-
const reader = new SQLQueryReader(sql);
|
|
1326
|
+
const reader = new SQLQueryReader(sql, options);
|
|
1142
1327
|
reader.expectKeyword("SELECT");
|
|
1143
1328
|
let select;
|
|
1144
1329
|
if (!reader.takeSymbol("*")) {
|
|
@@ -1187,9 +1372,11 @@ function parseSQLSelect(sql, options = {}) {
|
|
|
1187
1372
|
}
|
|
1188
1373
|
var SQLQueryReader = class {
|
|
1189
1374
|
/** Rejects empty or oversized statements before scanning. */
|
|
1190
|
-
constructor(sql) {
|
|
1375
|
+
constructor(sql, parameterOptions = {}) {
|
|
1376
|
+
this.parameterOptions = parameterOptions;
|
|
1191
1377
|
this.position = 0;
|
|
1192
1378
|
this.tokens = 0;
|
|
1379
|
+
validateSQLParameterOptions(parameterOptions);
|
|
1193
1380
|
if (typeof sql !== "string" || !sql.trim() || sql.length > MAXIMUM_SQL_LENGTH2)
|
|
1194
1381
|
throw new SQLParseError("SQL query requires a non-empty statement of at most 65536 characters.", "", 0);
|
|
1195
1382
|
this.sql = sql;
|
|
@@ -1348,7 +1535,7 @@ var SQLQueryReader = class {
|
|
|
1348
1535
|
this.position++;
|
|
1349
1536
|
}
|
|
1350
1537
|
expressionReader() {
|
|
1351
|
-
return new SQLExpressionReader(this.sql, this.position);
|
|
1538
|
+
return new SQLExpressionReader(this.sql, this.position, this.parameterOptions);
|
|
1352
1539
|
}
|
|
1353
1540
|
/** Bounds large projection lists independently of predicate parsing. */
|
|
1354
1541
|
countToken() {
|
|
@@ -1357,17 +1544,17 @@ var SQLQueryReader = class {
|
|
|
1357
1544
|
}
|
|
1358
1545
|
};
|
|
1359
1546
|
|
|
1360
|
-
// dist/
|
|
1361
|
-
function parseSQLQuery(sql, options) {
|
|
1547
|
+
// dist/parser/parse-sql-query.js
|
|
1548
|
+
function parseSQLQuery(sql, options = {}) {
|
|
1362
1549
|
try {
|
|
1363
|
-
return parseQuery(sql);
|
|
1550
|
+
return parseQuery(sql, options);
|
|
1364
1551
|
} catch (error) {
|
|
1365
1552
|
reportDiagnosticError(options == null ? void 0 : options.log, error);
|
|
1366
1553
|
throw error;
|
|
1367
1554
|
}
|
|
1368
1555
|
}
|
|
1369
|
-
function parseQuery(sql) {
|
|
1370
|
-
const reader = new SQLQueryReader(sql);
|
|
1556
|
+
function parseQuery(sql, options) {
|
|
1557
|
+
const reader = new SQLQueryReader(sql, options);
|
|
1371
1558
|
if (reader.takeKeyword("SHOW")) {
|
|
1372
1559
|
let request;
|
|
1373
1560
|
if (reader.takeKeyword("SOURCES"))
|
|
@@ -1386,13 +1573,18 @@ function parseQuery(sql) {
|
|
|
1386
1573
|
return { command: "describe", from };
|
|
1387
1574
|
}
|
|
1388
1575
|
return parseSQLSelect(sql, {
|
|
1576
|
+
...options,
|
|
1389
1577
|
parseWhere: (expression) => {
|
|
1390
1578
|
try {
|
|
1391
|
-
|
|
1579
|
+
if (options.parseParameter || isSQLParameterSnapshot(options.parameters))
|
|
1580
|
+
throw new Error("Custom parameter AST requires expression parsing");
|
|
1581
|
+
const predicate = parseSQLPredicate(expression, {
|
|
1582
|
+
parameters: options.parameters
|
|
1583
|
+
});
|
|
1392
1584
|
validateColumnReferences(predicate);
|
|
1393
1585
|
return predicate;
|
|
1394
1586
|
} catch {
|
|
1395
|
-
return { expression: parseSQLExpression(expression) };
|
|
1587
|
+
return { expression: parseSQLExpression(expression, options) };
|
|
1396
1588
|
}
|
|
1397
1589
|
}
|
|
1398
1590
|
});
|
|
@@ -1403,19 +1595,22 @@ function validateColumnReferences(predicate) {
|
|
|
1403
1595
|
} else if (predicate.op === "not")
|
|
1404
1596
|
validateColumnReferences(predicate.args[0]);
|
|
1405
1597
|
else {
|
|
1598
|
+
const values = predicate.op === "in" ? predicate.args[1] : predicate.op === "isNull" ? [] : [predicate.args[1]];
|
|
1599
|
+
if (values.some((value) => value instanceof Date || value instanceof Uint8Array))
|
|
1600
|
+
throw new Error("Date and binary values require expression evaluation");
|
|
1406
1601
|
const property = predicate.args[0];
|
|
1407
1602
|
if (!property.quoted && property.property.includes("."))
|
|
1408
1603
|
throw new Error("Nested fields require expression evaluation; quote literal column names containing dots.");
|
|
1409
1604
|
}
|
|
1410
1605
|
}
|
|
1411
1606
|
|
|
1412
|
-
// dist/
|
|
1607
|
+
// dist/parser/bind-sql-predicate.js
|
|
1413
1608
|
function bindSQLPredicate(predicate, parameters) {
|
|
1414
1609
|
validateSQLPredicate(predicate);
|
|
1415
1610
|
return bindColumnarPredicateParameters(predicate, parameters);
|
|
1416
1611
|
}
|
|
1417
1612
|
|
|
1418
|
-
// dist/
|
|
1613
|
+
// dist/parser/parse-sql-statement.js
|
|
1419
1614
|
function parseSQLSelectStatement(sql, options = {}) {
|
|
1420
1615
|
const reader = new RelationalQueryReader(sql, options);
|
|
1421
1616
|
const statement = { ...readSelect(reader), ...readTail(reader) };
|
|
@@ -1444,6 +1639,33 @@ function readSelect(reader) {
|
|
|
1444
1639
|
const from = readTable(reader);
|
|
1445
1640
|
const joins = [];
|
|
1446
1641
|
for (let type = readJoinType(reader); type; type = readJoinType(reader)) {
|
|
1642
|
+
if (reader.takeKeyword("UNNEST")) {
|
|
1643
|
+
reader.expectSymbol("(");
|
|
1644
|
+
const expression = reader.selectionExpression();
|
|
1645
|
+
reader.expectSymbol(")");
|
|
1646
|
+
const ordinality = reader.takeKeyword("WITH");
|
|
1647
|
+
if (ordinality)
|
|
1648
|
+
reader.expectKeyword("ORDINALITY");
|
|
1649
|
+
reader.expectKeyword("AS");
|
|
1650
|
+
const alias = reader.identifier();
|
|
1651
|
+
reader.expectSymbol("(");
|
|
1652
|
+
const columns = readList(reader, () => reader.identifier());
|
|
1653
|
+
reader.expectSymbol(")");
|
|
1654
|
+
if (type === "left") {
|
|
1655
|
+
reader.expectKeyword("ON");
|
|
1656
|
+
reader.expectKeyword("TRUE");
|
|
1657
|
+
} else if (type !== "cross")
|
|
1658
|
+
throw reader.error("UNNEST requires CROSS JOIN or LEFT JOIN");
|
|
1659
|
+
joins.push({
|
|
1660
|
+
type,
|
|
1661
|
+
table: { name: alias, alias },
|
|
1662
|
+
on: { type: "Literal", value: true },
|
|
1663
|
+
unnest: { expression, columns, ordinality }
|
|
1664
|
+
});
|
|
1665
|
+
continue;
|
|
1666
|
+
}
|
|
1667
|
+
if (type === "cross")
|
|
1668
|
+
throw reader.error("CROSS JOIN requires UNNEST");
|
|
1447
1669
|
const table = readTable(reader);
|
|
1448
1670
|
reader.expectKeyword("ON");
|
|
1449
1671
|
joins.push({ type, table, on: reader.selectionExpression() });
|
|
@@ -1474,6 +1696,10 @@ function readTable(reader) {
|
|
|
1474
1696
|
return { name, ...alias === void 0 ? {} : { alias } };
|
|
1475
1697
|
}
|
|
1476
1698
|
function readJoinType(reader) {
|
|
1699
|
+
if (reader.takeKeyword("CROSS")) {
|
|
1700
|
+
reader.expectKeyword("JOIN");
|
|
1701
|
+
return "cross";
|
|
1702
|
+
}
|
|
1477
1703
|
if (reader.takeKeyword("JOIN"))
|
|
1478
1704
|
return "inner";
|
|
1479
1705
|
let type;
|
|
@@ -1510,8 +1736,13 @@ function readList(reader, readItem) {
|
|
|
1510
1736
|
return items;
|
|
1511
1737
|
}
|
|
1512
1738
|
var RelationalQueryReader = class extends SQLQueryReader {
|
|
1739
|
+
/** Requires punctuation with a positioned diagnostic. */
|
|
1740
|
+
expectSymbol(symbol) {
|
|
1741
|
+
if (!this.takeSymbol(symbol))
|
|
1742
|
+
throw this.error(`Expected ${symbol}`);
|
|
1743
|
+
}
|
|
1513
1744
|
constructor(sql, options) {
|
|
1514
|
-
super(sql);
|
|
1745
|
+
super(sql, options);
|
|
1515
1746
|
this.options = options;
|
|
1516
1747
|
}
|
|
1517
1748
|
tableName() {
|
|
@@ -1541,24 +1772,12 @@ var RelationalQueryReader = class extends SQLQueryReader {
|
|
|
1541
1772
|
};
|
|
1542
1773
|
var RelationalExpressionReader = class extends SQLExpressionReader {
|
|
1543
1774
|
constructor(source, position, options) {
|
|
1544
|
-
super(source, position);
|
|
1545
|
-
this.options = options;
|
|
1775
|
+
super(source, position, options);
|
|
1546
1776
|
}
|
|
1547
1777
|
space() {
|
|
1548
1778
|
this.position = skipLineComments(this.source, this.position);
|
|
1549
1779
|
super.space();
|
|
1550
1780
|
}
|
|
1551
|
-
extendedPrimary() {
|
|
1552
|
-
if (this.source[this.position] !== ":")
|
|
1553
|
-
return void 0;
|
|
1554
|
-
const parameter = /^:([A-Za-z_][A-Za-z0-9_]*)/.exec(this.source.slice(this.position));
|
|
1555
|
-
if (!parameter || !this.options.parseParameter) {
|
|
1556
|
-
throw this.error("SQL named parameters require a name and parseParameter callback");
|
|
1557
|
-
}
|
|
1558
|
-
this.position += parameter[0].length;
|
|
1559
|
-
this.token();
|
|
1560
|
-
return this.node(this.options.parseParameter(parameter[1]));
|
|
1561
|
-
}
|
|
1562
1781
|
/** Preserves dot access until the planner can resolve table aliases. */
|
|
1563
1782
|
memberAccess(object, name) {
|
|
1564
1783
|
const property = this.node({ type: "Identifier", name });
|