@malloydata/malloy 0.0.248-dev250325235002 → 0.0.248-dev250326010711
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.
|
@@ -58,9 +58,6 @@ class ExprFilterExpression extends expression_def_1.ExpressionDef {
|
|
|
58
58
|
return this.loggedErrorExpr('filter-expression-error', `Filter parse error: ${err.message}`);
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
-
if (!fParse.parsed) {
|
|
62
|
-
return this.loggedErrorExpr('filter-expression-type', 'FJKLD:JDKSL: expression parsed to null');
|
|
63
|
-
}
|
|
64
61
|
const filterMatch = {
|
|
65
62
|
node: 'filterMatch',
|
|
66
63
|
dataType: matchExpr.type,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { BooleanFilter, FilterExpression, NumberFilter, StringFilter, TemporalFilter } from '@malloydata/malloy-filter';
|
|
2
2
|
import type { Dialect } from '../dialect';
|
|
3
3
|
export declare const FilterCompilers: {
|
|
4
|
-
compile(t: string, c: FilterExpression, x: string, d: Dialect): string;
|
|
4
|
+
compile(t: string, c: FilterExpression | null, x: string, d: Dialect): string;
|
|
5
5
|
numberCompile(nc: NumberFilter, x: string, d: Dialect): string;
|
|
6
6
|
booleanCompile(bc: BooleanFilter, x: string, _d: Dialect): string;
|
|
7
7
|
stringCompile(sc: StringFilter, x: string, d: Dialect): string;
|
|
@@ -37,6 +37,9 @@ function unlike(disLiked, x) {
|
|
|
37
37
|
*/
|
|
38
38
|
exports.FilterCompilers = {
|
|
39
39
|
compile(t, c, x, d) {
|
|
40
|
+
if (c === null) {
|
|
41
|
+
return 'true';
|
|
42
|
+
}
|
|
40
43
|
if (t === 'string' && (0, malloy_filter_1.isStringFilter)(c)) {
|
|
41
44
|
return exports.FilterCompilers.stringCompile(c, x, d);
|
|
42
45
|
}
|
|
@@ -889,7 +889,7 @@ class QueryField extends QueryNode {
|
|
|
889
889
|
expr.dataType === 'date' ||
|
|
890
890
|
expr.dataType === 'timestamp' ||
|
|
891
891
|
expr.dataType === 'boolean') {
|
|
892
|
-
if ((0, malloy_filter_1.isFilterExpression)(expr.filter)) {
|
|
892
|
+
if (expr.filter === null || (0, malloy_filter_1.isFilterExpression)(expr.filter)) {
|
|
893
893
|
return filter_compilers_1.FilterCompilers.compile(expr.dataType, expr.filter, expr.e.sql || '', this.parent.dialect);
|
|
894
894
|
}
|
|
895
895
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@malloydata/malloy",
|
|
3
|
-
"version": "0.0.248-
|
|
3
|
+
"version": "0.0.248-dev250326010711",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dist/index.js",
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
"generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@malloydata/malloy-filter": "^0.0.248-
|
|
45
|
-
"@malloydata/malloy-interfaces": "^0.0.248-
|
|
46
|
-
"@malloydata/malloy-tag": "^0.0.248-
|
|
44
|
+
"@malloydata/malloy-filter": "^0.0.248-dev250326010711",
|
|
45
|
+
"@malloydata/malloy-interfaces": "^0.0.248-dev250326010711",
|
|
46
|
+
"@malloydata/malloy-tag": "^0.0.248-dev250326010711",
|
|
47
47
|
"antlr4ts": "^0.5.0-alpha.4",
|
|
48
48
|
"assert": "^2.0.0",
|
|
49
49
|
"jest-diff": "^29.6.2",
|