@malloydata/malloy 0.0.433 → 0.0.435

package/dist/model/source_def_utils.d.ts

@@ -7,7 +7,13 @@
  * fields they need, never using spread, so identity is not propagated onto a
  * freshly built source.
  */
-import type { BuildID, FieldDef, GivenID, ModelDef, PersistableSourceDef, Query, QuerySourceDef, SourceDef, SourceID, SourceRegistryEntry, SourceRegistryValue, SQLPhraseSegment, SQLSourceDef, TableSourceDef } from './malloy_types';
+import type { BuildID, FieldDef, GivenID, ModelDef, NamedModelObject, PersistableSourceDef, Query, QuerySourceDef, SourceDef, SourceID, SourceRegistryEntry, SourceRegistryValue, SQLPhraseSegment, SQLSourceDef, TableSourceDef } from './malloy_types';
+/**
+ * The dialect an entry commits whoever imports it to, if any. A query begins
+ * at a source, which is either inline in the query or named in the model the
+ * query came from.
+ */
+export declare function dialectOfEntry(entry: NamedModelObject, from: ModelDef): string | undefined;
 export declare function mkSourceID(name: string, url: string | undefined): SourceID;
 export declare function mkGivenID(name: string, url: string | undefined): GivenID;
 /**

package/dist/model/source_def_utils.js

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.dialectOfEntry = dialectOfEntry;
 exports.mkSourceID = mkSourceID;
 exports.mkGivenID = mkGivenID;
 exports.mkBuildID = mkBuildID;
@@ -17,6 +18,25 @@ exports.registerSource = registerSource;
 exports.hasSourceRegistryEntry = hasSourceRegistryEntry;
 const utils_1 = require("./utils");
 const malloy_types_1 = require("./malloy_types");
+/**
+ * The dialect an entry commits whoever imports it to, if any. A query begins
+ * at a source, which is either inline in the query or named in the model the
+ * query came from.
+ */
+function dialectOfEntry(entry, from) {
+    if ((0, malloy_types_1.isSourceDef)(entry)) {
+        return entry.dialect;
+    }
+    if (entry.type === 'query') {
+        const head = entry.structRef;
+        if (typeof head === 'string') {
+            const named = (0, malloy_types_1.safeRecordGet)(from.contents, head);
+            return named && (0, malloy_types_1.isSourceDef)(named) ? named.dialect : undefined;
+        }
+        return head.dialect;
+    }
+    return undefined;
+}
 function mkSourceID(name, url) {
     return `${name}@${url !== null && url !== void 0 ? url : 'unknown'}`;
 }

package/dist/model/sql_block.d.ts

@@ -1,8 +1,8 @@
 import type { SQLSourceRequest } from '../lang/translate-response';
-import type { SQLPhraseSegment, ModelDef } from './malloy_types';
+import type { SQLPhraseSegment, ModelDef, VirtualMap } from './malloy_types';
 /**
  * The translator needs to know the output schema of an SQLSourceDef
  * this will prepare an SQL string suitable to answer that question.
  */
-export declare function getSourceRequest(select: SQLPhraseSegment[], connection: string, partialModel: ModelDef | undefined): SQLSourceRequest;
+export declare function getSourceRequest(select: SQLPhraseSegment[], connection: string, partialModel: ModelDef | undefined, virtualMap?: VirtualMap): SQLSourceRequest;
 export declare function sqlKey(connectionName: string, sql: string): string;

package/dist/model/sql_block.js

@@ -7,62 +7,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSourceRequest = getSourceRequest;
 exports.sqlKey = sqlKey;
 const query_model_1 = require("./query_model");
-const malloy_types_1 = require("./malloy_types");
+const sql_compiled_1 = require("./sql_compiled");
 const utils_1 = require("./utils");
 /**
  * The translator needs to know the output schema of an SQLSourceDef
  * this will prepare an SQL string suitable to answer that question.
  */
