@balena/abstract-sql-compiler 10.6.3-build-tests-update-66ee93652310d4add5b0c8c09843dc052d796f5e-1 → 11.0.0-build-11-x-9f16483079cd561a9fdaa741cd830c2c5eb2065a-1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.versionbot/CHANGELOG.yml +57 -2
- package/CHANGELOG.md +8 -2
- package/out/AbstractSQLCompiler.d.ts +15 -16
- package/out/AbstractSQLCompiler.js +50 -62
- package/out/AbstractSQLCompiler.js.map +1 -1
- package/out/AbstractSQLOptimiser.d.ts +1 -1
- package/out/AbstractSQLOptimiser.js +9 -54
- package/out/AbstractSQLOptimiser.js.map +1 -1
- package/out/AbstractSQLRules2SQL.d.ts +2 -2
- package/out/AbstractSQLRules2SQL.js +206 -224
- package/out/AbstractSQLRules2SQL.js.map +1 -1
- package/out/AbstractSQLSchemaOptimiser.d.ts +5 -3
- package/out/AbstractSQLSchemaOptimiser.js +14 -21
- package/out/AbstractSQLSchemaOptimiser.js.map +1 -1
- package/out/referenced-fields.d.ts +1 -1
- package/out/referenced-fields.js +17 -24
- package/out/referenced-fields.js.map +1 -1
- package/package.json +4 -4
- package/src/AbstractSQLCompiler.ts +28 -30
- package/src/AbstractSQLOptimiser.ts +11 -27
- package/src/AbstractSQLRules2SQL.ts +4 -3
- package/src/AbstractSQLSchemaOptimiser.ts +7 -6
- package/src/referenced-fields.ts +4 -4
- package/test/abstract-sql/aggregate-json.ts +1 -1
- package/test/abstract-sql/aggregate.ts +25 -10
- package/test/abstract-sql/and-or-boolean-optimisations.ts +1 -1
- package/test/abstract-sql/case-when-else.ts +5 -2
- package/test/abstract-sql/cast.ts +1 -1
- package/test/abstract-sql/coalesce.ts +1 -1
- package/test/abstract-sql/comparisons.ts +1 -1
- package/test/abstract-sql/dates.ts +10 -4
- package/test/abstract-sql/duration.ts +1 -1
- package/test/abstract-sql/empty-query-optimisations.ts +2 -2
- package/test/abstract-sql/functions_wrapper.ts +1 -1
- package/test/abstract-sql/get-referenced-fields.ts +1 -1
- package/test/abstract-sql/get-rule-referenced-fields.ts +1 -1
- package/test/abstract-sql/insert-query.ts +1 -1
- package/test/abstract-sql/is-distinct.ts +1 -1
- package/test/abstract-sql/joins.ts +1 -1
- package/test/abstract-sql/json.ts +1 -1
- package/test/abstract-sql/math.ts +1 -1
- package/test/abstract-sql/nested-in-optimisations.ts +1 -1
- package/test/abstract-sql/not-not-optimisations.ts +1 -1
- package/test/abstract-sql/schema-checks.ts +1 -1
- package/test/abstract-sql/schema-informative-reference.ts +1 -1
- package/test/abstract-sql/schema-rule-optimization.ts +1 -1
- package/test/abstract-sql/schema-rule-to-check.ts +1 -1
- package/test/abstract-sql/schema-views.ts +37 -2
- package/test/abstract-sql/test.ts +1 -1
- package/test/abstract-sql/text.ts +1 -1
- package/test/odata/expand.ts +3 -3
- package/test/odata/filterby.ts +8 -4
- package/test/odata/orderby.ts +2 -2
- package/test/odata/paging.ts +2 -2
- package/test/odata/resource_parsing.ts +5 -5
- package/test/odata/select.ts +2 -2
- package/test/odata/stress.ts +2 -2
- package/test/odata/test.ts +24 -20
- package/test/sbvr/pilots.ts +3 -3
- package/test/sbvr/reference-type.ts +3 -3
- package/test/sbvr/test.ts +12 -10
@@ -1,4 +1,59 @@
|
|
1
1
|
- commits:
|
2
|
+
- subject: Remove support for deprecated `['Bind', string, string]` bind node format
|
3
|
+
hash: 9f16483079cd561a9fdaa741cd830c2c5eb2065a
|
4
|
+
body: |
|
5
|
+
Use `['Bind', [string, string]]` instead
|
6
|
+
footer:
|
7
|
+
Change-type: major
|
8
|
+
change-type: major
|
9
|
+
author: Pagan Gazzard
|
10
|
+
nested: []
|
11
|
+
- subject: Remove deprecated `AliasableFromTypeNodes` type, use `FromTypeNodes`
|
12
|
+
instead
|
13
|
+
hash: 1d3108b17cdc662641904c72357157a40ae0cbcb
|
14
|
+
body: ""
|
15
|
+
footer:
|
16
|
+
Change-type: major
|
17
|
+
change-type: major
|
18
|
+
author: Pagan Gazzard
|
19
|
+
nested: []
|
20
|
+
- subject: Use an options object for `optimizeSchema` rather than flags
|
21
|
+
hash: b78df1afd0c566de81efff212629a53dd6bb4219
|
22
|
+
body: ""
|
23
|
+
footer:
|
24
|
+
Change-type: major
|
25
|
+
change-type: major
|
26
|
+
author: Pagan Gazzard
|
27
|
+
nested: []
|
28
|
+
- subject: Convert to ESM
|
29
|
+
hash: 195c2b8d5d4a39ba893113489620ccfa3f0a6afc
|
30
|
+
body: ""
|
31
|
+
footer:
|
32
|
+
Change-type: major
|
33
|
+
change-type: major
|
34
|
+
author: Pagan Gazzard
|
35
|
+
nested: []
|
36
|
+
- subject: Remove support for legacy `Now` nodes in favor of `CurrentTimestamp`
|
37
|
+
hash: 56e66dd939a87649c5d68787366562934daf65fc
|
38
|
+
body: ""
|
39
|
+
footer:
|
40
|
+
Change-type: major
|
41
|
+
change-type: major
|
42
|
+
author: Pagan Gazzard
|
43
|
+
nested: []
|
44
|
+
- subject: Switch to a separate `viewDefinition` property for creating views
|
45
|
+
hash: 0bf2e7ac0bcc3e733e3f712b51f71772666b0853
|
46
|
+
body: |
|
47
|
+
This removes the inference of whether to create a view from based on
|
48
|
+
inspecting the definition and instead makes it a conscious choice to
|
49
|
+
avoid converting a definition to a view in cases where that may not
|
50
|
+
make sense, eg if using a definition over a materialized table in order
|
51
|
+
to have a dynamic view over that table
|
52
|
+
footer:
|
53
|
+
Change-type: major
|
54
|
+
change-type: major
|
55
|
+
author: Pagan Gazzard
|
56
|
+
nested: []
|
2
57
|
- subject: "Tests: Update @balena/odata-to-abstract-sql to 8.0.1"
|
3
58
|
hash: 66ee93652310d4add5b0c8c09843dc052d796f5e
|
4
59
|
body: ""
|
@@ -7,9 +62,9 @@
|
|
7
62
|
change-type: patch
|
8
63
|
author: Pagan Gazzard
|
9
64
|
nested: []
|
10
|
-
version:
|
65
|
+
version: 11.0.0
|
11
66
|
title: ""
|
12
|
-
date: 2025-07-16T13:
|
67
|
+
date: 2025-07-16T13:04:20.024Z
|
13
68
|
- commits:
|
14
69
|
- subject: Include comments in generated output to preserve jsdoc info
|
15
70
|
hash: 7045c5bd5244459330a7899ad0fbb974a429ca14
|
package/CHANGELOG.md
CHANGED
@@ -4,8 +4,14 @@ 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
|
-
|
7
|
+
## 11.0.0 - 2025-07-16
|
8
|
+
|
9
|
+
* Remove support for deprecated `['Bind', string, string]` bind node format [Pagan Gazzard]
|
10
|
+
* Remove deprecated `AliasableFromTypeNodes` type, use `FromTypeNodes` instead [Pagan Gazzard]
|
11
|
+
* Use an options object for `optimizeSchema` rather than flags [Pagan Gazzard]
|
12
|
+
* Convert to ESM [Pagan Gazzard]
|
13
|
+
* Remove support for legacy `Now` nodes in favor of `CurrentTimestamp` [Pagan Gazzard]
|
14
|
+
* Switch to a separate `viewDefinition` property for creating views [Pagan Gazzard]
|
9
15
|
* Tests: Update @balena/odata-to-abstract-sql to 8.0.1 [Pagan Gazzard]
|
10
16
|
|
11
17
|
## 10.6.2 - 2025-07-16
|
@@ -3,10 +3,10 @@ export declare const enum Engines {
|
|
3
3
|
mysql = "mysql",
|
4
4
|
websql = "websql"
|
5
5
|
}
|
6
|
-
import type { Binding, SqlResult } from './AbstractSQLRules2SQL';
|
7
|
-
export { Binding, SqlResult } from './AbstractSQLRules2SQL';
|
8
|
-
import { optimizeSchema } from './AbstractSQLSchemaOptimiser';
|
9
|
-
import type { ReferencedFields, RuleReferencedFields, ModifiedFields } from './referenced-fields';
|
6
|
+
import type { Binding, SqlResult } from './AbstractSQLRules2SQL.js';
|
7
|
+
export { Binding, SqlResult } from './AbstractSQLRules2SQL.js';
|
8
|
+
import { optimizeSchema } from './AbstractSQLSchemaOptimiser.js';
|
9
|
+
import type { ReferencedFields, RuleReferencedFields, ModifiedFields } from './referenced-fields.js';
|
10
10
|
export type { ReferencedFields, RuleReferencedFields, ModifiedFields };
|
11
11
|
export type NullNode = ['Null'];
|
12
12
|
export type DateNode = ['Date', Date | number | string];
|
@@ -138,11 +138,7 @@ export type AddDateDurationNode = [
|
|
138
138
|
export type WhenNode = ['When', BooleanTypeNodes, AnyTypeNodes];
|
139
139
|
export type ElseNode = ['Else', AnyTypeNodes];
|
140
140
|
export type CaseNode = ['Case', ...WhenNode[]] | ['Case', ...WhenNode[], ElseNode];
|
141
|
-
|
142
|
-
* @deprecated This gets converted to the `['Bind', [string, string]]` form during compilation
|
143
|
-
*/
|
144
|
-
type BackCompatBindNode = ['Bind', string, string];
|
145
|
-
export type BindNode = ['Bind', number | string] | ['Bind', [string, string]] | BackCompatBindNode;
|
141
|
+
export type BindNode = ['Bind', number | string] | ['Bind', [string, string]];
|
146
142
|
export type CastNode = ['Cast', AnyTypeNodes, string];
|
147
143
|
export type CoalesceNode = [
|
148
144
|
'Coalesce',
|
@@ -235,10 +231,6 @@ export interface FromTypeNode {
|
|
235
231
|
*/
|
236
232
|
export type ResourceNode = ['Resource', string];
|
237
233
|
export type FromTypeNodes = FromTypeNode[keyof FromTypeNode] | AliasNode<FromTypeNode[keyof FromTypeNode]>;
|
238
|
-
/**
|
239
|
-
* @deprecated `FromTypeNodes` already includes aliased versions
|
240
|
-
*/
|
241
|
-
export type AliasableFromTypeNodes = FromTypeNodes;
|
242
234
|
export type SelectNode = ['Select', AnyTypeNodes[]];
|
243
235
|
export type FromNode = ['From', FromTypeNodes];
|
244
236
|
export type InnerJoinNode = ['Join', FromTypeNodes, OnNode?];
|
@@ -318,6 +310,7 @@ export interface AbstractSqlTable {
|
|
318
310
|
primitive: false | string;
|
319
311
|
triggers?: Trigger[];
|
320
312
|
checks?: Check[];
|
313
|
+
viewDefinition?: Omit<Definition, 'binds'>;
|
321
314
|
definition?: Definition;
|
322
315
|
modifyFields?: AbstractSqlTable['fields'];
|
323
316
|
modifyName?: AbstractSqlTable['name'];
|
@@ -425,7 +418,9 @@ export declare function compileRule(abstractSQL: AbstractSqlQuery, engine: Engin
|
|
425
418
|
export declare function compileRule(abstractSQL: AbstractSqlQuery, engine: Engines, noBinds?: boolean): SqlResult | [SqlResult, SqlResult] | string;
|
426
419
|
export { optimizeSchema };
|
427
420
|
export declare const postgres: {
|
428
|
-
optimizeSchema: (abstractSqlModel: AbstractSqlModel, createCheckConstraints?:
|
421
|
+
optimizeSchema: (abstractSqlModel: AbstractSqlModel, { createCheckConstraints }?: {
|
422
|
+
createCheckConstraints?: boolean | undefined;
|
423
|
+
}) => AbstractSqlModel;
|
429
424
|
generateRuleSlug: (tableName: string, ruleBody: AbstractSqlType) => string;
|
430
425
|
compileSchema: (abstractSqlModel: AbstractSqlModel) => SqlModel;
|
431
426
|
compileRule: (abstractSQL: AbstractSqlQuery) => SqlResult | [SqlResult, SqlResult];
|
@@ -435,7 +430,9 @@ export declare const postgres: {
|
|
435
430
|
getModifiedFields: (abstractSqlQuery: AbstractSqlQuery) => undefined | ModifiedFields | Array<undefined | ModifiedFields>;
|
436
431
|
};
|
437
432
|
export declare const mysql: {
|
438
|
-
optimizeSchema: (abstractSqlModel: AbstractSqlModel, createCheckConstraints?:
|
433
|
+
optimizeSchema: (abstractSqlModel: AbstractSqlModel, { createCheckConstraints }?: {
|
434
|
+
createCheckConstraints?: boolean | undefined;
|
435
|
+
}) => AbstractSqlModel;
|
439
436
|
generateRuleSlug: (tableName: string, ruleBody: AbstractSqlType) => string;
|
440
437
|
compileSchema: (abstractSqlModel: AbstractSqlModel) => SqlModel;
|
441
438
|
compileRule: (abstractSQL: AbstractSqlQuery) => SqlResult | [SqlResult, SqlResult];
|
@@ -445,7 +442,9 @@ export declare const mysql: {
|
|
445
442
|
getModifiedFields: (abstractSqlQuery: AbstractSqlQuery) => undefined | ModifiedFields | Array<undefined | ModifiedFields>;
|
446
443
|
};
|
447
444
|
export declare const websql: {
|
448
|
-
optimizeSchema: (abstractSqlModel: AbstractSqlModel, createCheckConstraints?:
|
445
|
+
optimizeSchema: (abstractSqlModel: AbstractSqlModel, { createCheckConstraints }?: {
|
446
|
+
createCheckConstraints?: boolean | undefined;
|
447
|
+
}) => AbstractSqlModel;
|
449
448
|
generateRuleSlug: (tableName: string, ruleBody: AbstractSqlType) => string;
|
450
449
|
compileSchema: (abstractSqlModel: AbstractSqlModel) => SqlModel;
|
451
450
|
compileRule: (abstractSQL: AbstractSqlQuery) => SqlResult | [SqlResult, SqlResult];
|
@@ -1,28 +1,21 @@
|
|
1
|
-
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
-
};
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.websql = exports.mysql = exports.postgres = exports.optimizeSchema = exports.abstractSqlContainsNode = exports.isFieldTypeNode = exports.isWhereNode = exports.isSelectNode = exports.isSelectQueryNode = exports.isResourceNode = exports.isTableNode = exports.isFromNode = exports.isAliasNode = exports.Engines = void 0;
|
7
|
-
exports.compileRule = compileRule;
|
8
|
-
var Engines;
|
1
|
+
export var Engines;
|
9
2
|
(function (Engines) {
|
10
3
|
/* eslint-disable @typescript-eslint/no-shadow -- this is fine since we only assign plain string values to the enum items */
|
11
4
|
Engines["postgres"] = "postgres";
|
12
5
|
Engines["mysql"] = "mysql";
|
13
6
|
Engines["websql"] = "websql";
|
14
7
|
/* eslint-enable @typescript-eslint/no-shadow */
|
15
|
-
})(Engines || (
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
const
|
20
|
-
|
21
|
-
|
8
|
+
})(Engines || (Engines = {}));
|
9
|
+
import { AbstractSQLOptimiser } from './AbstractSQLOptimiser.js';
|
10
|
+
import { AbstractSQLRules2SQL } from './AbstractSQLRules2SQL.js';
|
11
|
+
import $sbvrTypes from '@balena/sbvr-types';
|
12
|
+
const { default: sbvrTypes } = $sbvrTypes;
|
13
|
+
import { optimizeSchema, generateRuleSlug, } from './AbstractSQLSchemaOptimiser.js';
|
14
|
+
import { getReferencedFields, getRuleReferencedFields, getModifiedFields, insertAffectedIdsBinds, } from './referenced-fields.js';
|
22
15
|
const validateTypes = (() => {
|
23
16
|
const result = {};
|
24
|
-
for (const key of Object.keys(
|
25
|
-
result[key] =
|
17
|
+
for (const key of Object.keys(sbvrTypes)) {
|
18
|
+
result[key] = sbvrTypes[key].validate;
|
26
19
|
}
|
27
20
|
return result;
|
28
21
|
})();
|
@@ -67,7 +60,7 @@ const dataTypeGen = (engine, { dataType, required, index, defaultValue, checks }
|
|
67
60
|
else if (index !== '') {
|
68
61
|
index = ' ' + index;
|
69
62
|
}
|
70
|
-
const dbType =
|
63
|
+
const dbType = sbvrTypes?.[dataType]?.types?.[engine];
|
71
64
|
if (dbType != null) {
|
72
65
|
if (typeof dbType === 'function') {
|
73
66
|
return dbType(requiredStr, index);
|
@@ -78,46 +71,39 @@ const dataTypeGen = (engine, { dataType, required, index, defaultValue, checks }
|
|
78
71
|
throw new Error(`Unknown data type '${dataType}' for engine: ${engine}`);
|
79
72
|
}
|
80
73
|
};
|
81
|
-
const isAliasNode = (n) => n[0] === 'Alias';
|
82
|
-
|
83
|
-
const
|
84
|
-
|
85
|
-
const
|
86
|
-
|
87
|
-
const
|
88
|
-
|
89
|
-
const isSelectQueryNode = (n) => n[0] === 'SelectQuery';
|
90
|
-
exports.isSelectQueryNode = isSelectQueryNode;
|
91
|
-
const isSelectNode = (n) => n[0] === 'Select';
|
92
|
-
exports.isSelectNode = isSelectNode;
|
93
|
-
const isWhereNode = (n) => n[0] === 'Where';
|
94
|
-
exports.isWhereNode = isWhereNode;
|
95
|
-
const isFieldTypeNode = (n) => n[0] === 'ReferencedField' || n[0] === 'Field';
|
96
|
-
exports.isFieldTypeNode = isFieldTypeNode;
|
74
|
+
export const isAliasNode = (n) => n[0] === 'Alias';
|
75
|
+
export const isFromNode = (n) => n[0] === 'From';
|
76
|
+
export const isTableNode = (n) => n[0] === 'Table';
|
77
|
+
export const isResourceNode = (n) => n[0] === 'Resource';
|
78
|
+
export const isSelectQueryNode = (n) => n[0] === 'SelectQuery';
|
79
|
+
export const isSelectNode = (n) => n[0] === 'Select';
|
80
|
+
export const isWhereNode = (n) => n[0] === 'Where';
|
81
|
+
export const isFieldTypeNode = (n) => n[0] === 'ReferencedField' || n[0] === 'Field';
|
97
82
|
/**
|
98
83
|
*
|
99
84
|
* @param n The abstract sql to check
|
100
85
|
* @param checkNodeTypeFn A function that checks if a given node is the correct type
|
101
86
|
*/
|
102
|
-
const abstractSqlContainsNode = (n, checkNodeTypeFn) => {
|
87
|
+
export const abstractSqlContainsNode = (n, checkNodeTypeFn) => {
|
103
88
|
if (checkNodeTypeFn(n)) {
|
104
89
|
return true;
|
105
90
|
}
|
106
91
|
for (const p of n) {
|
107
92
|
if (Array.isArray(p) &&
|
108
|
-
|
93
|
+
abstractSqlContainsNode(p, checkNodeTypeFn)) {
|
109
94
|
return true;
|
110
95
|
}
|
111
96
|
}
|
112
97
|
return false;
|
113
98
|
};
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
return (0, AbstractSQLRules2SQL_1.AbstractSQLRules2SQL)(abstractSQL, engine, noBinds);
|
99
|
+
export function compileRule(abstractSQL, engine, noBinds = false) {
|
100
|
+
abstractSQL = AbstractSQLOptimiser(abstractSQL, noBinds);
|
101
|
+
return AbstractSQLRules2SQL(abstractSQL, engine, noBinds);
|
118
102
|
}
|
119
103
|
const compileSchema = (abstractSqlModel, engine, ifNotExists) => {
|
120
|
-
abstractSqlModel =
|
104
|
+
abstractSqlModel = optimizeSchema(abstractSqlModel, {
|
105
|
+
createCheckConstraints: false,
|
106
|
+
});
|
121
107
|
let ifNotExistsStr = '';
|
122
108
|
let orReplaceStr = '';
|
123
109
|
if (ifNotExists) {
|
@@ -164,21 +150,22 @@ $$;`);
|
|
164
150
|
if (typeof table === 'string') {
|
165
151
|
return;
|
166
152
|
}
|
167
|
-
const { definition } = table;
|
168
|
-
if (definition != null) {
|
153
|
+
const { definition, viewDefinition } = table;
|
154
|
+
if (viewDefinition != null && definition != null) {
|
155
|
+
throw new Error('Cannot have both a definition and a viewDefinition');
|
156
|
+
}
|
157
|
+
if (definition != null || viewDefinition != null) {
|
169
158
|
if (table.fields.some(({ computed }) => computed != null)) {
|
170
159
|
throw new Error(`Using computed fields alongside a custom table definition is unsupported, found for table resourceName: '${table.resourceName}', name: '${table.name}'`);
|
171
160
|
}
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
}
|
176
|
-
let definitionAbstractSql = definition.abstractSql;
|
161
|
+
}
|
162
|
+
if (viewDefinition != null) {
|
163
|
+
let definitionAbstractSql = viewDefinition.abstractSql;
|
177
164
|
// If there are any resource nodes then it's a dynamic definition and cannot become a view
|
178
|
-
if (
|
179
|
-
|
165
|
+
if (abstractSqlContainsNode(definitionAbstractSql, isResourceNode)) {
|
166
|
+
throw new Error(`Cannot create a view from a dynamic viewDefinition, found for table resourceName: '${table.resourceName}', name: '${table.name}'`);
|
180
167
|
}
|
181
|
-
if (
|
168
|
+
if (isTableNode(definitionAbstractSql)) {
|
182
169
|
// If the definition is a table node we need to wrap it in a select query for the view creation
|
183
170
|
definitionAbstractSql = [
|
184
171
|
'SelectQuery',
|
@@ -384,18 +371,18 @@ CREATE TABLE ${ifNotExistsStr}"${table.name}" (
|
|
384
371
|
if (typeof ruleSE !== 'string') {
|
385
372
|
throw new Error('Invalid structured English');
|
386
373
|
}
|
387
|
-
|
374
|
+
insertAffectedIdsBinds(ruleBody, abstractSqlModel.lfInfo.rules[ruleSE]);
|
388
375
|
const { query: ruleSQL, bindings: ruleBindings } = compileRule(ruleBody, engine);
|
389
376
|
let referencedFields;
|
390
377
|
try {
|
391
|
-
referencedFields =
|
378
|
+
referencedFields = getReferencedFields(ruleBody);
|
392
379
|
}
|
393
380
|
catch (e) {
|
394
381
|
console.warn('Error fetching referenced fields', e);
|
395
382
|
}
|
396
383
|
let ruleReferencedFields;
|
397
384
|
try {
|
398
|
-
ruleReferencedFields =
|
385
|
+
ruleReferencedFields = getRuleReferencedFields(ruleBody);
|
399
386
|
}
|
400
387
|
catch (e) {
|
401
388
|
console.warn('Error fetching rule referenced fields', e);
|
@@ -419,17 +406,18 @@ CREATE TABLE ${ifNotExistsStr}"${table.name}" (
|
|
419
406
|
};
|
420
407
|
const generateExport = (engine, ifNotExists) => {
|
421
408
|
return {
|
422
|
-
optimizeSchema
|
423
|
-
generateRuleSlug
|
409
|
+
optimizeSchema,
|
410
|
+
generateRuleSlug,
|
424
411
|
compileSchema: (abstractSqlModel) => compileSchema(abstractSqlModel, engine, ifNotExists),
|
425
412
|
compileRule: (abstractSQL) => compileRule(abstractSQL, engine, false),
|
426
413
|
dataTypeValidate,
|
427
|
-
getReferencedFields
|
428
|
-
getRuleReferencedFields
|
429
|
-
getModifiedFields
|
414
|
+
getReferencedFields,
|
415
|
+
getRuleReferencedFields,
|
416
|
+
getModifiedFields,
|
430
417
|
};
|
431
418
|
};
|
432
|
-
|
433
|
-
|
434
|
-
|
419
|
+
export { optimizeSchema };
|
420
|
+
export const postgres = generateExport("postgres" /* Engines.postgres */, true);
|
421
|
+
export const mysql = generateExport("mysql" /* Engines.mysql */, true);
|
422
|
+
export const websql = generateExport("websql" /* Engines.websql */, false);
|
435
423
|
//# sourceMappingURL=AbstractSQLCompiler.js.map
|
@@ -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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"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
import type { AbstractSqlQuery } from './AbstractSQLCompiler';
|
1
|
+
import type { AbstractSqlQuery } from './AbstractSQLCompiler.js';
|
2
2
|
export declare const AbstractSQLOptimiser: (abstractSQL: AbstractSqlQuery, $noBinds?: boolean) => AbstractSqlQuery;
|
@@ -1,41 +1,5 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
if (k2 === undefined) k2 = k;
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
-
}
|
8
|
-
Object.defineProperty(o, k2, desc);
|
9
|
-
}) : (function(o, m, k, k2) {
|
10
|
-
if (k2 === undefined) k2 = k;
|
11
|
-
o[k2] = m[k];
|
12
|
-
}));
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
-
}) : function(o, v) {
|
16
|
-
o["default"] = v;
|
17
|
-
});
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
19
|
-
var ownKeys = function(o) {
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
-
var ar = [];
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
-
return ar;
|
24
|
-
};
|
25
|
-
return ownKeys(o);
|
26
|
-
};
|
27
|
-
return function (mod) {
|
28
|
-
if (mod && mod.__esModule) return mod;
|
29
|
-
var result = {};
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
-
__setModuleDefault(result, mod);
|
32
|
-
return result;
|
33
|
-
};
|
34
|
-
})();
|
35
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
36
|
-
exports.AbstractSQLOptimiser = void 0;
|
37
|
-
const AbstractSQLCompiler_1 = require("./AbstractSQLCompiler");
|
38
|
-
const AbstractSQLRules2SQL = __importStar(require("./AbstractSQLRules2SQL"));
|
1
|
+
import { isFieldTypeNode } from './AbstractSQLCompiler.js';
|
2
|
+
import * as AbstractSQLRules2SQL from './AbstractSQLRules2SQL.js';
|
39
3
|
const { isAbstractSqlQuery, getAbstractSqlQuery, checkArgs, checkMinArgs, isNotNullable, } = AbstractSQLRules2SQL;
|
40
4
|
const identity = (x) => x;
|
41
5
|
let helped = false;
|
@@ -156,9 +120,7 @@ const isBooleanValue = (type) => {
|
|
156
120
|
AbstractSQLRules2SQL.isBooleanValue(type));
|
157
121
|
};
|
158
122
|
const BooleanValue = MatchValue(isBooleanValue);
|
159
|
-
const isDateValue =
|
160
|
-
return type === 'Now' || AbstractSQLRules2SQL.isDateValue(type);
|
161
|
-
};
|
123
|
+
const { isDateValue } = AbstractSQLRules2SQL;
|
162
124
|
const DateValue = MatchValue(isDateValue);
|
163
125
|
const { isJSONValue } = AbstractSQLRules2SQL;
|
164
126
|
const JSONValue = MatchValue(isJSONValue);
|
@@ -167,7 +129,7 @@ const DurationValue = MatchValue(isDurationValue);
|
|
167
129
|
const { isArrayValue } = AbstractSQLRules2SQL;
|
168
130
|
const ArrayValue = MatchValue(isArrayValue);
|
169
131
|
const Field = (args) => {
|
170
|
-
if (
|
132
|
+
if (isFieldTypeNode(args)) {
|
171
133
|
const [type, ...rest] = args;
|
172
134
|
return typeRules[type](rest);
|
173
135
|
}
|
@@ -183,10 +145,10 @@ const FieldOp = (type) => ((args) => {
|
|
183
145
|
AnyNotNullValue(args[1]) === false) {
|
184
146
|
return false;
|
185
147
|
}
|
186
|
-
if (
|
148
|
+
if (isFieldTypeNode(args[0])) {
|
187
149
|
return [type, args[0], args[1]];
|
188
150
|
}
|
189
|
-
else if (
|
151
|
+
else if (isFieldTypeNode(args[1])) {
|
190
152
|
return [type, args[1], args[0]];
|
191
153
|
}
|
192
154
|
else {
|
@@ -888,18 +850,13 @@ const typeRules = {
|
|
888
850
|
}),
|
889
851
|
];
|
890
852
|
}),
|
891
|
-
Bind:
|
892
|
-
if (args.length !== 2) {
|
893
|
-
return false;
|
894
|
-
}
|
895
|
-
return ['Bind', args];
|
896
|
-
}), (args) => {
|
853
|
+
Bind: (args) => {
|
897
854
|
if (noBinds) {
|
898
855
|
throw new SyntaxError('Cannot use a bind whilst they are disabled');
|
899
856
|
}
|
900
857
|
checkArgs('Bind', args, 1);
|
901
858
|
return ['Bind', ...args];
|
902
|
-
}
|
859
|
+
},
|
903
860
|
Text,
|
904
861
|
Value: Text,
|
905
862
|
Date: matchArgs('Date', identity),
|
@@ -1155,7 +1112,6 @@ const typeRules = {
|
|
1155
1112
|
},
|
1156
1113
|
EscapeForLike: matchArgs('EscapeForLike', TextValue),
|
1157
1114
|
// Virtual functions
|
1158
|
-
Now: rewriteMatch('Now', [], Helper(() => ['CurrentTimestamp'])),
|
1159
1115
|
Contains: rewriteMatch('Contains', [TextValue, TextValue], Helper(([haystack, needle]) => [
|
1160
1116
|
'Like',
|
1161
1117
|
haystack,
|
@@ -1194,7 +1150,7 @@ const typeRules = {
|
|
1194
1150
|
['Number', 1],
|
1195
1151
|
])),
|
1196
1152
|
};
|
1197
|
-
const AbstractSQLOptimiser = (abstractSQL, $noBinds = false) => {
|
1153
|
+
export const AbstractSQLOptimiser = (abstractSQL, $noBinds = false) => {
|
1198
1154
|
noBinds = $noBinds;
|
1199
1155
|
do {
|
1200
1156
|
helped = false;
|
@@ -1228,5 +1184,4 @@ const AbstractSQLOptimiser = (abstractSQL, $noBinds = false) => {
|
|
1228
1184
|
} while (helped);
|
1229
1185
|
return abstractSQL;
|
1230
1186
|
};
|
1231
|
-
exports.AbstractSQLOptimiser = AbstractSQLOptimiser;
|
1232
1187
|
//# sourceMappingURL=AbstractSQLOptimiser.js.map
|