@malloydata/malloy 0.0.434 → 0.0.436

package/dist/model/sql_compiled.js

@@ -8,6 +8,7 @@ exports.getCompiledSQL = getCompiledSQL;
 exports.expandSQLSegments = expandSQLSegments;
 exports.buildIdOptions = buildIdOptions;
 exports.persistedTableFor = persistedTableFor;
+exports.givenUsageOfRelation = givenUsageOfRelation;
 exports.getSourceSQL = getSourceSQL;
 const malloy_types_1 = require("./malloy_types");
 const source_def_utils_1 = require("./source_def_utils");
@@ -50,23 +51,9 @@ function expandSegment(segment, opts, compileQuery) {
     // Query segment
     return expandQuery(segment, opts, compileQuery);
 }
-/**
- * Project compile options down to what a BuildID is computed under.
- *
- * `virtualMap` decides which table a virtual source reads, so it changes the
- * SQL and has to be in the key; the builder supplies its own.
- *
- * `resolvedGivens` is deliberately absent even though it also changes the SQL.
- * The builder has no way to produce one — `Runtime.getBuildTargets` takes no
- * givens and `PersistSource.getSQL` never resolves them — so including it makes
- * the two sides disagree: the compiler folds `$IS_ADMIN` to a literal while the
- * builder re-derives it from the declaration and emits `'admin'='admin'`. Both
- * sides therefore compile givens the same way, by not resolving them. The
- * consequence — a source whose SQL depends on a supplied given cannot be
- * persisted, and says so badly — is #3041.
- */
+/** Project compile options down to what a BuildID is computed under. */
 function buildIdOptions(opts) {
-    return { virtualMap: opts.virtualMap };
+    return { virtualMap: opts.virtualMap, resolvedGivens: opts.resolvedGivens };
 }
 /**
  * Ask the manifest what table backs a persistable source.
@@ -100,12 +87,37 @@ function persistedTableFor(source, opts, compileQuery) {
         const named = source.sourceID
             ? `Persisted source '${source.sourceID}'`
             : 'Persisted source';
+        const perValue = givenUsageOfRelation(source).length > 0
+            ? ' This source reads givens, and no table was built for the given ' +
+                'values this query supplies.'
+            : '';
         const base = `${named} not found in manifest (buildId: ${buildId}); ` +
-            'strict manifest mode forbids fallback to live compilation.';
+            'strict manifest mode forbids fallback to live compilation.' +
+            perValue;
         throw new malloy_compile_error_1.MalloyCompileError(buildManifest.loadError ? `${base}\n  ${buildManifest.loadError}` : base, 'runtime-manifest-strict-miss', source.location);
     }
     return undefined;
 }
+/**
+ * The givens a persisted source's SQL reads — the relation, not the source.
+ * A `where:` added by `extend` is applied by the query that reads the table,
+ * so it is not here, and a given used only there does not split the table by
+ * value. Mirrors `getSourceSQL`: what that compiles, this reports on.
+ */
+function givenUsageOfRelation(source) {
+    var _a, _b;
+    if (source.type === 'query_source') {
+        return (_a = source.query.givenUsage) !== null && _a !== void 0 ? _a : [];
+    }
+    return ((_b = source.selectSegments) !== null && _b !== void 0 ? _b : []).flatMap(segment => {
+        var _a;
+        if ((0, malloy_types_1.isSegmentSQL)(segment))
+            return [];
+        if ((0, malloy_types_1.isSegmentSource)(segment))
+            return givenUsageOfRelation(segment);
+        return (_a = segment.givenUsage) !== null && _a !== void 0 ? _a : [];
+    });
+}
 /**
  * Expand a PersistableSourceDef as a `%{ }` segment.
  * Always returns a subquery form: (SELECT * FROM table) or (inline SQL)

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.434";
+export declare const MALLOY_VERSION = "0.0.436";

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

package/femto-config.motly

@@ -28,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.434",
+  "version": "0.0.436",
   "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.434",
-    "@malloydata/malloy-interfaces": "0.0.434",
-    "@malloydata/malloy-tag": "0.0.434",
+    "@malloydata/malloy-filter": "0.0.436",
+    "@malloydata/malloy-interfaces": "0.0.436",
+    "@malloydata/malloy-tag": "0.0.436",
     "@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"
   }
 }