@balena/abstract-sql-compiler 10.2.3-build-renovate-major-22-node-d6c0f904df738bdfb51aa65395e2b146a26000e6-1 → 10.2.3-build-tests-0edb21cc4ee30ead2a6eeb290623f3a0adc7a0fe-1

package/test/abstract-sql/dates.ts

@@ -1,15 +1,4 @@
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('Year', () => {
 	test(
@@ -17,7 +6,7 @@ describe('Year', () => {
 		[['Date', '2022-10-10']],
 		(result, sqlEquals) => {
 			it('should produce a valid Year statement', () => {
-				sqlEquals(result.query, `SELECT EXTRACT('YEAR' FROM $1)`);
+				sqlEquals(result, `SELECT EXTRACT('YEAR' FROM $1)`);
 			});
 		},
 	);
@@ -29,7 +18,7 @@ describe('Month', () => {
 		[['Date', '2022-10-10']],
 		(result, sqlEquals) => {
 			it('should produce a valid Month statement', () => {
-				sqlEquals(result.query, `SELECT EXTRACT('MONTH' FROM $1)`);
+				sqlEquals(result, `SELECT EXTRACT('MONTH' FROM $1)`);
 			});
 		},
 	);
@@ -41,7 +30,7 @@ describe('Day', () => {
 		[['Date', '2022-10-10']],
 		(result, sqlEquals) => {
 			it('should produce a valid Day statement', () => {
-				sqlEquals(result.query, `SELECT EXTRACT('DAY' FROM $1)`);
+				sqlEquals(result, `SELECT EXTRACT('DAY' FROM $1)`);
 			});
 		},
 	);
@@ -56,7 +45,7 @@ describe('Hour', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid Hour statement', () => {
-				sqlEquals(result.query, `SELECT EXTRACT('HOUR' FROM $1)`);
+				sqlEquals(result, `SELECT EXTRACT('HOUR' FROM $1)`);
 			});
 		},
 	);
@@ -71,7 +60,7 @@ describe('Minute', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid Minute statement', () => {
-				sqlEquals(result.query, `SELECT EXTRACT('MINUTE' FROM $1)`);
+				sqlEquals(result, `SELECT EXTRACT('MINUTE' FROM $1)`);
 			});
 		},
 	);
@@ -86,7 +75,7 @@ describe('Second', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid extract second statement', () => {
-				sqlEquals(result.query, `SELECT FLOOR(EXTRACT('SECOND' FROM $1))`);
+				sqlEquals(result, `SELECT FLOOR(EXTRACT('SECOND' FROM $1))`);
 			});
 		},
 	);
@@ -102,7 +91,7 @@ describe('Fractionalseconds', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid extract Fractionalseconds statement', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`SELECT EXTRACT('SECOND' FROM $1) - FLOOR(EXTRACT('SECOND' FROM $1))`,
 				);
 			});
@@ -116,7 +105,7 @@ describe('ToDate', () => {
 		[['Date', '2022-10-10']],
 		(result, sqlEquals) => {
 			it('should produce a valid ToDate statement', () => {
-				sqlEquals(result.query, `SELECT DATE($1)`);
+				sqlEquals(result, `SELECT DATE($1)`);
 			});
 		},
 	);
@@ -134,7 +123,7 @@ describe('DateTrunc', () => {
 		[['Date', '2022-10-10']],
 		(result, sqlEquals) => {
 			it('should produce a valid DateTrunc statement', () => {
-				sqlEquals(result.query, `SELECT DATE_TRUNC('year', $1)`);
+				sqlEquals(result, `SELECT DATE_TRUNC('year', $1)`);
 			});
 		},
 	);
@@ -149,7 +138,7 @@ describe('ToTime', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid ToTime statement', () => {
-				sqlEquals(result.query, `SELECT CAST($1 AS TIME)`);
+				sqlEquals(result, `SELECT CAST($1 AS TIME)`);
 			});
 		},
 	);
@@ -178,7 +167,7 @@ describe('AddDateDuration', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid Date addition statement', () => {
-				sqlEquals(result.query, `SELECT $1 + INTERVAL '1 0:0:0.0'`);
+				sqlEquals(result, `SELECT $1 + INTERVAL '1 0:0:0.0'`);
 			});
 		},
 	);
