@malloydata/malloy 0.0.317 → 0.0.319

package/dist/model/filter_compilers.js

@@ -23,11 +23,8 @@ function invertCompare(no) {
     return '>';
 }
 function unlike(disLiked, x) {
-    const orNull = ` OR ${x} IS NULL`;
-    if (disLiked.length === 1) {
-        return `${disLiked[0]}${orNull}`;
-    }
-    return `(${disLiked.join(' AND ')})${orNull}`;
+    const unlikeSQL = disLiked.length === 1 ? disLiked[0] : `(${disLiked.join(' AND ')})`;
+    return `(${unlikeSQL} OR ${x} IS NULL)`;
 }
 /*
  * These compilers from filter expression to SQL actually belong in malloy-filters but
@@ -63,11 +60,11 @@ exports.FilterCompilers = {
                 const optList = nc.values.join(', ');
                 if (nc.values.length === 1) {
                     if (notEqual)
-                        return `${x} != ${optList} OR ${x} IS NULL`;
+                        return `(${x} != ${optList} OR ${x} IS NULL)`;
                     return `${x} = ${optList}`;
                 }
                 if (notEqual)
-                    return `${x} NOT IN (${optList}) OR ${x} IS NULL`;
+                    return `(${x} NOT IN (${optList}) OR ${x} IS NULL)`;
                 return `${x} IN (${optList})`;
             }
             case '>':
@@ -303,7 +300,7 @@ class TemporalFilterCompiler {
                 const m = this.moment(tc.in);
                 if (m.begin.sql === m.end) {
                     return tc.not
-                        ? `${x} != ${this.time(m.end)} OR ${x} IS NULL`
+                        ? `(${x} != ${this.time(m.end)} OR ${x} IS NULL)`
                         : `${x} = ${this.time(m.end)}`;
                 }
                 return this.isIn(tc.not, m.begin.sql, m.end);

package/dist/model/query_query.js

@@ -1044,7 +1044,8 @@ class QueryQuery extends query_node_1.QueryField {
                         }
                         else {
                             // its a complex
-                            limitComplexClauses[result.groupSet] = `CASE WHEN ${filterClause} THEN 1 ELSE 0 END`;
+                            limitComplexClauses[result.groupSet] =
+                                `CASE WHEN ${filterClause} THEN 1 ELSE 0 END`;
                         }
                     }
                 }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.317";
+export declare const MALLOY_VERSION = "0.0.319";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.317';
+exports.MALLOY_VERSION = '0.0.319';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.317",
+  "version": "0.0.319",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "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"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.317",
-    "@malloydata/malloy-interfaces": "0.0.317",
-    "@malloydata/malloy-tag": "0.0.317",
+    "@malloydata/malloy-filter": "0.0.319",
+    "@malloydata/malloy-interfaces": "0.0.319",
+    "@malloydata/malloy-tag": "0.0.319",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",