@malloydata/malloy 0.0.179 → 0.0.180-dev240906180931

package/dist/model/malloy_query.js

@@ -795,13 +795,17 @@ class QueryField extends QueryNode {
             case '*':
             case '%':
             case '/':
-            case '=':
-            case '!=':
             case '>':
             case '<':
             case '>=':
             case '<=':
+            case '=':
                 return `${expr.kids.left.sql}${expr.node}${expr.kids.right.sql}`;
+            // Malloy inequality comparisons always return a boolean
+            case '!=': {
+                const notEqual = `${expr.kids.left.sql}!=${expr.kids.right.sql}`;
+                return `COALESCE(${notEqual},true)`;
+            }
             case 'and':
             case 'or':
                 return `${expr.kids.left.sql} ${expr.node} ${expr.kids.right.sql}`;
@@ -809,12 +813,16 @@ class QueryField extends QueryNode {
                 return `COALESCE(${expr.kids.left.sql},${expr.kids.right.sql})`;
             case 'like':
                 return `${expr.kids.left.sql} LIKE ${expr.kids.right.sql}`;
-            case '!like':
-                return `${expr.kids.left.sql} NOT LIKE ${expr.kids.right.sql}`;
+            // Malloy inequality comparisons always return a boolean
+            case '!like': {
+                const notLike = `${expr.kids.left.sql} NOT LIKE ${expr.kids.right.sql}`;
+                return `COALESCE(${notLike},true)`;
+            }
             case '()':
                 return `(${expr.e.sql})`;
             case 'not':
-                return `NOT ${expr.e.sql}`;
+                // Malloy not operator always returns a boolean
+                return `COALESCE(NOT ${expr.e.sql},TRUE)`;
             case 'unary-':
                 return `-${expr.e.sql}`;
             case 'is-null':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.179",
+  "version": "0.0.180-dev240906180931",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",

package/dist/lang/ast/expressions/utils.d.ts

@@ -1,3 +0,0 @@
-import { Expr } from '../../../model/malloy_types';
-import { EqualityMalloyOperator } from '../types/binary_operators';
-export declare function nullsafeNot(expr: Expr, op?: EqualityMalloyOperator): Expr;

package/dist/lang/ast/expressions/utils.js

@@ -1,39 +0,0 @@
-"use strict";
-/*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nullsafeNot = void 0;
-function nullsafeNot(expr, op) {
-    if (op === undefined || op === '!=' || op === '!~') {
-        return {
-            node: 'not',
-            e: {
-                node: 'coalesce',
-                kids: { left: expr, right: { node: 'false' } },
-            },
-        };
-    }
-    return expr;
-}
-exports.nullsafeNot = nullsafeNot;
-//# sourceMappingURL=utils.js.map