@@ -215,7 +204,7 @@ describe('AddDateDuration', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid Date addition statement when the first operand returns a Date node', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`SELECT ($1 + INTERVAL '1 0:0:0.0') + INTERVAL '2 0:0:0.0'`,
 				);
 			});
@@ -241,7 +230,7 @@ describe('AddDateNumber', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid Date addition statement', () => {
-				sqlEquals(result.query, `SELECT $1 + 10`);
+				sqlEquals(result, `SELECT $1 + 10`);
 			});
 		},
 	);
@@ -263,7 +252,7 @@ describe('AddDateNumber', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid Date addition statement when the second operand is a math operation', () => {
-				sqlEquals(result.query, `SELECT $1 + (4 - 5)`);
+				sqlEquals(result, `SELECT $1 + (4 - 5)`);
 			});
 		},
 	);
@@ -287,7 +276,7 @@ describe('SubtractDateNumber', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid Date subtraction statement', () => {
-				sqlEquals(result.query, `SELECT $1 - 10`);
+				sqlEquals(result, `SELECT $1 - 10`);
 			});
 		},
 	);
@@ -309,7 +298,7 @@ describe('SubtractDateNumber', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid Date subtraction statement when the second operand is a math operation', () => {
-				sqlEquals(result.query, `SELECT $1 - (4 - 5)`);
+				sqlEquals(result, `SELECT $1 - (4 - 5)`);
 			});
 		},
 	);
@@ -335,7 +324,7 @@ describe('SubtractDateNumber', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid Date subtraction statement when first operand returns a Date and the second operand is a math operation', () => {
-				sqlEquals(result.query, `SELECT ($1 + 1) - (4 - 5)`);
+				sqlEquals(result, `SELECT ($1 + 1) - (4 - 5)`);
 			});
 		},
 	);
@@ -352,10 +341,7 @@ describe('SubtractDateDate', () => {
 		],
 		(result, sqlEquals) => {
 			it('should produce a valid multiplication statement when the first operand is a SubtractDateDate operation and the second a number', () => {
-				sqlEquals(
-					result.query,
-					`SELECT (CURRENT_TIMESTAMP - CURRENT_TIMESTAMP) * 4`,
-				);
+				sqlEquals(result, `SELECT (CURRENT_TIMESTAMP - CURRENT_TIMESTAMP) * 4`);
 			});
 		},
 	);
@@ -377,7 +363,7 @@ describe('SubtractDateDate', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid multiplication statement when the first operand is a SubtractDateDate operation and the second a math subtraction', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`SELECT (CURRENT_TIMESTAMP - CURRENT_TIMESTAMP) * (4 - 5)`,
 				);
 			});
@@ -420,7 +406,7 @@ describe('SubtractDateDate', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid SubtractDateDate operation when the operands return a Date node', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`SELECT (CURRENT_TIMESTAMP + INTERVAL '1 0:0:0.0') - ($1 + INTERVAL '2 0:0:0.0')`,
 				);
 			});
@@ -451,7 +437,7 @@ describe('SubtractDateDuration', () => {
 		[['Date', '2022-10-10T10:10:10.000Z']],
 		(result, sqlEquals) => {
 			it('should produce a valid Date subtraction statement', () => {
-				sqlEquals(result.query, `SELECT $1 - INTERVAL '1 0:0:0.0'`);
+				sqlEquals(result, `SELECT $1 - INTERVAL '1 0:0:0.0'`);
 			});
 		},
 	);
@@ -488,7 +474,7 @@ describe('SubtractDateDuration', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid Date subtraction statement when the first operand returns a Date node', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`SELECT ($1 + INTERVAL '1 0:0:0.0') - INTERVAL '2 0:0:0.0'`,
 				);
 			});

package/test/abstract-sql/duration.ts