-function getSourceRequest(select, connection, partialModel) {
-    let queryModel = undefined;
-    let selectStr = '';
-    let parenAlready = false;
-    for (const segment of select) {
-        if ((0, malloy_types_1.isSegmentSQL)(segment)) {
-            selectStr += segment.sql;
-            parenAlready = segment.sql.match(/\(\s*$/) !== null;
-        }
-        else if ((0, malloy_types_1.isSegmentSource)(segment)) {
-            // PersistableSourceDef (sql_select or query_source)
-            let compiledSql;
-            if (segment.type === 'sql_select') {
-                compiledSql = segment.selectStr;
-            }
-            else {
-                // query_source - compile the inner query
-                if (!queryModel) {
-                    if (!partialModel) {
-                        throw new Error('Internal error: Partial model missing when compiling SQL block');
-                    }
-                    queryModel = (0, query_model_1.makeQueryModel)(partialModel);
-                }
-                compiledSql = queryModel.compileQuery(segment.query, {
-                    defaultRowLimit: undefined,
-                    isPartialQuery: true,
-                }, false).sql;
+function getSourceRequest(select, connection, partialModel, virtualMap) {
+    let queryModel;
+    const compileQuery = (query, options) => {
+        if (!queryModel) {
+            if (!partialModel) {
+                throw new Error('Internal error: Partial model missing when compiling SQL block');
             }
-            selectStr += parenAlready ? compiledSql : `(${compiledSql})`;
-            parenAlready = false;
+            queryModel = (0, query_model_1.makeQueryModel)(partialModel);
         }
-        else {
-            // Query segment
-            if (!queryModel) {
-                if (!partialModel) {
-                    throw new Error('Internal error: Partial model missing when compiling SQL block');
-                }
-                queryModel = (0, query_model_1.makeQueryModel)(partialModel);
-            }
-            const compiledSql = queryModel.compileQuery(segment, {
-                defaultRowLimit: undefined,
-                isPartialQuery: true,
-            }, false).sql;
-            selectStr += parenAlready ? compiledSql : `(${compiledSql})`;
-            parenAlready = false;
-        }
-    }
+        return queryModel.compileQuery(query, { ...options, defaultRowLimit: undefined, isPartialQuery: true }, false).sql;
+    };
     return {
         connection,
-        selectStr,
+        selectStr: (0, sql_compiled_1.expandSQLSegments)(select, { virtualMap }, compileQuery),
     };
 }
 function sqlKey(connectionName, sql) {

package/dist/model/sql_compiled.d.ts

@@ -1,4 +1,4 @@
-import type { PrepareResultOptions, SQLSourceDef, PersistableSourceDef, Query, VirtualMap } from './malloy_types';
+import type { PrepareResultOptions, SQLSourceDef, SQLPhraseSegment, PersistableSourceDef, Query, VirtualMap } from './malloy_types';
 /**
  * Callback type for compiling a Query to SQL.
  * opts is optional - omit for "full SQL" (BuildID computation),
@@ -16,6 +16,8 @@ export type CompileQueryCallback = (query: Query, opts?: PrepareResultOptions) =
  * @param compileQuery Callback to compile a Query to SQL
  */
 export declare function getCompiledSQL(src: SQLSourceDef, opts: PrepareResultOptions, compileQuery: CompileQueryCallback): string;
+/** Expand SQL text and interpolations for schema discovery or execution. */
+export declare function expandSQLSegments(segments: SQLPhraseSegment[], opts: PrepareResultOptions, compileQuery: CompileQueryCallback): string;
 /**
  * The options a BuildID's SQL is compiled under — everything the builder and
  * the compiler must both know, and nothing else.

package/dist/model/sql_compiled.js

@@ -5,6 +5,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCompiledSQL = getCompiledSQL;
+exports.expandSQLSegments = expandSQLSegments;
 exports.buildIdOptions = buildIdOptions;
 exports.persistedTableFor = persistedTableFor;
 exports.getSourceSQL = getSourceSQL;
@@ -26,12 +27,13 @@ function getCompiledSQL(src, opts, compileQuery) {
     if (!src.selectSegments || src.selectSegments.length === 0) {
         return src.selectStr;
     }
-    // Expand each segment
-    const parts = [];
-    for (const segment of src.selectSegments) {
-        parts.push(expandSegment(segment, opts, compileQuery));
-    }
-    return parts.join('');
+    return expandSQLSegments(src.selectSegments, opts, compileQuery);
+}
+/** Expand SQL text and interpolations for schema discovery or execution. */
+function expandSQLSegments(segments, opts, compileQuery) {
+    return segments
+        .map(segment => expandSegment(segment, opts, compileQuery))
+        .join('');
 }
 /**
  * Expand a single SQLPhraseSegment to SQL.

package/dist/model/stage_writer.js

@@ -51,7 +51,7 @@ class StageWriter {
         if (lastStageName === undefined) {
             throw new Error('Internal Error: no stage to combine');
         }
-        sql += dialect.sqlCreateFunctionCombineLastStage(lastStageName, (0, utils_1.getDialectFieldList)(structDef), (_a = structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.orderBy);
+        sql += dialect.sqlCreateFunctionCombineLastStage(lastStageName, (0, utils_1.getDialectFieldList)(structDef, dialect), (_a = structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.orderBy);
         const id = `${dialect.udfPrefix}${this.root().udfs.length}`;
         sql = dialect.sqlCreateFunction(id, sql);
         this.root().udfs.push(sql);
@@ -98,11 +98,11 @@ class StageWriter {
     generateCoorelatedSubQuery(dialect, structDef) {
         var _a, _b;
         if (!this.useCTE) {
-            return dialect.sqlCreateFunctionCombineLastStage(`(${this.withs[0]})`, (0, utils_1.getDialectFieldList)(structDef), (_a = structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.orderBy);
+            return dialect.sqlCreateFunctionCombineLastStage(`(${this.withs[0]})`, (0, utils_1.getDialectFieldList)(structDef, dialect), (_a = structDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.orderBy);
         }
         else {
             return (this.combineStages(true).sql +
-                dialect.sqlCreateFunctionCombineLastStage(this.getName(this.withs.length - 1), (0, utils_1.getDialectFieldList)(structDef), (_b = structDef.resultMetadata) === null || _b === void 0 ? void 0 : _b.orderBy));
+                dialect.sqlCreateFunctionCombineLastStage(this.getName(this.withs.length - 1), (0, utils_1.getDialectFieldList)(structDef, dialect), (_b = structDef.resultMetadata) === null || _b === void 0 ? void 0 : _b.orderBy));
         }
     }
 }

package/dist/model/utils.d.ts

@@ -1,5 +1,5 @@
 import type { AtomicTypeDef, Expr, FieldDef, GenericSQLExpr, GivenTypeDef, ModelDef, ModelID, StructDef } from './malloy_types';
-import type { DialectFieldList } from '../dialect';
+import type { Dialect, DialectFieldList } from '../dialect';
 /**
  * Format a typeDef as user-readable Malloy type syntax. Used in error
  * messages where we want to echo a compound type back to the user in the
@@ -58,7 +58,7 @@ export type SQLExprElement = string | Expr;
  * expression node.
  */
 export declare function composeSQLExpr(from: SQLExprElement[]): GenericSQLExpr;
-export declare function getDialectFieldList(structDef: StructDef): DialectFieldList;
+export declare function getDialectFieldList(structDef: StructDef, dialect: Dialect): DialectFieldList;
 /**
  * A little extra paranoia to save us from fields which contain the special
  * characters used to build the grouping key.

package/dist/model/utils.js

@@ -251,14 +251,13 @@ function composeSQLExpr(from) {
     }
     return ret;
 }
-function getDialectFieldList(structDef) {
+function getDialectFieldList(structDef, dialect) {
     const dialectFieldList = [];
     for (const f of structDef.fields.filter(malloy_types_1.fieldIsIntrinsic)) {
         dialectFieldList.push({
             typeDef: f,
-            sqlExpression: (0, malloy_types_1.activeName)(f),
+            sqlExpression: dialect.sqlQuoteIdentifier((0, malloy_types_1.activeName)(f)),
             rawName: (0, malloy_types_1.activeName)(f),
-            sqlOutputName: (0, malloy_types_1.activeName)(f),
         });
     }
     return dialectFieldList;

package/dist/test/index.js

@@ -113,14 +113,20 @@ function databasesFromEnvironmentOr(defaultDatabases) {
             : defaultDatabases;
 }
 /**
- * A replacement for [describe()] that mimics [describe.skip()]
+ * A replacement for [describe()] that mimics [describe.skip()].
+ *
+ * Built on demand, not at module scope: this module is also imported outside
+ * jest (scripts that construct a test connection), where the jest globals do
+ * not exist.
  */
-const describeSkip = Object.assign((name, fn) => describe.skip(name, fn), {
-    skip: describe.skip,
-    // eslint-disable-next-line no-restricted-properties
-    only: describe.only,
-    each: (() => () => it.skip('skipped', () => { })),
-});
+function makeDescribeSkip() {
+    return Object.assign((name, fn) => describe.skip(name, fn), {
+        skip: describe.skip,
+        // eslint-disable-next-line no-restricted-properties
+        only: describe.only,
+        each: (() => () => it.skip('skipped', () => { })),
+    });
+}
 /**
  * Confirms that one or more of the databases being tested overlaps with
  * the databases a test suite can accept. If there is overlap, return a tuple
@@ -130,7 +136,9 @@ const describeSkip = Object.assign((name, fn) => describe.skip(name, fn), {
 function describeIfDatabaseAvailable(acceptableDatabases) {
     const currentDatabases = databasesFromEnvironmentOr(acceptableDatabases);
     const overlap = acceptableDatabases.filter(d => currentDatabases.includes(d));
-    return overlap.length > 0 ? [describe, overlap] : [describeSkip, overlap];
+    return overlap.length > 0
+        ? [describe, overlap]
+        : [makeDescribeSkip(), overlap];
 }
 function brokenIn(dialectName, connectionName) {
     return dialectName === connectionName;

package/dist/test/matchers.d.ts

@@ -1,7 +1,7 @@
 /**
  * Import this module to register Jest matchers (toMatchResult, toEqualResult).
  *
- * Usage in jest.config.js:
+ * Usage in jest.config.ts:
  *   setupFilesAfterEnv: ['@malloydata/malloy/test/matchers']
  *
  * Or import directly in a test file:

package/dist/test/matchers.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Import this module to register Jest matchers (toMatchResult, toEqualResult).
  *
- * Usage in jest.config.js:
+ * Usage in jest.config.ts:
  *   setupFilesAfterEnv: ['@malloydata/malloy/test/matchers']
  *
  * Or import directly in a test file:

package/dist/test/test-models.js

@@ -229,19 +229,12 @@ function generateSQL(dialect, rows) {
         .join(', ');
     const innerQuery = selects.join('\nUNION ALL ');
     // Generate ORDER BY based on dialect preference
-    let orderByClause;
-    if (dialect.orderByClause === 'ordinal') {
-        orderByClause = `ORDER BY ${columnList.length + 1}`;
-    }
-    else if (dialect.orderByClause === 'output_name') {
-        orderByClause = `ORDER BY ${rowIdColumn}`;
-    }
-    else {
-        orderByClause = `ORDER BY ${rowIdColumn}`;
-    }
-    // Presto/Trino ignores ORDER BY on a subquery without LIMIT
-    orderByClause += ` LIMIT ${rows.length}`;
-    const sql = `SELECT ${quotedColumns}\nFROM (\n  SELECT *\n  FROM (\n${innerQuery}\n  ) AS t_sorted\n  ${orderByClause}\n) AS t_result\n`;
+    const orderTerm = dialect.orderByClause === 'ordinal'
+        ? `${columnList.length + 1}`
+        : rowIdColumn;
+    // Presto/Trino ignores ORDER BY on a subquery without a row limit
+    const orderByClause = dialect.sqlOrderByLimit([orderTerm], rows.length);
+    const sql = `SELECT ${quotedColumns}\nFROM (\n  SELECT *\n  FROM (\n${innerQuery}\n  ) AS t_sorted\n  ${orderByClause}) AS t_result\n`;
     return sql;
 }
 /**

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.433";
+export declare const MALLOY_VERSION = "0.0.435";

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.433';
+exports.MALLOY_VERSION = '0.0.435';
 //# sourceMappingURL=version.js.map

package/femto-config.motly

@@ -1,3 +1,5 @@
+# Config format: node ../../scripts/femto-build.js --help
+
 lexer: {
   inputs = ["src/lang/grammar/MalloyLexer.g4"]
   outputs = ["src/lang/lib/Malloy/MalloyLexer.ts"]
@@ -26,6 +28,18 @@ tokenNames: {
   commands = ["node src/lang/grammar/build_token_names.js"]
 }
 
+# A pure function of the two CLDR files, so a cldr-core/cldr-bcp47 bump
+# regenerates it on the next build.
+windowsZones: {
+  inputs = [
+    "src/dialect/sqlserver/build_windows_zones.js",
+    "../../node_modules/cldr-core/supplemental/windowsZones.json",
+    "../../node_modules/cldr-bcp47/bcp47/timezone.json"
+  ]
+  outputs = ["src/dialect/sqlserver/windows_zones.ts"]
+  commands = ["node src/dialect/sqlserver/build_windows_zones.js"]
+}
+
 codegen: {
-  deps = [parser, tokenNames]
+  deps = [parser, tokenNames, windowsZones]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.433",
+  "version": "0.0.435",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -40,7 +40,7 @@
     "url": "https://github.com/malloydata/malloy"
   },
   "scripts": {
-    "test": "jest --config=../../jest.config.js",
+    "test": "echo 'Read the Testing section of the repo-root CONTEXT.md for information on testing in this monorepo'; exit 1",
     "codegen": "node ../../scripts/femto-build.js codegen",
     "build-parser": "node src/lang/grammar/build_parser.js",
     "clean": "tsc --build --clean && rm -f tsconfig.tsbuildinfo && node ../../scripts/femto-build.js --clean && rm -rf src/lang/lib dist",
@@ -51,9 +51,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.433",
-    "@malloydata/malloy-interfaces": "0.0.433",
-    "@malloydata/malloy-tag": "0.0.433",
+    "@malloydata/malloy-filter": "0.0.435",
+    "@malloydata/malloy-interfaces": "0.0.435",
+    "@malloydata/malloy-tag": "0.0.435",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
@@ -67,6 +67,8 @@
     "@types/lodash": "^4.17.24",
     "@types/luxon": "^3.7.2",
     "antlr4ts-cli": "^0.5.0-alpha.4",
+    "cldr-bcp47": "^48.2.0",
+    "cldr-core": "^48.2.0",
     "jest-diff": "^30.4.1"
   }
 }