@cubejs-backend/shared 1.8.21 → 1.8.23
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/src/sql-escape.d.ts +16 -1
- package/dist/src/sql-escape.d.ts.map +1 -1
- package/dist/src/sql-escape.js +173 -31
- package/dist/src/sql-escape.js.map +1 -1
- package/package.json +3 -3
package/dist/src/sql-escape.d.ts
CHANGED
|
@@ -14,14 +14,27 @@ export interface SqlDialectEscapeRules {
|
|
|
14
14
|
readonly escapeBackslash: boolean;
|
|
15
15
|
/** Character that delimits identifiers (`"` for standard SQL, `` ` `` for MySQL). */
|
|
16
16
|
readonly identifierQuoteChar: string;
|
|
17
|
+
readonly hashLineComments: boolean;
|
|
18
|
+
/** ClickHouse honours the escape there; in MySQL the backslash is ordinary text. */
|
|
19
|
+
readonly backslashInQuotedIdentifiers: boolean;
|
|
20
|
+
/** MySQL reads `1--1` as `1 - -1`: a comment needs whitespace or the end of the SQL after `--`. */
|
|
21
|
+
readonly dashCommentNeedsSpace: boolean;
|
|
22
|
+
readonly nestedBlockComments: boolean;
|
|
23
|
+
/** Trino and Spark end a `--` comment at a lone `\r`; MySQL and ClickHouse only at `\n`. */
|
|
24
|
+
readonly carriageReturnEndsLineComment: boolean;
|
|
25
|
+
/** Spark carries a `--` comment over a newline that follows a backslash. */
|
|
26
|
+
readonly backslashContinuesLineComment: boolean;
|
|
27
|
+
/** ClickHouse heredoc: `$tag$ ... $tag$` is a string literal with no escapes inside. */
|
|
28
|
+
readonly dollarQuotedStrings: boolean;
|
|
17
29
|
}
|
|
18
30
|
/**
|
|
19
31
|
* Escaping dialect of the target engine:
|
|
20
32
|
* - `ansi` — standard SQL: Presto, Trino, Athena, Dremio, ksqlDB, Pinot, ...
|
|
21
33
|
* - `mysql` — MySQL / MariaDB: quotes doubled, backslash is an escape char
|
|
34
|
+
* - `clickhouse` — ClickHouse: quotes doubled, backslash escapes in literals and identifiers
|
|
22
35
|
* - `spark` — Spark SQL / Hive / Databricks: backslash escapes only
|
|
23
36
|
*/
|
|
24
|
-
export type EscapeDialect = 'ansi' | 'mysql' | 'spark';
|
|
37
|
+
export type EscapeDialect = 'ansi' | 'mysql' | 'clickhouse' | 'spark';
|
|
25
38
|
/**
|
|
26
39
|
* Format a query for the given engine dialect: `?` -> escaped value,
|
|
27
40
|
* `??` -> escaped identifier.
|
|
@@ -37,6 +50,7 @@ export declare function formatAnsi(sql: string, values?: unknown): string;
|
|
|
37
50
|
* identifier.
|
|
38
51
|
*/
|
|
39
52
|
export declare function formatMySql(sql: string, values?: unknown): string;
|
|
53
|
+
export declare function formatClickHouse(sql: string, values?: unknown): string;
|
|
40
54
|
/**
|
|
41
55
|
* Format a query for Spark SQL / Hive / Databricks: `?` -> escaped value,
|
|
42
56
|
* `??` -> escaped identifier.
|
|
@@ -55,5 +69,6 @@ export declare function escapeIdentifierMySql(identifier: string): string;
|
|
|
55
69
|
*/
|
|
56
70
|
export declare function escapeIdentifierSparkSql(identifier: string): string;
|
|
57
71
|
export declare function escapeIdentifierBackslash(identifier: string): string;
|
|
72
|
+
export declare function escapeStringMySql(value: string): string;
|
|
58
73
|
export declare function escapeStringLiteral(value: string): string;
|
|
59
74
|
//# sourceMappingURL=sql-escape.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-escape.d.ts","sourceRoot":"","sources":["../../src/sql-escape.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,iFAAiF;IACjF,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC;;;;OAIG;IACH,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,qFAAqF;IACrF,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"sql-escape.d.ts","sourceRoot":"","sources":["../../src/sql-escape.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,iFAAiF;IACjF,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC;;;;OAIG;IACH,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,qFAAqF;IACrF,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,oFAAoF;IACpF,QAAQ,CAAC,4BAA4B,EAAE,OAAO,CAAC;IAC/C,mGAAmG;IACnG,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IAExC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC,4FAA4F;IAC5F,QAAQ,CAAC,6BAA6B,EAAE,OAAO,CAAC;IAChD,4EAA4E;IAC5E,QAAQ,CAAC,6BAA6B,EAAE,OAAO,CAAC;IAChD,wFAAwF;IACxF,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;CACvC;AAqUD;;;;;;GAMG;AACH,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,OAAO,GAAG,YAAY,GAAG,OAAO,CAAC;AAStE;;;GAGG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAEpF;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAEhE;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAEjE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAEtE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAEpE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE/D;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEzD"}
|
package/dist/src/sql-escape.js
CHANGED
|
@@ -3,23 +3,53 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.format = format;
|
|
4
4
|
exports.formatAnsi = formatAnsi;
|
|
5
5
|
exports.formatMySql = formatMySql;
|
|
6
|
+
exports.formatClickHouse = formatClickHouse;
|
|
6
7
|
exports.formatSparkSql = formatSparkSql;
|
|
7
8
|
exports.escapeIdentifierAnsi = escapeIdentifierAnsi;
|
|
8
9
|
exports.escapeIdentifierMySql = escapeIdentifierMySql;
|
|
9
10
|
exports.escapeIdentifierSparkSql = escapeIdentifierSparkSql;
|
|
10
11
|
exports.escapeIdentifierBackslash = escapeIdentifierBackslash;
|
|
12
|
+
exports.escapeStringMySql = escapeStringMySql;
|
|
11
13
|
exports.escapeStringLiteral = escapeStringLiteral;
|
|
12
14
|
const AnsiSqlDialect = {
|
|
13
15
|
stringQuoteChar: '\'',
|
|
14
16
|
doubleQuoteToEscape: true,
|
|
15
17
|
escapeBackslash: false,
|
|
16
18
|
identifierQuoteChar: '"',
|
|
19
|
+
hashLineComments: false,
|
|
20
|
+
backslashInQuotedIdentifiers: false,
|
|
21
|
+
dashCommentNeedsSpace: false,
|
|
22
|
+
nestedBlockComments: false,
|
|
23
|
+
carriageReturnEndsLineComment: true,
|
|
24
|
+
backslashContinuesLineComment: false,
|
|
25
|
+
dollarQuotedStrings: false,
|
|
17
26
|
};
|
|
18
27
|
const MySqlDialect = {
|
|
19
28
|
stringQuoteChar: '\'',
|
|
20
29
|
doubleQuoteToEscape: true,
|
|
21
30
|
escapeBackslash: true,
|
|
22
31
|
identifierQuoteChar: '`',
|
|
32
|
+
hashLineComments: true,
|
|
33
|
+
backslashInQuotedIdentifiers: false,
|
|
34
|
+
dashCommentNeedsSpace: true,
|
|
35
|
+
nestedBlockComments: false,
|
|
36
|
+
carriageReturnEndsLineComment: false,
|
|
37
|
+
backslashContinuesLineComment: false,
|
|
38
|
+
dollarQuotedStrings: false,
|
|
39
|
+
};
|
|
40
|
+
/** `ClickHouseQuery` emits a column named ``a`b`` as `` `a\`b` ``. */
|
|
41
|
+
const ClickHouseDialect = {
|
|
42
|
+
stringQuoteChar: '\'',
|
|
43
|
+
doubleQuoteToEscape: true,
|
|
44
|
+
escapeBackslash: true,
|
|
45
|
+
identifierQuoteChar: '`',
|
|
46
|
+
hashLineComments: true,
|
|
47
|
+
backslashInQuotedIdentifiers: true,
|
|
48
|
+
dashCommentNeedsSpace: false,
|
|
49
|
+
nestedBlockComments: true,
|
|
50
|
+
carriageReturnEndsLineComment: false,
|
|
51
|
+
backslashContinuesLineComment: false,
|
|
52
|
+
dollarQuotedStrings: true,
|
|
23
53
|
};
|
|
24
54
|
/**
|
|
25
55
|
* Spark SQL / Hive / Databricks. Their lexers know backslash escapes only — a
|
|
@@ -32,6 +62,13 @@ const SparkSqlDialect = {
|
|
|
32
62
|
doubleQuoteToEscape: false,
|
|
33
63
|
escapeBackslash: true,
|
|
34
64
|
identifierQuoteChar: '`',
|
|
65
|
+
hashLineComments: false,
|
|
66
|
+
backslashInQuotedIdentifiers: false,
|
|
67
|
+
dashCommentNeedsSpace: false,
|
|
68
|
+
nestedBlockComments: true,
|
|
69
|
+
carriageReturnEndsLineComment: true,
|
|
70
|
+
backslashContinuesLineComment: true,
|
|
71
|
+
dollarQuotedStrings: false,
|
|
35
72
|
};
|
|
36
73
|
class SqlEscaper {
|
|
37
74
|
rules;
|
|
@@ -56,12 +93,13 @@ class SqlEscaper {
|
|
|
56
93
|
}
|
|
57
94
|
escapeIdentifier(identifier) {
|
|
58
95
|
const q = this.rules.identifierQuoteChar;
|
|
59
|
-
|
|
96
|
+
let escaped = String(identifier);
|
|
97
|
+
if (this.rules.backslashInQuotedIdentifiers) {
|
|
98
|
+
escaped = escaped.split('\\').join('\\\\');
|
|
99
|
+
}
|
|
100
|
+
return `${q}${escaped.split(q).join(q + q)}${q}`;
|
|
60
101
|
}
|
|
61
102
|
escapeValue(value) {
|
|
62
|
-
return this.escapeValueInternal(value, false);
|
|
63
|
-
}
|
|
64
|
-
escapeValueInternal(value, stringifyObjects) {
|
|
65
103
|
if (value === null || value === undefined) {
|
|
66
104
|
return 'NULL';
|
|
67
105
|
}
|
|
@@ -82,8 +120,8 @@ class SqlEscaper {
|
|
|
82
120
|
if (Array.isArray(value)) {
|
|
83
121
|
return value
|
|
84
122
|
.map((v) => (Array.isArray(v)
|
|
85
|
-
? `(${this.
|
|
86
|
-
: this.
|
|
123
|
+
? `(${this.escapeValue(v)})`
|
|
124
|
+
: this.escapeValue(v)))
|
|
87
125
|
.join(', ');
|
|
88
126
|
}
|
|
89
127
|
if (Buffer.isBuffer(value)) {
|
|
@@ -92,13 +130,10 @@ class SqlEscaper {
|
|
|
92
130
|
if (typeof obj.toSqlString === 'function') {
|
|
93
131
|
return String(obj.toSqlString());
|
|
94
132
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
.filter((key) => typeof value[key] !== 'function')
|
|
100
|
-
.map((key) => (`${this.escapeIdentifier(key)} = ${this.escapeValueInternal(value[key], true)}`))
|
|
101
|
-
.join(', ');
|
|
133
|
+
// Forbidden as potentially unsafe: only an object with `toSqlString` is allowed.
|
|
134
|
+
// Read from the prototype: an own `constructor` key would be attacker-controlled text.
|
|
135
|
+
const className = Object.getPrototypeOf(value)?.constructor?.name || 'unknown';
|
|
136
|
+
throw new Error(`Unsupported parameter type for SQL escaping: object of class ${className}`);
|
|
102
137
|
}
|
|
103
138
|
default:
|
|
104
139
|
throw new Error(`Unsupported parameter type for SQL escaping: ${typeof value}`);
|
|
@@ -106,47 +141,148 @@ class SqlEscaper {
|
|
|
106
141
|
}
|
|
107
142
|
/**
|
|
108
143
|
* Substitutes positional placeholders in `sql` with escaped `values`:
|
|
109
|
-
*
|
|
110
|
-
*
|
|
111
|
-
*
|
|
112
|
-
*
|
|
144
|
+
* - `?` is replaced by an escaped value ({@link escapeValue})
|
|
145
|
+
* - `??` is replaced by an escaped identifier ({@link escapeIdentifier})
|
|
146
|
+
*
|
|
147
|
+
* A `?` inside a quoted region (string literal, quoted identifier) or a comment
|
|
148
|
+
* is SQL text, not a placeholder: the compiler only ever emits placeholders in
|
|
149
|
+
* code position, so `regexp_like(a, 'x+?')` needs no escaping.
|
|
113
150
|
*/
|
|
114
151
|
format(sql, values) {
|
|
115
152
|
if (values === null || values === undefined) {
|
|
116
153
|
return sql;
|
|
117
154
|
}
|
|
118
155
|
const valueList = Array.isArray(values) ? values : [values];
|
|
156
|
+
// Nothing to substitute, so nothing can land in the wrong slot. Scanning anyway
|
|
157
|
+
// would reject a `?` that is an operator, like the ClickHouse `cond ? a : b`.
|
|
119
158
|
if (valueList.length === 0) {
|
|
120
159
|
return sql;
|
|
121
160
|
}
|
|
122
|
-
const
|
|
161
|
+
const tokens = this.placeholderScanner();
|
|
123
162
|
let result = '';
|
|
124
163
|
let chunkIndex = 0;
|
|
125
164
|
let valuesIndex = 0;
|
|
126
|
-
let
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
if (
|
|
132
|
-
|
|
133
|
-
? this.escapeIdentifier(String(valueList[valuesIndex]))
|
|
134
|
-
: this.escapeValue(valueList[valuesIndex]);
|
|
135
|
-
result += sql.slice(chunkIndex, match.index) + rendered;
|
|
136
|
-
chunkIndex = placeholders.lastIndex;
|
|
137
|
-
valuesIndex += 1;
|
|
165
|
+
let placeholderCount = 0;
|
|
166
|
+
let match;
|
|
167
|
+
// eslint-disable-next-line no-cond-assign
|
|
168
|
+
while ((match = tokens.exec(sql)) !== null) {
|
|
169
|
+
const token = match[0];
|
|
170
|
+
if (token[0] !== '?') {
|
|
171
|
+
tokens.lastIndex = this.skipNonCode(sql, match.index, token);
|
|
138
172
|
}
|
|
139
|
-
|
|
173
|
+
else if (token.length <= 2) {
|
|
174
|
+
// Longer runs (`???`+) are not placeholders we understand, so they stay
|
|
175
|
+
// verbatim and consume no value.
|
|
176
|
+
placeholderCount += 1;
|
|
177
|
+
if (valuesIndex < valueList.length) {
|
|
178
|
+
const rendered = token.length === 2
|
|
179
|
+
? this.escapeIdentifier(String(valueList[valuesIndex]))
|
|
180
|
+
: this.escapeValue(valueList[valuesIndex]);
|
|
181
|
+
result += sql.slice(chunkIndex, match.index) + rendered;
|
|
182
|
+
chunkIndex = tokens.lastIndex;
|
|
183
|
+
valuesIndex += 1;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
if (placeholderCount !== valueList.length) {
|
|
188
|
+
throw SqlEscaper.parameterCountMismatch(placeholderCount, valueList.length);
|
|
140
189
|
}
|
|
141
190
|
if (chunkIndex === 0) {
|
|
142
191
|
return sql;
|
|
143
192
|
}
|
|
144
193
|
return chunkIndex < sql.length ? result + sql.slice(chunkIndex) : result;
|
|
145
194
|
}
|
|
195
|
+
placeholderScanner() {
|
|
196
|
+
const { hashLineComments, dashCommentNeedsSpace, dollarQuotedStrings } = this.rules;
|
|
197
|
+
const quoteOrHash = hashLineComments ? '[\'"`#]' : '[\'"`]';
|
|
198
|
+
// Space is the last character MySQL accepts after `--`, so anything from `!` up rules a comment out.
|
|
199
|
+
const dashComment = dashCommentNeedsSpace ? '--(?![!-\\uffff])' : '--';
|
|
200
|
+
// `a$b$c` is one bare identifier in ClickHouse, so a tag only opens at the start of a token.
|
|
201
|
+
const heredoc = dollarQuotedStrings ? '|(?<![\\w$])\\$\\w*\\$' : '';
|
|
202
|
+
return new RegExp(`\\?+|${quoteOrHash}|${dashComment}|\\/\\*${heredoc}`, 'g');
|
|
203
|
+
}
|
|
204
|
+
/**
|
|
205
|
+
* Returns the index just past the quoted region or comment opened at `start`.
|
|
206
|
+
* Backslash handling must match the engine, as in {@link escapeString}: both follow `rules`.
|
|
207
|
+
*/
|
|
208
|
+
skipNonCode(sql, start, opener) {
|
|
209
|
+
if (opener === '--' || opener === '#') {
|
|
210
|
+
return this.skipLineComment(sql, start + opener.length);
|
|
211
|
+
}
|
|
212
|
+
if (opener === '/*') {
|
|
213
|
+
return this.skipBlockComment(sql, start);
|
|
214
|
+
}
|
|
215
|
+
if (opener[0] === '$') {
|
|
216
|
+
const close = sql.indexOf(opener, start + opener.length);
|
|
217
|
+
return close === -1 ? sql.length : close + opener.length;
|
|
218
|
+
}
|
|
219
|
+
const { escapeBackslash, backslashInQuotedIdentifiers } = this.rules;
|
|
220
|
+
if (!escapeBackslash || (opener === '`' && !backslashInQuotedIdentifiers)) {
|
|
221
|
+
const close = sql.indexOf(opener, start + 1);
|
|
222
|
+
return close === -1 ? sql.length : close + 1;
|
|
223
|
+
}
|
|
224
|
+
let i = start + 1;
|
|
225
|
+
while (i < sql.length) {
|
|
226
|
+
if (sql[i] === opener) {
|
|
227
|
+
return i + 1;
|
|
228
|
+
}
|
|
229
|
+
i += sql[i] === '\\' ? 2 : 1;
|
|
230
|
+
}
|
|
231
|
+
return sql.length;
|
|
232
|
+
}
|
|
233
|
+
skipLineComment(sql, from) {
|
|
234
|
+
const { carriageReturnEndsLineComment, backslashContinuesLineComment } = this.rules;
|
|
235
|
+
let i = from;
|
|
236
|
+
while (i < sql.length) {
|
|
237
|
+
const end = carriageReturnEndsLineComment ? SqlEscaper.nextLineBreak(sql, i) : sql.indexOf('\n', i);
|
|
238
|
+
if (end === -1) {
|
|
239
|
+
return sql.length;
|
|
240
|
+
}
|
|
241
|
+
const continued = backslashContinuesLineComment && sql[end] === '\n' && end > from && sql[end - 1] === '\\';
|
|
242
|
+
if (!continued) {
|
|
243
|
+
return end + 1;
|
|
244
|
+
}
|
|
245
|
+
i = end + 1;
|
|
246
|
+
}
|
|
247
|
+
return sql.length;
|
|
248
|
+
}
|
|
249
|
+
// One scan for both terminators: a separate `indexOf('\r')` runs to the end of the
|
|
250
|
+
// SQL on every comment, since there is usually none.
|
|
251
|
+
static nextLineBreak(sql, from) {
|
|
252
|
+
const lineBreak = /[\r\n]/g;
|
|
253
|
+
lineBreak.lastIndex = from;
|
|
254
|
+
const match = lineBreak.exec(sql);
|
|
255
|
+
return match === null ? -1 : match.index;
|
|
256
|
+
}
|
|
257
|
+
skipBlockComment(sql, start) {
|
|
258
|
+
let depth = 1;
|
|
259
|
+
let i = start + 2;
|
|
260
|
+
while (depth > 0) {
|
|
261
|
+
const close = sql.indexOf('*/', i);
|
|
262
|
+
if (close === -1) {
|
|
263
|
+
return sql.length;
|
|
264
|
+
}
|
|
265
|
+
const open = this.rules.nestedBlockComments ? sql.indexOf('/*', i) : -1;
|
|
266
|
+
if (open !== -1 && open < close) {
|
|
267
|
+
depth += 1;
|
|
268
|
+
i = open + 2;
|
|
269
|
+
}
|
|
270
|
+
else {
|
|
271
|
+
depth -= 1;
|
|
272
|
+
i = close + 2;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
return i;
|
|
276
|
+
}
|
|
277
|
+
static parameterCountMismatch(placeholderCount, valueCount) {
|
|
278
|
+
return new Error(`SQL parameter count mismatch: ${placeholderCount} placeholder(s) but ${valueCount} value(s) supplied. ` +
|
|
279
|
+
'A literal \'?\' is only allowed inside a string literal, a quoted identifier or a comment.');
|
|
280
|
+
}
|
|
146
281
|
}
|
|
147
282
|
const Dialects = {
|
|
148
283
|
ansi: AnsiSqlDialect,
|
|
149
284
|
mysql: MySqlDialect,
|
|
285
|
+
clickhouse: ClickHouseDialect,
|
|
150
286
|
spark: SparkSqlDialect,
|
|
151
287
|
};
|
|
152
288
|
/**
|
|
@@ -170,6 +306,9 @@ function formatAnsi(sql, values) {
|
|
|
170
306
|
function formatMySql(sql, values) {
|
|
171
307
|
return format('mysql', sql, values);
|
|
172
308
|
}
|
|
309
|
+
function formatClickHouse(sql, values) {
|
|
310
|
+
return format('clickhouse', sql, values);
|
|
311
|
+
}
|
|
173
312
|
/**
|
|
174
313
|
* Format a query for Spark SQL / Hive / Databricks: `?` -> escaped value,
|
|
175
314
|
* `??` -> escaped identifier.
|
|
@@ -198,6 +337,9 @@ function escapeIdentifierSparkSql(identifier) {
|
|
|
198
337
|
function escapeIdentifierBackslash(identifier) {
|
|
199
338
|
return `\`${String(identifier).replace(/\\/g, '\\\\').replace(/`/g, '\\`')}\``;
|
|
200
339
|
}
|
|
340
|
+
function escapeStringMySql(value) {
|
|
341
|
+
return new SqlEscaper(MySqlDialect).escapeString(String(value));
|
|
342
|
+
}
|
|
201
343
|
function escapeStringLiteral(value) {
|
|
202
344
|
return new SqlEscaper(AnsiSqlDialect).escapeString(String(value));
|
|
203
345
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-escape.js","sourceRoot":"","sources":["../../src/sql-escape.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sql-escape.js","sourceRoot":"","sources":["../../src/sql-escape.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cubejs-backend/shared",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.23",
|
|
4
4
|
"description": "Shared code for Cube backend packages",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"typings": "dist/src/index.d.ts",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
},
|
|
26
26
|
"license": "Apache-2.0",
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@cubejs-backend/linter": "1.8.
|
|
28
|
+
"@cubejs-backend/linter": "1.8.23",
|
|
29
29
|
"@types/bytes": "^3.1.5",
|
|
30
30
|
"@types/cli-progress": "^3.9.1",
|
|
31
31
|
"@types/jest": "^29",
|
|
@@ -62,5 +62,5 @@
|
|
|
62
62
|
"resolutions": {
|
|
63
63
|
"colors": "1.4.0"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "27fbd15f9b7392066ca08c57dba467a0d77d74e1"
|
|
66
66
|
}
|