@malloydata/malloy 0.0.434 → 0.0.436

package/dist/lang/parse-tree-walkers/find-external-references.js

@@ -32,18 +32,18 @@ class FindExternalReferences {
     constructor(trans, tokens) {
         this.trans = trans;
         this.tokens = tokens;
-        this.needTables = {};
-        this.needImports = {};
-        this.needConnectionDialects = {};
+        this.needTables = new Map();
+        this.needImports = new Map();
+        this.needConnectionDialects = new Map();
     }
     registerTableReference(connectionName, tablePath, reference) {
         const key = constructTableKey(connectionName, tablePath);
-        if (!this.needTables[key]) {
-            this.needTables[key] = {
+        if (!this.needTables.has(key)) {
+            this.needTables.set(key, {
                 connectionName,
                 tablePath,
                 firstReference: reference,
-            };
+            });
         }
     }
     enterExploreTable(pcx) {
@@ -53,22 +53,23 @@ class FindExternalReferences {
         this.registerTableReference(connId, tablePath, reference);
         // Register a need for the connection's dialect so the validator in
         // ImportsAndTablesStep can run against it.
-        if (!this.needConnectionDialects[connId]) {
-            this.needConnectionDialects[connId] = { firstReference: reference };
+        this.registerConnection(connId, reference);
+    }
+    registerConnection(connId, reference) {
+        if (connId && !this.needConnectionDialects.has(connId)) {
+            this.needConnectionDialects.set(connId, { firstReference: reference });
         }
     }
+    enterSqlSource(pcx) {
+        this.registerConnection((0, parse_utils_1.getId)(pcx.connectionId()), this.trans.rangeFromContext(pcx));
+    }
     enterVirtualSource(pcx) {
-        const connId = (0, parse_utils_1.getId)(pcx.connectionId());
-        if (connId && !this.needConnectionDialects[connId]) {
-            this.needConnectionDialects[connId] = {
-                firstReference: this.trans.rangeFromContext(pcx),
-            };
-        }
+        this.registerConnection((0, parse_utils_1.getId)(pcx.connectionId()), this.trans.rangeFromContext(pcx));
     }
     enterImportURL(pcx) {
         const url = getPlainString(pcx);
-        if (!this.needImports[url]) {
-            this.needImports[url] = this.trans.rangeFromContext(pcx);
+        if (!this.needImports.has(url)) {
+            this.needImports.set(url, this.trans.rangeFromContext(pcx));
         }
     }
 }

package/dist/lang/test/test-translator.d.ts

@@ -3,6 +3,7 @@ import { MalloyElement } from '../ast';
 import type { NameSpace } from '../ast/types/name-space';
 import type { ModelEntry } from '../ast/types/model-entry';
 import { MalloyChildTranslator, MalloyTranslator } from '../parse-malloy';
+import { Zone } from '../zone';
 import type { DataRequestResponse, SQLSourceRequest, TranslateResponse } from '../translate-response';
 import type { ExprValue } from '../ast/types/expr-value';
 import type { LogSeverity, MessageCode, MessageParameterType } from '../parse-log';
@@ -28,6 +29,7 @@ export declare const aTableDef: TableSourceDef;
 export declare const db2TableDef: TableSourceDef;
 export declare const bqTableDef: SourceDef;
 export declare const pgTableDef: SourceDef;
+export declare const mssqlTableDef: SourceDef;
 /**
  * A TestTranlator never actually talks to connection, instead uses
  * some mocked schema definitions.
@@ -66,10 +68,18 @@ export interface TestTranslatorOptions {
      */
     compilerFlags?: string[];
 }
+/**
+ * Every connection name a test mentions resolves to a dialect, as it would
+ * through a host's connection lookup: the five listed below to theirs, and
+ * any other name to `TEST_DIALECT`.
+ */
+declare class TestConnectionDialectZone extends Zone<string> {
+    reference(str: string, loc: DocumentLocation): void;
+}
 export declare class TestTranslator extends MalloyTranslator {
     readonly testSrc: string;
-    allDialectsEnabled: boolean;
     testRoot?: TestRoot;
+    connectionDialectZone: TestConnectionDialectZone;
     internalModel: ModelDef;
     constructor(testSrc: string, options?: TestTranslatorOptions);
     translate(): TranslateResponse;

package/dist/lang/test/test-translator.js

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.mockSchema = exports.pgTableDef = exports.bqTableDef = exports.db2TableDef = exports.aTableDef = exports.TEST_DIALECT = void 0;
+exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.mockSchema = exports.mssqlTableDef = exports.pgTableDef = exports.bqTableDef = exports.db2TableDef = exports.aTableDef = exports.TEST_DIALECT = void 0;
 exports.pretty = pretty;
 exports.humanify = humanify;
 exports.getExplore = getExplore;
@@ -29,6 +29,7 @@ const util_1 = require("util");
 const malloy_types_1 = require("../../model/malloy_types");
 const ast_1 = require("../ast");
 const parse_malloy_1 = require("../parse-malloy");
+const zone_1 = require("../zone");
 const static_space_1 = require("../ast/field-space/static-space");
 const global_name_space_1 = require("../ast/types/global-name-space");
 const sql_block_1 = require("../../model/sql_block");
@@ -193,6 +194,16 @@ exports.pgTableDef = {
     connection: '_pg_',
     fields: baseFields,
 };
+// SQL Server has no boolean values (booleanType 'none'), so no column of
+// its table is a boolean
+exports.mssqlTableDef = {
+    type: 'table',
+    name: 'aTable',
+    dialect: 'sqlserver',
+    tablePath: 'aTable',
+    connection: '_mssql_',
+    fields: baseFields.filter(f => f.name !== 'abool'),
+};
 /**
  * A TestTranlator never actually talks to connection, instead uses
  * some mocked schema definitions.
@@ -202,6 +213,7 @@ exports.mockSchema = [
     exports.db2TableDef,
     exports.bqTableDef,
     exports.pgTableDef,
+    exports.mssqlTableDef,
     {
         type: 'table',
         name: 'carriers',
@@ -336,14 +348,27 @@ class TestChildTranslator extends parse_malloy_1.MalloyChildTranslator {
 }
 exports.TestChildTranslator = TestChildTranslator;
 const testURI = 'internal://test/langtests/root.malloy';
+/**
+ * Every connection name a test mentions resolves to a dialect, as it would
+ * through a host's connection lookup: the five listed below to theirs, and
+ * any other name to `TEST_DIALECT`.
+ */
+class TestConnectionDialectZone extends zone_1.Zone {
+    reference(str, loc) {
+        super.reference(str, loc);
+        if (this.getEntry(str).status === 'reference') {
+            this.define(str, exports.TEST_DIALECT);
+        }
+    }
+}
 class TestTranslator extends parse_malloy_1.MalloyTranslator {
     constructor(testSrc, options = {}) {
         var _a, _b, _c, _d, _e;
         super(testURI, (_a = options.importBaseURL) !== null && _a !== void 0 ? _a : null, null, (_b = options.eventStream) !== null && _b !== void 0 ? _b : null, (_c = options.restrictedMode) !== null && _c !== void 0 ? _c : false, options.virtualMap);
         this.testSrc = testSrc;
-        this.allDialectsEnabled = true;
+        this.connectionDialectZone = new TestConnectionDialectZone();
         /*
-         * There are four connections:
+         * There are five connections:
          *   _db_  - duckdb dialect, with the following tables ...
          *      aTable, malloytest.carriers, malloytest.flights, malloytest.airports
          *   _db2_ - duckdb dialect, with one table, aTable. A second connection
@@ -352,6 +377,8 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
          *      aTable
          *   _pg_  - postgres dialect, with one table
          *      aTable
+         *   _mssql_ - sqlserver dialect, which has no boolean values, with one
+         *      table, aTable
          *
          * The "aTable" table is a mocked table with one column of each type.
          * The _bq_ version does not have the timestamptz column, and when
@@ -380,6 +407,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
                 _db2_: { type: 'connection', name: '_db2_' },
                 _bq_: { type: 'connection', name: '_bq_' },
                 _pg_: { type: 'connection', name: '_pg_' },
+                _mssql_: { type: 'connection', name: '_mssql_' },
                 a: { ...exports.aTableDef, primaryKey: 'astr', name: 'a' },
                 b: { ...exports.aTableDef, primaryKey: 'astr', name: 'b' },
                 bq_a: { ...exports.bqTableDef, primaryKey: 'astr', name: 'bq_a' },
@@ -437,6 +465,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         this.connectionDialectZone.define('_db2_', exports.TEST_DIALECT);
         this.connectionDialectZone.define('_bq_', 'standardsql');
         this.connectionDialectZone.define('_pg_', 'postgres');
+        this.connectionDialectZone.define('_mssql_', 'sqlserver');
         for (const flag of (_e = options.compilerFlags) !== null && _e !== void 0 ? _e : []) {
             this.compilerFlagSrc.push(`##! ${flag}\n`);
         }
@@ -644,10 +673,29 @@ function makeModelFunc(options) {
         const { prefix, wrap, ...ttOptions } = options;
         return {
             ...ms,
+            // A marked location is where the mark sits in the whole source, after
+            // the prefix. A wrap could put the code anywhere, so marks stay as
+            // they are.
+            locations: wrap ? ms.locations : ms.locations.map(l => after(prefix, l)),
             translator: new TestTranslator((prefix !== null && prefix !== void 0 ? prefix : '') + (wrap ? wrap(ms.code) : ms.code), ttOptions),
         };
     };
 }
+function after(prefix, l) {
+    if (!prefix)
+        return l;
+    const lines = prefix.split('\n');
+    const dLine = lines.length - 1;
+    const dChar = lines[dLine].length;
+    const shift = (p) => ({
+        line: p.line + dLine,
+        character: p.line === 0 ? p.character + dChar : p.character,
+    });
+    return {
+        ...l,
+        range: { start: shift(l.range.start), end: shift(l.range.end) },
+    };
+}
 function makeExprFunc(model, sourceName = 'ab', options = {}) {
     return function expr(unmarked, ...marked) {
         const ms = markSource(unmarked, ...marked);

package/dist/model/expression_compiler.js

@@ -109,7 +109,7 @@ function compileExpr(resultSet, context, expr, state = new utils_1.GenerateState
         return expr;
     }
     const sql = (() => {
-        var _a;
+        var _a, _b;
         switch (expr.node) {
             case 'field':
                 return generateFieldFragment(resultSet, context, expr, state);
@@ -176,7 +176,7 @@ function compileExpr(resultSet, context, expr, state = new utils_1.GenerateState
             // Malloy inequality comparisons always return a boolean
             case '!=': {
                 const notEqual = `${expr.kids.left.sql}!=${expr.kids.right.sql}`;
-                return `COALESCE(${notEqual},true)`;
+                return context.dialect.sqlNullIsTrue(notEqual);
             }
             case 'and':
             case 'or':
@@ -192,13 +192,13 @@ function compileExpr(resultSet, context, expr, state = new utils_1.GenerateState
                 // null binding collapses to empty-set semantics — not the SQL
                 // `IN (NULL)` shape, which has confusing NULL-membership rules.
                 if (bound.node === 'null') {
-                    return expr.not ? 'TRUE' : 'FALSE';
+                    return context.dialect.sqlBoolean(expr.not);
                 }
                 if (bound.node !== 'arrayLiteral') {
                     throw new Error(`Internal compiler error: 'inGiven' bound to '${bound.node}', expected 'arrayLiteral'. The translator should have rejected a non-array given here.`);
                 }
                 if (bound.kids.values.length === 0) {
-                    return expr.not ? 'TRUE' : 'FALSE';
+                    return context.dialect.sqlBoolean(expr.not);
                 }
                 const elemSqls = bound.kids.values.map(v => exprToSQL(resultSet, context, v, state));
                 const verb = expr.not ? 'NOT IN' : 'IN';
@@ -210,13 +210,14 @@ function compileExpr(resultSet, context, expr, state = new utils_1.GenerateState
                 const compare = expr.kids.right.node === 'stringLiteral'
                     ? context.dialect.sqlLike(likeIt, (_a = expr.kids.left.sql) !== null && _a !== void 0 ? _a : '', expr.kids.right.literal)
                     : `${expr.kids.left.sql} ${likeIt} ${expr.kids.right.sql}`;
-                return expr.node === 'like' ? compare : `COALESCE(${compare},true)`;
+                return expr.node === 'like'
+                    ? compare
+                    : context.dialect.sqlNullIsTrue(compare);
             }
             case '()':
                 return `(${expr.e.sql})`;
             case 'not':
-                // Malloy not operator always returns a boolean
-                return `COALESCE(NOT ${expr.e.sql},TRUE)`;
+                return context.dialect.sqlNot((_b = expr.e.sql) !== null && _b !== void 0 ? _b : '');
             case 'unary-':
                 return `-${expr.e.sql}`;
             case 'is-null':
@@ -225,7 +226,7 @@ function compileExpr(resultSet, context, expr, state = new utils_1.GenerateState
                 return `${expr.e.sql} IS NOT NULL`;
             case 'true':
             case 'false':
-                return expr.node;
+                return context.dialect.sqlBoolean(expr.node === 'true');
             case 'null':
                 return 'NULL';
             case 'case':

package/dist/model/filter_compilers.js

@@ -34,13 +34,13 @@ function unlike(disLiked, x) {
 // The `none` filter ("always false") compiles to a constant, independent of
 // column type or value; `not none` is "always true". Shared by the top-level
 // guard and every per-type compiler so the constant lives in one place.
-function noneToSQL(not) {
-    return not ? 'true' : 'false';
+function noneToSQL(not, d) {
+    return d.sqlBoolean(not === true);
 }
 exports.FilterCompilers = {
     compile(t, c, x, d, qi = {}) {
         if (c === null) {
-            return 'true';
+            return d.sqlBoolean(true);
         }
         // `none` is the always-false filter (companion to the empty/`null` filter,
         // which is always-true above). It compiles to a constant independent of
@@ -48,7 +48,7 @@ exports.FilterCompilers = {
         // also the primary path for boolean, whose compiler has no switch and
         // would otherwise route `none` through the null/false truth-table.
         if (c.operator === 'none') {
-            return noneToSQL(c.not);
+            return noneToSQL(c.not, d);
         }
         if (t === 'string' && (0, malloy_filter_1.isStringFilter)(c)) {
             return exports.FilterCompilers.stringCompile(c, x, d);
@@ -102,7 +102,7 @@ exports.FilterCompilers = {
             case 'null':
                 return nc.not ? `${x} IS NOT NULL` : `${x} IS NULL`;
             case 'none':
-                return noneToSQL(nc.not);
+                return noneToSQL(nc.not, d);
             case '()': {
                 const wrapped = '(' + exports.FilterCompilers.numberCompile(nc.expr, x, d) + ')';
                 return nc.not ? `NOT ${wrapped}` : wrapped;
@@ -135,7 +135,7 @@ exports.FilterCompilers = {
             // Normally intercepted by compile()'s top-level guard; handled here too so
             // booleanCompile is self-safe (this if-chain has no default, and `none`
             // must not fall through to the null/false truth-table below).
-            return noneToSQL(bc.not);
+            return noneToSQL(bc.not, d);
         }
         else if (bc.operator === '=true') {
             return bc.not ? `NOT ${px}` : x;
@@ -172,7 +172,7 @@ exports.FilterCompilers = {
             case 'null':
                 return sc.not ? `${x} IS NOT NULL` : `${x} IS NULL`;
             case 'none':
-                return noneToSQL(sc.not);
+                return noneToSQL(sc.not, d);
             case 'empty':
                 return sc.not ? `COALESCE(${x},'') != ''` : `COALESCE(${x},'') = ''`;
             case '=': {
@@ -267,7 +267,7 @@ exports.FilterCompilers = {
                     }
                 }
                 if ((includeEmpty && excludeEmpty) || (includeNull && excludeNull)) {
-                    return 'false';
+                    return d.sqlBoolean(false);
                 }
                 let includeSQL = '';
                 if (includes.length > 0 || includeNull || includeEmpty) {
@@ -298,7 +298,7 @@ exports.FilterCompilers = {
                         ? `(${includeSQL}) AND (${excludeSQL})`
                         : includeSQL;
                 }
-                return excludeSQL !== '' ? excludeSQL : 'true';
+                return excludeSQL !== '' ? excludeSQL : d.sqlBoolean(true);
             }
         }
     },
@@ -331,7 +331,7 @@ class TemporalFilterCompiler {
         if (this.timetype !== 'date') {
             return timeSQL;
         }
-        return this.d.sqlCast({}, {
+        const toDate = {
             node: 'cast',
             e: {
                 node: 'genericSQLExpr',
@@ -342,7 +342,8 @@ class TemporalFilterCompiler {
             srcType: { type: 'timestamp' },
             dstType: { type: 'date' },
             safe: false,
-        });
+        };
+        return this.d.sqlTimeCast(this.qi, toDate);
     }
     compile(tc) {
         const x = this.expr;
@@ -421,7 +422,7 @@ class TemporalFilterCompiler {
             case 'null':
                 return tc.not ? `${x} IS NOT NULL` : `${x} IS NULL`;
             case 'none':
-                return noneToSQL(tc.not);
+                return noneToSQL(tc.not, this.d);
             case '()': {
                 const wrapped = '(' + this.compile(tc.expr) + ')';
                 return tc.not ? `NOT ${wrapped}` : wrapped;

package/dist/model/given_binding.d.ts

@@ -27,3 +27,11 @@ export declare function resolveSuppliedGivens(supplied: Record<string, GivenValu
  * `resolveGiven`), which needs no ordering.
  */
 export declare function evaluateInlineGivens(bound: Map<GivenID, Expr>, modelDef: ModelDef | undefined): Map<GivenID, Expr>;
+/**
+ * Binds the givens a compile runs under: the supplied values, then each
+ * `inline` given's default folded against them. Queries and persistence builds
+ * both bind here, so the same values always compile to the same SQL and a
+ * persisted table's key is the key a query recomputes. Undefined when nothing
+ * binds, which the compiler reads as "no givens".
+ */
+export declare function bindGivens(supplied: Record<string, GivenValue> | undefined, modelDef: ModelDef | undefined): Map<GivenID, Expr> | undefined;

package/dist/model/given_binding.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.lookupGivenValue = lookupGivenValue;
 exports.resolveSuppliedGivens = resolveSuppliedGivens;
 exports.evaluateInlineGivens = evaluateInlineGivens;
+exports.bindGivens = bindGivens;
 const luxon_1 = require("luxon");
 const closest_match_1 = require("../util/closest_match");
 const inline_expr_1 = require("./inline_expr");
@@ -106,6 +107,18 @@ function evaluateInlineGivens(bound, modelDef) {
     }
     return bound;
 }
+/**
+ * Binds the givens a compile runs under: the supplied values, then each
+ * `inline` given's default folded against them. Queries and persistence builds
+ * both bind here, so the same values always compile to the same SQL and a
+ * persisted table's key is the key a query recomputes. Undefined when nothing
+ * binds, which the compiler reads as "no givens".
+ */
+function bindGivens(supplied, modelDef) {
+    const bound = resolveSuppliedGivens(supplied, modelDef);
+    evaluateInlineGivens(bound, modelDef);
+    return bound.size > 0 ? bound : undefined;
+}
 function valueToExpr(path, type, value) {
     var _a, _b;
     if (value === null) {

package/dist/model/index.d.ts

@@ -7,7 +7,7 @@ export { getResultStructDefForQuery, getResultStructDefForView, } from './query_
 export { indent, composeSQLExpr, makeDigest, mkModelDef, mkModelID, pathToKey, typeDefToString, } from './utils';
 export { getModelAnnotations } from './annotation_utils';
 export { constantExprToSQL } from './constant_expression_compiler';
-export { getCompiledSQL, buildIdOptions } from './sql_compiled';
+export { getCompiledSQL, buildIdOptions, givenUsageOfRelation, } from './sql_compiled';
 export type { BuildIdOptions } from './sql_compiled';
 export { MalloyCompileError } from './malloy_compile_error';
 export { mkSourceID, mkBuildID, mkQuerySourceDef, mkSQLSourceDef, mkTableSourceDef, resolveSourceID, resolveSourceRef, sourceNamespaceReference, registerSource, hasSourceRegistryEntry, } from './source_def_utils';

package/dist/model/index.js

@@ -18,7 +18,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasSourceRegistryEntry = exports.registerSource = exports.sourceNamespaceReference = exports.resolveSourceRef = exports.resolveSourceID = exports.mkTableSourceDef = exports.mkSQLSourceDef = exports.mkQuerySourceDef = exports.mkBuildID = exports.mkSourceID = exports.MalloyCompileError = exports.buildIdOptions = exports.getCompiledSQL = exports.constantExprToSQL = exports.getModelAnnotations = exports.typeDefToString = exports.pathToKey = exports.mkModelID = exports.mkModelDef = exports.makeDigest = exports.composeSQLExpr = exports.indent = exports.getResultStructDefForView = exports.getResultStructDefForQuery = exports.QueryModel = exports.QueryQuery = exports.QueryStruct = exports.QueryField = void 0;
+exports.hasSourceRegistryEntry = exports.registerSource = exports.sourceNamespaceReference = exports.resolveSourceRef = exports.resolveSourceID = exports.mkTableSourceDef = exports.mkSQLSourceDef = exports.mkQuerySourceDef = exports.mkBuildID = exports.mkSourceID = exports.MalloyCompileError = exports.givenUsageOfRelation = exports.buildIdOptions = exports.getCompiledSQL = exports.constantExprToSQL = exports.getModelAnnotations = exports.typeDefToString = exports.pathToKey = exports.mkModelID = exports.mkModelDef = exports.makeDigest = exports.composeSQLExpr = exports.indent = exports.getResultStructDefForView = exports.getResultStructDefForQuery = exports.QueryModel = exports.QueryQuery = exports.QueryStruct = exports.QueryField = void 0;
 __exportStar(require("./malloy_types"), exports);
 const query_node_1 = require("./query_node");
 Object.defineProperty(exports, "QueryField", { enumerable: true, get: function () { return query_node_1.QueryField; } });
@@ -52,6 +52,7 @@ Object.defineProperty(exports, "constantExprToSQL", { enumerable: true, get: fun
 var sql_compiled_1 = require("./sql_compiled");
 Object.defineProperty(exports, "getCompiledSQL", { enumerable: true, get: function () { return sql_compiled_1.getCompiledSQL; } });
 Object.defineProperty(exports, "buildIdOptions", { enumerable: true, get: function () { return sql_compiled_1.buildIdOptions; } });
+Object.defineProperty(exports, "givenUsageOfRelation", { enumerable: true, get: function () { return sql_compiled_1.givenUsageOfRelation; } });
 var malloy_compile_error_1 = require("./malloy_compile_error");
 Object.defineProperty(exports, "MalloyCompileError", { enumerable: true, get: function () { return malloy_compile_error_1.MalloyCompileError; } });
 var source_def_utils_1 = require("./source_def_utils");

package/dist/model/query_query.d.ts

@@ -17,8 +17,10 @@ type StageGroupMaping = {
 };
 interface StageOutputColumn {
     sql: string;
+    expr: string;
     name: string;
     isDimension: boolean;
+    constant?: boolean;
 }
 type StageOutputContext = {
     columns: StageOutputColumn[];
@@ -122,7 +124,7 @@ export declare class QueryQuery extends QueryField {
      * This ordering ensures parent arrays are ordered before child arrays.
      */
     collectArrayJoins(ji: JoinInstance): JoinInstance[];
-    genereateSQLOrderBy(queryDef: QuerySegment, resultStruct: FieldInstanceResult): string;
+    genereateSQLOrderBy(queryDef: QuerySegment, resultStruct: FieldInstanceResult): string[];
     /**
      * The single-scan form, with no `group_set` fan-out: one `SELECT` over the
      * scan, grouped by the dimensions. Used both for a query with no nests and --