@balena/abstract-sql-compiler 8.3.7 → 8.3.8

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.
Files changed (25) hide show
  1. package/.versionbot/CHANGELOG.yml +13 -1
  2. package/CHANGELOG.md +4 -0
  3. package/out/AbstractSQLCompiler.d.ts +10 -5
  4. package/out/AbstractSQLCompiler.js +1 -2
  5. package/out/AbstractSQLCompiler.js.map +1 -1
  6. package/out/AbstractSQLRules2SQL.d.ts +1 -1
  7. package/package.json +2 -2
  8. package/src/AbstractSQLCompiler.ts +13 -10
  9. package/test/abstract-sql/aggregate.ts +2 -2
  10. package/test/abstract-sql/and-or-boolean-optimisations.ts +2 -2
  11. package/test/abstract-sql/cast.ts +2 -2
  12. package/test/abstract-sql/coalesce.ts +2 -2
  13. package/test/abstract-sql/comparisons.ts +2 -2
  14. package/test/abstract-sql/dates.ts +2 -2
  15. package/test/abstract-sql/duration.ts +2 -2
  16. package/test/abstract-sql/empty-query-optimisations.ts +2 -5
  17. package/test/abstract-sql/functions_wrapper.ts +3 -7
  18. package/test/abstract-sql/insert-query.ts +2 -2
  19. package/test/abstract-sql/is-distinct.ts +2 -2
  20. package/test/abstract-sql/joins.ts +6 -3
  21. package/test/abstract-sql/json.ts +2 -2
  22. package/test/abstract-sql/math.ts +2 -2
  23. package/test/abstract-sql/nested-in-optimisations.ts +2 -2
  24. package/test/abstract-sql/not-not-optimisations.ts +2 -2
  25. package/test/abstract-sql/text.ts +2 -2
package/.versionbot/CHANGELOG.yml CHANGED
@@ -1,3 +1,15 @@
1
+ - commits:
2
+ - subject: Improve typings
3
+ hash: 43e75ef37de956d1b583bc62b307b04e0f8455c1
4
+ body: ""
5
+ footer:
6
+ Change-type: patch
7
+ change-type: patch
8
+ author: Pagan Gazzard
9
+ nested: []
10
+ version: 8.3.8
11
+ title: ""
12
+ date: 2023-04-12T17:22:26.539Z
1
13
  - commits:
2
14
  - subject: Remove typing for non-existent JSON node
3
15
  hash: 76181d438f0f37463642704d7908c1774040c2c2
@@ -9,7 +21,7 @@
9
21
  nested: []
10
22
  version: 8.3.7
11
23
  title: ""
12
- date: 2023-04-12T16:34:29.460Z
24
+ date: 2023-04-12T16:38:07.014Z
13
25
  - commits:
14
26
  - subject: Tighten the `isXValue` function typings
15
27
  hash: 91485cd9c88faaaed9b1280bc34eb3a99628057e
package/CHANGELOG.md CHANGED
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
4
4
  automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