@@ -1,15 +1,4 @@
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('Totalseconds', () => {
 	test(
@@ -32,10 +21,7 @@ describe('Totalseconds', () => {
 		],
 		(result, sqlEquals) => {
 			it('should produce a valid Totalseconds statement', () => {
-				sqlEquals(
-					result.query,
-					`SELECT EXTRACT(EPOCH FROM INTERVAL '1 0:0:0.0')`,
-				);
+				sqlEquals(result, `SELECT EXTRACT(EPOCH FROM INTERVAL '1 0:0:0.0')`);
 			});
 		},
 	);
@@ -63,7 +49,7 @@ describe('Duration', () => {
 		],
 		(result, sqlEquals) => {
 			it('should produce a valid Duration statement', () => {
-				sqlEquals(result.query, `SELECT INTERVAL '1 2:3:4.0'`);
+				sqlEquals(result, `SELECT INTERVAL '1 2:3:4.0'`);
 			});
 		},
 	);

package/test/abstract-sql/empty-query-optimisations.ts

@@ -1,19 +1,7 @@
 import { stripIndent } from 'common-tags';
-import type {
-	AnyTypeNodes,
-	SelectQueryNode,
-} from '../../src/AbstractSQLCompiler';
+import type { SelectQueryNode } from '../../src/AbstractSQLCompiler';
 
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('Empty queries should be optimized', () => {
 	const emptyQuery: SelectQueryNode = [
@@ -32,7 +20,7 @@ describe('Empty queries should be optimized', () => {
 		(result, sqlEquals) => {
 			it('should simplify `EXISTS($emptyQuery)` to `false`', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1
 						FROM "table"
@@ -53,7 +41,7 @@ describe('Empty queries should be optimized', () => {
 		(result, sqlEquals) => {
 			it('should simplify `NOT EXISTS($emptyQuery)` to `true`', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1
 						FROM "table"

package/test/abstract-sql/functions_wrapper.ts

@@ -1,18 +1,5 @@
 import { stripIndent } from 'common-tags';
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as ((
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void) & {
-	mysql: (query: AnyTypeNodes, binds: any[][] | TestCb, cb?: TestCb) => void;
-};
+import test from './test';
 
 describe('Date trunc function on ReferencedField for milliseconds', () => {
 	test(
@@ -37,7 +24,7 @@ describe('Date trunc function on ReferencedField for milliseconds', () => {
 		(result, sqlEquals) => {
 			it('Generate a postgresql DATE_TRUNC query for referenced field with milliseconds resoluton and binding', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1
 						FROM "table"
@@ -70,7 +57,7 @@ describe('Date trunc function on ReferencedField for milliseconds', () => {
 		(result, sqlEquals) => {
 			it('Ignore DATE_TRUNC in mysql query for referenced field with milliseconds resoluton and binding', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT 1
 						FROM "table"

package/test/abstract-sql/insert-query.ts

@@ -1,15 +1,4 @@
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('Insert boolean value', () => {
 	test(
@@ -22,7 +11,7 @@ describe('Insert boolean value', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid insert boolean statement', () => {
 				sqlEquals(
-					result.query,
+					result,
 					`\
 INSERT INTO "test" ("foo")
 VALUES (TRUE)`,

package/test/abstract-sql/is-distinct.ts

@@ -1,15 +1,4 @@
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('IsDistinctFrom', () => {
 	test(
@@ -20,7 +9,7 @@ describe('IsDistinctFrom', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid is distinct from statement', () => {
 				sqlEquals(
-					result.query,
+					result,
 					'SELECT NOT(("a") IS NOT NULL AND ("b") IS NOT NULL AND ("a") = ("b") OR ("a") IS NULL AND ("b") IS NULL)',
 				);
 			});
@@ -33,7 +22,7 @@ describe('IsDistinctFrom', () => {
 		],
 		(result, sqlEquals) => {
 			it('should optimize down to a !=', () => {
-				sqlEquals(result.query, 'SELECT 1 != 2');
+				sqlEquals(result, 'SELECT 1 != 2');
 			});
 		},
 	);
@@ -45,10 +34,7 @@ describe('IsDistinctFrom', () => {
 		[['Text', '2']],
 		(result, sqlEquals) => {
 			it('should produce a valid is distinct from statement', () => {
-				sqlEquals(
-					result.query,
-					'SELECT NOT(("a") IS NOT NULL AND ("a") = ($1))',
-				);
+				sqlEquals(result, 'SELECT NOT(("a") IS NOT NULL AND ("a") = ($1))');
 			});
 		},
 	);
@@ -57,7 +43,7 @@ describe('IsDistinctFrom', () => {
 		['SelectQuery', ['Select', [['IsDistinctFrom', ['Field', 'a'], ['Null']]]]],
 		(result, sqlEquals) => {
 			it('should produce an is not null statement', () => {
-				sqlEquals(result.query, 'SELECT "a" IS NOT NULL');
+				sqlEquals(result, 'SELECT "a" IS NOT NULL');
 			});
 		},
 	);
@@ -72,7 +58,7 @@ describe('IsNotDistinctFrom', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid is not distinct from statement', () => {
 				sqlEquals(
-					result.query,
+					result,
 					'SELECT ("a") IS NOT NULL AND ("b") IS NOT NULL AND ("a") = ("b") OR ("a") IS NULL AND ("b") IS NULL',
 				);
 			});
@@ -85,7 +71,7 @@ describe('IsNotDistinctFrom', () => {
 		],
 		(result, sqlEquals) => {
 			it('should optimize down to an =', () => {
-				sqlEquals(result.query, 'SELECT 1 = 2');
+				sqlEquals(result, 'SELECT 1 = 2');
 			});
 		},
 	);
@@ -97,7 +83,7 @@ describe('IsNotDistinctFrom', () => {
 		[['Text', '2']],
 		(result, sqlEquals) => {
 			it('should produce a valid is not distinct from statement', () => {
-				sqlEquals(result.query, 'SELECT ("a") IS NOT NULL AND ("a") = ($1)');
+				sqlEquals(result, 'SELECT ("a") IS NOT NULL AND ("a") = ($1)');
 			});
 		},
 	);
@@ -109,7 +95,7 @@ describe('IsNotDistinctFrom', () => {
 		],
 		(result, sqlEquals) => {
 			it('should produce a valid is not distinct from statement', () => {
-				sqlEquals(result.query, 'SELECT "a" IS NULL');
+				sqlEquals(result, 'SELECT "a" IS NULL');
 			});
 		},
 	);

package/test/abstract-sql/joins.ts

@@ -1,16 +1,5 @@
 import { stripIndent } from 'common-tags';
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 const joinTest = (
 	joinType: 'Join' | 'RightJoin' | 'LeftJoin' | 'FullJoin',
@@ -44,7 +33,7 @@ const joinTest = (
 			(result, sqlEquals) => {
 				it('should produce a valid join statement', () => {
 					sqlEquals(
-						result.query,
+						result,
 						stripIndent`
 							SELECT "table"."field1", "table2"."field2"
 							FROM "table"
@@ -82,7 +71,7 @@ describe('CrossJoin', () => {
 		(result, sqlEquals) => {
 			it('should produce a valid join statement', () => {
 				sqlEquals(
-					result.query,
+					result,
 					stripIndent`
 						SELECT "table"."field1", "table2"."field2"
 						FROM "table"

package/test/abstract-sql/json.ts

@@ -1,15 +1,4 @@
-import type { AnyTypeNodes } from '../../src/AbstractSQLCompiler';
-
-type TestCb = (
-	result: { query: string },
-	sqlEquals: (a: string, b: string) => void,
-) => void;
-import $test from './test';
-const test = $test as (
-	query: AnyTypeNodes,
-	binds: any[][] | TestCb,
-	cb?: TestCb,
-) => void;
+import test from './test';
 
 describe('ExtractJSONPathAsText', () => {
 	test(
@@ -28,10 +17,7 @@ describe('ExtractJSONPathAsText', () => {
 		],
 		(result, sqlEquals) => {
 			it('should produce a valid select with given empty text array', () => {
-				sqlEquals(
-					result.query,
-					`SELECT "foo"."bar" #>> CAST(ARRAY[] as TEXT[])`,
-				);
+				sqlEquals(result, `SELECT "foo"."bar" #>> CAST(ARRAY[] as TEXT[])`);
 			});
 		},
 	);
@@ -51,7 +37,7 @@ describe('ExtractJSONPathAsText', () => {
 		],
 		(result, sqlEquals) => {
 			it('should produce a valid select with given populated text array', () => {
-				sqlEquals(result.query, `SELECT "foo"."bar" #>> ARRAY['buz', 'baz']`);
+				sqlEquals(result, `SELECT "foo"."bar" #>> ARRAY['buz', 'baz']`);
 			});
 		},
 	);
@@ -65,7 +51,7 @@ describe('ToJSON', () => {
 		],
 		(result, sqlEquals) => {
 			it('should produce a valid to_json select statement', () => {
-				sqlEquals(result.query, 'SELECT TO_JSON("foo"."bar")');
+				sqlEquals(result, 'SELECT TO_JSON("foo"."bar")');
 			});
 		},
 	);