5
5
  This project adheres to [Semantic Versioning](http://semver.org/).
6
6
 
7
+ ## 8.3.8 - 2023-04-12
8
+
9
+ * Improve typings [Pagan Gazzard]
10
+
7
11
  ## 8.3.7 - 2023-04-12
8
12
 
9
13
  * Remove typing for non-existent JSON node [Pagan Gazzard]
package/out/AbstractSQLCompiler.d.ts CHANGED
@@ -163,8 +163,13 @@ export type ConcatenateWithSeparatorNode = [
163
163
  export type LowerNode = ['Lower', TextTypeNodes];
164
164
  export type UpperNode = ['Upper', TextTypeNodes];
165
165
  export type TrimNode = ['Trim', TextTypeNodes];
166
- export type SubstringNode = ['Substring', TextTypeNodes];
167
- export type RightNode = ['Right', TextTypeNodes];
166
+ export type SubstringNode = [
167
+ 'Substring',
168
+ TextTypeNodes,
169
+ NumberTypeNodes,
170
+ NumberTypeNodes?
171
+ ];
172
+ export type RightNode = ['Right', TextTypeNodes, NumberTypeNodes];
168
173
  export type ReplaceNode = [
169
174
  'Replace',
170
175
  TextTypeNodes,
@@ -178,7 +183,7 @@ export type ExtractJSONPathAsTextNode = [
178
183
  ];
179
184
  export type StrictTextArrayTypeNodes = TextArrayNode;
180
185
  export type TextArrayTypeNodes = StrictTextArrayTypeNodes | UnknownTypeNodes;
181
- export type TextArrayNode = ['TextArray', ...TextNode[]];
186
+ export type TextArrayNode = ['TextArray', ...TextTypeNodes[]];
182
187
  export type StrictTextTypeNodes = TextNode | EmbeddedTextNode | ConcatenateNode | ConcatenateWithSeparatorNode | LowerNode | UpperNode | TrimNode | SubstringNode | RightNode | ReplaceNode | ExtractJSONPathAsTextNode;
183
188
  export type TextTypeNodes = StrictTextTypeNodes | UnknownTypeNodes;
184
189
  export type SelectQueryStatementNode = SelectNode | FromNode | InnerJoinNode | LeftJoinNode | RightJoinNode | FullJoinNode | CrossJoinNode | WhereNode | GroupByNode | HavingNode | OrderByNode | LimitNode | OffsetNode;
@@ -200,7 +205,7 @@ export interface FromTypeNode {
200
205
  export type ResourceNode = ['Resource', string];
201
206
  export type FromTypeNodes = FromTypeNode[keyof FromTypeNode] | AliasNode<FromTypeNode[keyof FromTypeNode]>;
202
207
  export type AliasableFromTypeNodes = FromTypeNodes | AliasNode<FromTypeNodes>;
203
- export type SelectNode = ['Select', AbstractSqlType[]];
208
+ export type SelectNode = ['Select', AnyTypeNodes[]];
204
209
  export type FromNode = ['From', AliasableFromTypeNodes];
205
210
  export type InnerJoinNode = ['Join', AliasableFromTypeNodes, OnNode?];
206
211
  export type LeftJoinNode = ['LeftJoin', AliasableFromTypeNodes, OnNode?];
@@ -225,7 +230,7 @@ export type ValuesNode = [
225
230
  ];
226
231
  export type ValuesNodeTypes = 'Default' | NullNode | BindNode | TextNode | EmbeddedTextNode | NumberNode | IntegerNode | RealNode | BooleanNode;
227
232
  export type AliasNode<T> = ['Alias', T, string];
228
- export type AnyTypeNodes = NullNode | DateTypeNodes | BooleanTypeNodes | NumberTypeNodes | TextTypeNodes | UnknownTypeNodes | DurationNode | SelectQueryNode | InsertQueryNode | UpdateQueryNode | DeleteQueryNode | UpsertQueryNode | SelectNode | ValuesNode | InnerJoinNode | LeftJoinNode | RightJoinNode | FullJoinNode | CrossJoinNode | GroupByNode | HavingNode;
233
+ export type AnyTypeNodes = NullNode | DateTypeNodes | BooleanTypeNodes | NumberTypeNodes | TextTypeNodes | JSONTypeNodes | UnknownTypeNodes | DurationNode | SelectQueryNode | InsertQueryNode | UpdateQueryNode | DeleteQueryNode | UpsertQueryNode | SelectNode | ValuesNode | InnerJoinNode | LeftJoinNode | RightJoinNode | FullJoinNode | CrossJoinNode | GroupByNode | HavingNode;
229
234
  export type AbstractSqlType = string | AnyTypeNodes;
230
235
  export type UnknownNode = AbstractSqlQuery;
231
236
  export interface AbstractSqlQuery extends Array<AbstractSqlType> {
package/out/AbstractSQLCompiler.js CHANGED
@@ -83,8 +83,7 @@ const containsNode = (n, checkNodeTypeFn) => {
83
83
  return true;
84
84
  }
85
85
  for (const p of n) {
86
- if (Array.isArray(p) &&
87
- containsNode(p, checkNodeTypeFn)) {
86
+ if (Array.isArray(p) && containsNode(p, checkNodeTypeFn)) {
88
87
  return true;
89
88
  }
90
89
  }
package/out/AbstractSQLCompiler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractSQLCompiler.js","sourceRoot":"","sources":["../src/AbstractSQLCompiler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AbstractSQLCompiler.js","sourceRoot":"","sources":["../src/AbstractSQLCompiler.ts"],"names":[],"mappings":"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"}
package/out/AbstractSQLRules2SQL.d.ts CHANGED
@@ -18,7 +18,7 @@ export declare const isNumericValue: (type: unknown) => type is "Number" | "Inte
18
18
  export declare const isBooleanValue: (type: unknown) => type is "Boolean" | "Equals" | "NotEquals" | "IsDistinctFrom" | "IsNotDistinctFrom" | "GreaterThan" | "GreaterThanOrEqual" | "LessThan" | "LessThanOrEqual" | "Between" | "Like" | "In" | "NotIn" | "Exists" | "NotExists" | "Not" | "And" | "Or";
19
19
  export declare const isDateValue: (type: unknown) => type is "Date" | "ToDate" | "ToTime" | "CurrentTimestamp" | "CurrentDate" | "DateTrunc" | "SubtractDateNumber" | "SubtractDateDuration" | "AddDateNumber" | "AddDateDuration";
20
20
  export declare const isArrayValue: (type: unknown) => type is "TextArray";
21
- export declare const isJSONValue: (type: unknown) => type is "AggregateJSON" | "ToJSON";
21
+ export declare const isJSONValue: (type: unknown) => type is "ToJSON" | "AggregateJSON";
22
22
  export declare const isDurationValue: (type: unknown) => type is "Duration";
23
23
  export declare const isFieldValue: (type: unknown) => type is "Field" | "ReferencedField";
24
24
  export declare const isNotNullable: (node: AbstractSqlType) => boolean;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@balena/abstract-sql-compiler",
3
- "version": "8.3.7",
3
+ "version": "8.3.8",
4
4
  "description": "A translator for abstract sql into sql.",
5
5
  "main": "out/AbstractSQLCompiler.js",
6
6
  "types": "out/AbstractSQLCompiler.d.ts",
@@ -59,6 +59,6 @@
59
59
  ]
60
60
  },
61
61
  "versionist": {
62
- "publishedAt": "2023-04-12T16:34:29.786Z"
62
+ "publishedAt": "2023-04-12T17:22:26.973Z"
63
63
  }
64
64
  }
package/src/AbstractSQLCompiler.ts CHANGED
@@ -262,8 +262,13 @@ export type ConcatenateWithSeparatorNode = [
262
262
  export type LowerNode = ['Lower', TextTypeNodes];
263
263
  export type UpperNode = ['Upper', TextTypeNodes];
264
264
  export type TrimNode = ['Trim', TextTypeNodes];
265
- export type SubstringNode = ['Substring', TextTypeNodes];
266
- export type RightNode = ['Right', TextTypeNodes];
265
+ export type SubstringNode = [
266
+ 'Substring',
267
+ TextTypeNodes,
268
+ NumberTypeNodes,
269
+ NumberTypeNodes?,
270
+ ];
271
+ export type RightNode = ['Right', TextTypeNodes, NumberTypeNodes];
267
272
  export type ReplaceNode = [
268
273
  'Replace',
269
274
  TextTypeNodes,
@@ -277,7 +282,7 @@ export type ExtractJSONPathAsTextNode = [
277
282
  ];
278
283
  export type StrictTextArrayTypeNodes = TextArrayNode;
279
284
  export type TextArrayTypeNodes = StrictTextArrayTypeNodes | UnknownTypeNodes;
280
- export type TextArrayNode = ['TextArray', ...TextNode[]];
285
+ export type TextArrayNode = ['TextArray', ...TextTypeNodes[]];
281
286
  export type StrictTextTypeNodes =
282
287
  | TextNode
283
288
  | EmbeddedTextNode
@@ -342,7 +347,7 @@ export type FromTypeNodes =
342
347
 
343
348
  export type AliasableFromTypeNodes = FromTypeNodes | AliasNode<FromTypeNodes>;
344
349
 
345
- export type SelectNode = ['Select', AbstractSqlType[]];
350
+ export type SelectNode = ['Select', AnyTypeNodes[]];
346
351
  export type FromNode = ['From', AliasableFromTypeNodes];
347
352
  export type InnerJoinNode = ['Join', AliasableFromTypeNodes, OnNode?];
348
353
  export type LeftJoinNode = ['LeftJoin', AliasableFromTypeNodes, OnNode?];
@@ -384,6 +389,7 @@ export type AnyTypeNodes =
384
389
  | BooleanTypeNodes
385
390
  | NumberTypeNodes
386
391
  | TextTypeNodes
392
+ | JSONTypeNodes
387
393
  | UnknownTypeNodes
388
394
  | DurationNode
389
395
  | SelectQueryNode
@@ -627,17 +633,14 @@ export const isWhereNode = (n: AbstractSqlType): n is WhereNode =>
627
633
  * @param checkNodeTypeFn A function that checks if a given node is the correct type
628
634
  */
629
635
  const containsNode = (
630
- n: AbstractSqlType[],
631
- checkNodeTypeFn: (n: AbstractSqlType[number]) => boolean,
636
+ n: AnyTypeNodes,
637
+ checkNodeTypeFn: (n: AnyTypeNodes) => boolean,
632
638
  ): boolean => {
633
639
  if (checkNodeTypeFn(n)) {
634
640
  return true;
635
641
  }
636
642
  for (const p of n) {
637
- if (
638
- Array.isArray(p) &&
639
- containsNode(p as AbstractSqlType[], checkNodeTypeFn)
640
- ) {
643
+ if (Array.isArray(p) && containsNode(p as AnyTypeNodes, checkNodeTypeFn)) {
641
644
  return true;
642
645
  }
643
646
  }
package/test/abstract-sql/aggregate.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { expect } from 'chai';
2
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
2
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
3
3
 
4
4
  type TestCb = (
5
5
  result: { query: string },
@@ -7,7 +7,7 @@ type TestCb = (
7
7
  ) => void;
8
8
  // tslint:disable-next-line no-var-requires
9
9
  const test = require('./test') as (
10
- query: AbstractSqlQuery,
10
+ query: AnyTypeNodes,
11
11
  binds: any[][] | TestCb,
12
12
  cb?: TestCb,
13
13
  ) => void;
package/test/abstract-sql/and-or-boolean-optimisations.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { stripIndent } from 'common-tags';
2
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
2
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
3
3
 
4
4
  type TestCb = (
5
5
  result: { query: string },
@@ -7,7 +7,7 @@ type TestCb = (
7
7
  ) => void;
8
8
  // tslint:disable-next-line no-var-requires
9
9
  const test = require('./test') as (
10
- query: AbstractSqlQuery,
10
+ query: AnyTypeNodes,
11
11
  binds: any[][] | TestCb,
12
12
  cb?: TestCb,
13
13
  ) => void;
package/test/abstract-sql/cast.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
1
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
2
2
 
3
3
  type TestCb = (
4
4
  result: { query: string },
@@ -6,7 +6,7 @@ type TestCb = (
6
6
  ) => void;
7
7
  // tslint:disable-next-line no-var-requires
8
8
  const test = require('./test') as (
9
- query: AbstractSqlQuery,
9
+ query: AnyTypeNodes,
10
10
  binds: any[][] | TestCb,
11
11
  cb?: TestCb,
12
12
  ) => void;
package/test/abstract-sql/coalesce.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
1
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
2
2
 
3
3
  type TestCb = (
4
4
  result: { query: string },
@@ -6,7 +6,7 @@ type TestCb = (
6
6
  ) => void;
7
7
  // tslint:disable-next-line no-var-requires
8
8
  const test = require('./test') as (
9
- query: AbstractSqlQuery,
9
+ query: AnyTypeNodes,
10
10
  binds: any[][] | TestCb,
11
11
  cb?: TestCb,
12
12
  ) => void;
package/test/abstract-sql/comparisons.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
1
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
2
2
 
3
3
  type TestCb = (
4
4
  result: { query: string },
@@ -6,7 +6,7 @@ type TestCb = (
6
6
  ) => void;
7
7
  // tslint:disable-next-line no-var-requires
8
8
  const test = require('./test') as (
9
- query: AbstractSqlQuery,
9
+ query: AnyTypeNodes,
10
10
  binds: any[][] | TestCb,
11
11
  cb?: TestCb,
12
12
  ) => void;
package/test/abstract-sql/dates.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
1
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
2
2
 
3
3
  type TestCb = (
4
4
  result: { query: string },
@@ -6,7 +6,7 @@ type TestCb = (
6
6
  ) => void;
7
7
  // tslint:disable-next-line no-var-requires
8
8
  const test = require('./test') as (
9
- query: AbstractSqlQuery,
9
+ query: AnyTypeNodes,
10
10
  binds: any[][] | TestCb,
11
11
  cb?: TestCb,
12
12
  ) => void;
package/test/abstract-sql/duration.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
1
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
2
2
 
3
3
  type TestCb = (
4
4
  result: { query: string },
@@ -6,7 +6,7 @@ type TestCb = (
6
6
  ) => void;
7
7
  // tslint:disable-next-line no-var-requires
8
8
  const test = require('./test') as (
9
- query: AbstractSqlQuery,
9
+ query: AnyTypeNodes,
10
10
  binds: any[][] | TestCb,
11
11
  cb?: TestCb,
12
12
  ) => void;
package/test/abstract-sql/empty-query-optimisations.ts CHANGED
@@ -1,8 +1,5 @@
1
1
  import { stripIndent } from 'common-tags';
2
- import {
3
- AbstractSqlQuery,
4
- SelectQueryNode,
5
- } from '../../src/AbstractSQLCompiler';
2
+ import { AnyTypeNodes, SelectQueryNode } from '../../src/AbstractSQLCompiler';
6
3
 
7
4
  type TestCb = (
8
5
  result: { query: string },
@@ -10,7 +7,7 @@ type TestCb = (
10
7
  ) => void;
11
8
  // tslint:disable-next-line no-var-requires
12
9
  const test = require('./test') as (
13
- query: AbstractSqlQuery,
10
+ query: AnyTypeNodes,
14
11
  binds: any[][] | TestCb,
15
12
  cb?: TestCb,
16
13
  ) => void;
package/test/abstract-sql/functions_wrapper.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { stripIndent } from 'common-tags';
2
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
2
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
3
3
 
4
4
  type TestCb = (
5
5
  result: { query: string },
@@ -7,15 +7,11 @@ type TestCb = (
7
7
  ) => void;
8
8
  // tslint:disable-next-line no-var-requires
9
9
  const test = require('./test') as ((
10
- query: AbstractSqlQuery,
10
+ query: AnyTypeNodes,
11
11
  binds: any[][] | TestCb,
12
12
  cb?: TestCb,
13
13
  ) => void) & {
14
- mysql: (
15
- query: AbstractSqlQuery,
16
- binds: any[][] | TestCb,
17
- cb?: TestCb,
18
- ) => void;
14
+ mysql: (query: AnyTypeNodes, binds: any[][] | TestCb, cb?: TestCb) => void;
19
15
  };
20
16
 
21
17
  describe('Date trunc function on ReferencedField for milliseconds', () => {
package/test/abstract-sql/insert-query.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
1
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
2
2
 
3
3
  type TestCb = (
4
4
  result: { query: string },
@@ -6,7 +6,7 @@ type TestCb = (
6
6
  ) => void;
7
7
  // tslint:disable-next-line no-var-requires
8
8
  const test = require('./test') as (
9
- query: AbstractSqlQuery,
9
+ query: AnyTypeNodes,
10
10
  binds: any[][] | TestCb,
11
11
  cb?: TestCb,
12
12
  ) => void;
package/test/abstract-sql/is-distinct.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
1
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
2
2
 
3
3
  type TestCb = (
4
4
  result: { query: string },
@@ -6,7 +6,7 @@ type TestCb = (
6
6
  ) => void;
7
7
  // tslint:disable-next-line no-var-requires
8
8
  const test = require('./test') as (
9
- query: AbstractSqlQuery,
9
+ query: AnyTypeNodes,
10
10
  binds: any[][] | TestCb,
11
11
  cb?: TestCb,
12
12
  ) => void;
package/test/abstract-sql/joins.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { stripIndent } from 'common-tags';
2
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
2
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
3
3
 
4
4
  type TestCb = (
5
5
  result: { query: string },
@@ -7,12 +7,15 @@ type TestCb = (
7
7
  ) => void;
8
8
  // tslint:disable-next-line no-var-requires
9
9
  const test = require('./test') as (
10
- query: AbstractSqlQuery,
10
+ query: AnyTypeNodes,
11
11
  binds: any[][] | TestCb,
12
12
  cb?: TestCb,
13
13
  ) => void;
14
14
 
15
- const joinTest = (joinType: string, sqlJoinType: string) => {
15
+ const joinTest = (
16
+ joinType: 'Join' | 'RightJoin' | 'LeftJoin' | 'FullJoin',
17
+ sqlJoinType: string,
18
+ ) => {
16
19
  describe(joinType, () => {
17
20
  test(
18
21
  [
package/test/abstract-sql/json.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
1
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
2
2
 
3
3
  type TestCb = (
4
4
  result: { query: string },
@@ -6,7 +6,7 @@ type TestCb = (
6
6
  ) => void;
7
7
  // tslint:disable-next-line no-var-requires
8
8
  const test = require('./test') as (
9
- query: AbstractSqlQuery,
9
+ query: AnyTypeNodes,
10
10
  binds: any[][] | TestCb,
11
11
  cb?: TestCb,
12
12
  ) => void;
package/test/abstract-sql/math.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
1
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
2
2
 
3
3
  type TestCb = (
4
4
  result: { query: string },
@@ -6,7 +6,7 @@ type TestCb = (
6
6
  ) => void;
7
7
  // tslint:disable-next-line no-var-requires
8
8
  const test = require('./test') as (
9
- query: AbstractSqlQuery,
9
+ query: AnyTypeNodes,
10
10
  binds: any[][] | TestCb,
11
11
  cb?: TestCb,
12
12
  ) => void;
package/test/abstract-sql/nested-in-optimisations.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { stripIndent } from 'common-tags';
2
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
2
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
3
3
 
4
4
  type TestCb = (
5
5
  result: { query: string },
@@ -7,7 +7,7 @@ type TestCb = (
7
7
  ) => void;
8
8
  // tslint:disable-next-line no-var-requires
9
9
  const test = require('./test') as (
10
- query: AbstractSqlQuery,
10
+ query: AnyTypeNodes,
11
11
  binds: any[][] | TestCb,
12
12
  cb?: TestCb,
13
13
  ) => void;
package/test/abstract-sql/not-not-optimisations.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { stripIndent } from 'common-tags';
2
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
2
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
3
3
 
4
4
  type TestCb = (
5
5
  result: { query: string },
@@ -7,7 +7,7 @@ type TestCb = (
7
7
  ) => void;
8
8
  // tslint:disable-next-line no-var-requires
9
9
  const test = require('./test') as (
10
- query: AbstractSqlQuery,
10
+ query: AnyTypeNodes,
11
11
  binds: any[][] | TestCb,
12
12
  cb?: TestCb,
13
13
  ) => void;
package/test/abstract-sql/text.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AbstractSqlQuery } from '../../src/AbstractSQLCompiler';
1
+ import { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
2
2
 
3
3
  type TestCb = (
4
4
  result: { query: string },
@@ -6,7 +6,7 @@ type TestCb = (
6
6
  ) => void;
7
7
  // tslint:disable-next-line no-var-requires
8
8
  const test = require('./test') as (
9
- query: AbstractSqlQuery,
9
+ query: AnyTypeNodes,
10
10
  binds: any[][] | TestCb,
11
11
  cb?: TestCb,
12
12
  ) => void;