@malloydata/malloy 0.0.394 → 0.0.396

package/dist/model/query_query.js

@@ -13,6 +13,7 @@ const stage_writer_1 = require("./stage_writer");
 const field_instance_1 = require("./field_instance");
 const sql_compiled_1 = require("./sql_compiled");
 const source_def_utils_1 = require("./source_def_utils");
+const malloy_compile_error_1 = require("./malloy_compile_error");
 function pathToCol(path) {
     return path.map(el => encodeURIComponent(el)).join('/');
 }
@@ -142,7 +143,8 @@ class QueryQuery extends query_node_1.QueryField {
             for (const pathSegment of ungrouping.path) {
                 const nextStruct = destResult.allFields.get(pathSegment);
                 if (!(nextStruct instanceof field_instance_1.FieldInstanceResult)) {
-                    throw new Error(`Ungroup path ${ungrouping.path.join('.')} segment '${pathSegment}' is not a nested query`);
+                    throw new malloy_compile_error_1.MalloyCompileError(`Ungrouping path '${ungrouping.path.join('.')}' references ` +
+                        `'${pathSegment}', which is not a nested view at this level.`, 'compiler-ungrouped-invalid-path', this.fieldDef.location);
                 }
                 destResult = nextStruct;
             }
@@ -192,7 +194,9 @@ class QueryQuery extends query_node_1.QueryField {
             const drillExpression = this.getDrillExpression(f);
             if (field instanceof QueryQuery) {
                 if (this.firstSegment.type === 'project') {
-                    throw new Error(`Nested views cannot be used in select - '${field.fieldDef.name}'`);
+                    throw new malloy_compile_error_1.MalloyCompileError(`Cannot include nested view '${field.fieldDef.name}' in a ` +
+                        "'select:' stage. Nested views require `group_by:` or " +
+                        '`aggregate:` to be included in output.', 'compiler-nested-view-in-select', field.fieldDef.location);
                 }
                 const fir = new field_instance_1.FieldInstanceResult(field.fieldDef, resultStruct);
                 this.expandFields(fir);
@@ -212,7 +216,8 @@ class QueryQuery extends query_node_1.QueryField {
                 }
                 if ((0, query_node_1.isBasicAggregate)(field)) {
                     if (this.firstSegment.type === 'project') {
-                        throw new Error(`Aggregate Fields cannot be used in select - '${field.fieldDef.name}'`);
+                        throw new malloy_compile_error_1.MalloyCompileError(`Cannot include aggregate field '${field.fieldDef.name}' in ` +
+                            "a 'select:' stage. Use `aggregate:` instead to compute aggregates.", 'compiler-aggregate-in-select', field.fieldDef.location);
                     }
                 }
             }
@@ -517,14 +522,19 @@ class QueryQuery extends query_node_1.QueryField {
         var _a, _b, _c, _d;
         switch (qs.structDef.type) {
             case 'table':
-                return this.parent.dialect.quoteTablePath(qs.structDef.tablePath);
+                // tablePath is canonical SQL — translator pre-validated.
+                return qs.structDef.tablePath;
             case 'virtual': {
                 const virtualMap = (_a = qs.prepareResultOptions) === null || _a === void 0 ? void 0 : _a.virtualMap;
                 const tablePath = (_b = virtualMap === null || virtualMap === void 0 ? void 0 : virtualMap.get(qs.structDef.connection)) === null || _b === void 0 ? void 0 : _b.get(qs.structDef.name);
                 if (!tablePath) {
-                    throw new Error(`No virtual map entry for '${qs.structDef.name}' on connection '${qs.structDef.connection}'`);
+                    throw new malloy_compile_error_1.MalloyCompileError(`No virtual-map entry for virtual source '${qs.structDef.name}' ` +
+                        `on connection '${qs.structDef.connection}'. ` +
+                        'Add a virtual-map entry via the `virtualMap` runtime option.', 'runtime-virtual-map-missing', qs.structDef.location);
                 }
-                return this.parent.dialect.quoteTablePath(tablePath);
+                // virtualMap entries are application-supplied — assumed already
+                // canonical SQL.
+                return tablePath;
             }
             case 'composite':
                 // TODO: throw an error here; not simple because we call into this
@@ -533,7 +543,7 @@ class QueryQuery extends query_node_1.QueryField {
             case 'finalize':
                 return qs.structDef.name;
             case 'sql_select':
-                return `(${(0, sql_compiled_1.getCompiledSQL)(qs.structDef, (_c = qs.prepareResultOptions) !== null && _c !== void 0 ? _c : {}, path => this.parent.dialect.quoteTablePath(path), (query, opts) => {
+                return `(${(0, sql_compiled_1.getCompiledSQL)(qs.structDef, (_c = qs.prepareResultOptions) !== null && _c !== void 0 ? _c : {}, (query, opts) => {
                     // Compile query to isolated SQL (not into parent's stageWriter)
                     const ret = this.compileQueryToStages(query, opts !== null && opts !== void 0 ? opts : {}, undefined, false);
                     return ret.sql;
@@ -551,14 +561,17 @@ class QueryQuery extends query_node_1.QueryField {
                         const buildId = (0, source_def_utils_1.mkBuildID)(connDigest, fullRet.sql);
                         const entry = buildManifest.entries[buildId];
                         if (entry) {
-                            // Found in manifest - use persisted table
-                            return this.parent.dialect.quoteTablePath(entry.tableName);
+                            // Found in manifest - use persisted table.
+                            // entry.tableName comes from the manifest, assumed canonical.
+                            return entry.tableName;
                         }
                         if (buildManifest.strict) {
-                            const base = `Persist source '${qs.structDef.sourceID}' not found in manifest (buildId: ${buildId})`;
-                            throw new Error(buildManifest.loadError
+                            const base = `Persist source '${qs.structDef.sourceID}' not found ` +
+                                `in manifest (buildId: ${buildId}); strict manifest mode ` +
+                                'forbids fallback to live compilation.';
+                            throw new malloy_compile_error_1.MalloyCompileError(buildManifest.loadError
                                 ? `${base}\n  ${buildManifest.loadError}`
-                                : base);
+                                : base, 'runtime-manifest-strict-miss', qs.structDef.location);
                         }
                     }
                 }
@@ -594,7 +607,8 @@ class QueryQuery extends query_node_1.QueryField {
         if (typeof structRef === 'string') {
             const struct = this.structRefToQueryStruct(structRef);
             if (!struct) {
-                throw new Error(`Unexpected reference to an undefined source '${structRef}'`);
+                throw new malloy_compile_error_1.MalloyCompileError(`Query references source '${structRef}', ` +
+                    'which is not defined in this model.', 'compiler-undefined-source', undefined);
             }
             sourceStruct = struct;
         }
@@ -631,7 +645,7 @@ class QueryQuery extends query_node_1.QueryField {
             }
             if (ji.makeUniqueKey) {
                 const passKeys = this.generateSQLPassthroughKeys(qs);
-                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as ${qs.dialect.sqlMaybeQuoteIdentifier('__distinct_key')}, x.* ${passKeys} FROM ${structSQL} as x)`;
+                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as ${qs.dialect.sqlQuoteIdentifier('__distinct_key')}, x.* ${passKeys} FROM ${structSQL} as x)`;
             }
             let onCondition = '';
             if (qs.parent === undefined) {
@@ -764,7 +778,7 @@ class QueryQuery extends query_node_1.QueryField {
         if ((0, malloy_types_1.isBaseTable)(qs.structDef)) {
             if (ji.makeUniqueKey) {
                 const passKeys = this.generateSQLPassthroughKeys(qs);
-                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as ${qs.dialect.sqlMaybeQuoteIdentifier('__distinct_key')}, x.* ${passKeys} FROM ${structSQL} as x)`;
+                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as ${qs.dialect.sqlQuoteIdentifier('__distinct_key')}, x.* ${passKeys} FROM ${structSQL} as x)`;
             }
             s += `FROM ${structSQL} as ${ji.alias}\n`;
         }
@@ -846,7 +860,7 @@ class QueryQuery extends query_node_1.QueryField {
                         o.push(`${fi.fieldUsage.resultIndex} ${f.dir || 'ASC'}`);
                     }
                     else if (this.parent.dialect.orderByClause === 'output_name') {
-                        o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(f.field)} ${f.dir || 'ASC'}`);
+                        o.push(`${this.parent.dialect.sqlQuoteIdentifier(f.field)} ${f.dir || 'ASC'}`);
                     }
                     else if (this.parent.dialect.orderByClause === 'expression') {
                         const fieldExpr = fi.getSQL();
@@ -854,7 +868,7 @@ class QueryQuery extends query_node_1.QueryField {
                     }
                 }
                 else {
-                    throw new Error(`Unknown field in ORDER BY ${f.field}`);
+                    throw new malloy_compile_error_1.MalloyCompileError(`ORDER BY references unknown field '${f.field}'.`, 'compiler-orderby-field-not-found', queryDef.referencedAt);
                 }
             }
             else {
@@ -863,7 +877,7 @@ class QueryQuery extends query_node_1.QueryField {
                 }
                 else if (this.parent.dialect.orderByClause === 'output_name') {
                     const orderingField = resultStruct.getFieldByNumber(f.field);
-                    o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(orderingField.name)} ${f.dir || 'ASC'}`);
+                    o.push(`${this.parent.dialect.sqlQuoteIdentifier(orderingField.name)} ${f.dir || 'ASC'}`);
                 }
                 else if (this.parent.dialect.orderByClause === 'expression') {
                     const orderingField = resultStruct.getFieldByNumber(f.field);
@@ -887,7 +901,7 @@ class QueryQuery extends query_node_1.QueryField {
         const fields = [];
         for (const [name, field] of this.rootResult.allFields) {
             const fi = field;
-            const sqlName = this.parent.dialect.sqlMaybeQuoteIdentifier(name);
+            const sqlName = this.parent.dialect.sqlQuoteIdentifier(name);
             if (fi.fieldUsage.type === 'result') {
                 fields.push(` ${fi.generateExpression()} as ${sqlName}`);
             }
@@ -937,7 +951,7 @@ class QueryQuery extends query_node_1.QueryField {
                 .map(o => `${o.pipelineSQL} as ${o.sqlFieldName}`)
                 .join(',\n');
             const outputFields = outputPipelinedSQL.map(f => f.sqlFieldName);
-            const allFields = Array.from(this.rootResult.allFields.keys()).map(f => this.parent.dialect.sqlMaybeQuoteIdentifier(f));
+            const allFields = Array.from(this.rootResult.allFields.keys()).map(f => this.parent.dialect.sqlQuoteIdentifier(f));
             const fields = allFields.filter(f => outputFields.indexOf(f) === -1);
             retSQL = `SELECT ${fields.length > 0 ? fields.join(', ') + ',' : ''} ${pipelinesSQL} FROM ${lastStageName}`;
         }
@@ -956,7 +970,7 @@ class QueryQuery extends query_node_1.QueryField {
         }
         const orderedFields = [...scalarFields, ...otherFields];
         for (const [name, fi] of orderedFields) {
-            const outputName = this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultSet.groupSet}`);
+            const outputName = this.parent.dialect.sqlQuoteIdentifier(`${name}__${resultSet.groupSet}`);
             if (fi instanceof field_instance_1.FieldInstanceField) {
                 if (fi.fieldUsage.type === 'result') {
                     const exp = fi.getSQL();
@@ -975,7 +989,7 @@ class QueryQuery extends query_node_1.QueryField {
                             });
                             output.sql.push(outputFieldName);
                             if (fi.f.fieldDef.type === 'number') {
-                                const outputNameString = this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultSet.groupSet}_string`);
+                                const outputNameString = this.parent.dialect.sqlQuoteIdentifier(`${name}__${resultSet.groupSet}_string`);
                                 const outputFieldNameString = `__lateral_join_bag.${outputNameString}`;
                                 output.sql.push(outputFieldNameString);
                                 output.dimensionIndexes.push(output.fieldIndex++);
@@ -1086,7 +1100,7 @@ class QueryQuery extends query_node_1.QueryField {
                 let r = result;
                 while (r) {
                     for (const name of r.fieldNames(fi => (0, query_node_1.isScalarField)(fi.f))) {
-                        dimensions.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${r.groupSet}`));
+                        dimensions.push(this.parent.dialect.sqlQuoteIdentifier(`${name}__${r.groupSet}`));
                     }
                     r = r.parent;
                 }
@@ -1120,7 +1134,7 @@ class QueryQuery extends query_node_1.QueryField {
                             orderingField = result.getFieldByNumber(ordering.field);
                         }
                         obSQL.push(' ' +
-                            this.parent.dialect.sqlMaybeQuoteIdentifier(`${orderingField.name}__${result.groupSet}`) +
+                            this.parent.dialect.sqlQuoteIdentifier(`${orderingField.name}__${result.groupSet}`) +
                             ` ${ordering.dir || 'ASC'}`);
                     }
                     // partition for a row number is the parent if it exists.
@@ -1206,7 +1220,9 @@ class QueryQuery extends query_node_1.QueryField {
         this.generateStage0Fields(this.rootResult, f, stageWriter);
         if (this.firstSegment.type === 'project' &&
             !this.parent.modelCompilerFlags().has('unsafe_complex_select_query')) {
-            throw new Error('PROJECT cannot be used on queries with turtles');
+            throw new malloy_compile_error_1.MalloyCompileError("Cannot use 'select:' in a stage that contains nested views. " +
+                'Use `group_by:` or restructure the pipeline. ' +
+                'Set `##! unsafe_complex_select_query` to bypass at your own risk.', 'compiler-project-with-turtles', this.fieldDef.location);
         }
         const groupBy = 'GROUP BY ' + f.dimensionIndexes.join(',') + '\n';
         from += this.parent.dialect.sqlGroupSetTable(this.maxGroupSet) + '\n';
@@ -1225,7 +1241,7 @@ class QueryQuery extends query_node_1.QueryField {
     generateDepthNFields(depth, resultSet, output, stageWriter) {
         const groupsToMap = [];
         for (const [name, fi] of resultSet.allFields) {
-            const sqlFieldName = this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultSet.groupSet}`);
+            const sqlFieldName = this.parent.dialect.sqlQuoteIdentifier(`${name}__${resultSet.groupSet}`);
             if (fi instanceof field_instance_1.FieldInstanceField) {
                 if (fi.fieldUsage.type === 'result') {
                     if ((0, query_node_1.isScalarField)(fi.f)) {
@@ -1329,15 +1345,15 @@ class QueryQuery extends query_node_1.QueryField {
         const outputPipelinedSQL = [];
         const dimensionIndexes = [];
         for (const [name, fi] of this.rootResult.allFields) {
-            const sqlName = this.parent.dialect.sqlMaybeQuoteIdentifier(name);
+            const sqlName = this.parent.dialect.sqlQuoteIdentifier(name);
             if (fi instanceof field_instance_1.FieldInstanceField) {
                 if (fi.fieldUsage.type === 'result') {
                     if ((0, query_node_1.isScalarField)(fi.f)) {
-                        fieldsSQL.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${this.rootResult.groupSet}`) + ` as ${sqlName}`);
+                        fieldsSQL.push(this.parent.dialect.sqlQuoteIdentifier(`${name}__${this.rootResult.groupSet}`) + ` as ${sqlName}`);
                         dimensionIndexes.push(fieldIndex++);
                     }
                     else if ((0, query_node_1.isBasicCalculation)(fi.f)) {
-                        fieldsSQL.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${this.rootResult.groupSet}`), this.rootResult.groupSet, sqlName));
+                        fieldsSQL.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlQuoteIdentifier(`${name}__${this.rootResult.groupSet}`), this.rootResult.groupSet, sqlName));
                         fieldIndex++;
                     }
                 }
@@ -1348,7 +1364,7 @@ class QueryQuery extends query_node_1.QueryField {
                     fieldIndex++;
                 }
                 else if (fi.firstSegment.type === 'project') {
-                    fieldsSQL.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${this.rootResult.groupSet}`), this.rootResult.groupSet, sqlName));
+                    fieldsSQL.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlQuoteIdentifier(`${name}__${this.rootResult.groupSet}`), this.rootResult.groupSet, sqlName));
                     fieldIndex++;
                 }
             }
@@ -1375,7 +1391,7 @@ class QueryQuery extends query_node_1.QueryField {
     buildDialectFieldList(resultStruct) {
         const dialectFieldList = [];
         for (const [name, field] of resultStruct.allFields) {
-            const sqlName = this.parent.dialect.sqlMaybeQuoteIdentifier(name);
+            const sqlName = this.parent.dialect.sqlQuoteIdentifier(name);
             //
             if (resultStruct.firstSegment.type === 'reduce' &&
                 field instanceof field_instance_1.FieldInstanceResult) {
@@ -1390,7 +1406,7 @@ class QueryQuery extends query_node_1.QueryField {
                     };
                     dialectFieldList.push({
                         typeDef: multiLineNest,
-                        sqlExpression: this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultStruct.groupSet}`),
+                        sqlExpression: this.parent.dialect.sqlQuoteIdentifier(`${name}__${resultStruct.groupSet}`),
                         rawName: name,
                         sqlOutputName: sqlName,
                     });
@@ -1404,7 +1420,7 @@ class QueryQuery extends query_node_1.QueryField {
                     };
                     dialectFieldList.push({
                         typeDef: oneLineNest,
-                        sqlExpression: this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultStruct.groupSet}`),
+                        sqlExpression: this.parent.dialect.sqlQuoteIdentifier(`${name}__${resultStruct.groupSet}`),
                         rawName: name,
                         sqlOutputName: sqlName,
                     });
@@ -1415,7 +1431,7 @@ class QueryQuery extends query_node_1.QueryField {
                 field.fieldUsage.type === 'result') {
                 pushDialectField(dialectFieldList, {
                     fieldDef: field.f.fieldDef,
-                    sqlExpression: this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultStruct.groupSet}`),
+                    sqlExpression: this.parent.dialect.sqlQuoteIdentifier(`${name}__${resultStruct.groupSet}`),
                     rawName: name,
                     sqlOutputName: sqlName,
                 });
@@ -1449,10 +1465,10 @@ class QueryQuery extends query_node_1.QueryField {
             else {
                 orderingField = resultStruct.getFieldByNumber(ordering.field);
             }
-            const structField = this.parent.dialect.sqlMaybeQuoteIdentifier(orderingField.name);
+            const structField = this.parent.dialect.sqlQuoteIdentifier(orderingField.name);
             if (resultStruct.firstSegment.type === 'reduce') {
                 compiledOrderBy.push({
-                    field: this.parent.dialect.sqlMaybeQuoteIdentifier(`${orderingField.name}__${resultStruct.groupSet}`),
+                    field: this.parent.dialect.sqlQuoteIdentifier(`${orderingField.name}__${resultStruct.groupSet}`),
                     structField,
                     dir: ordering.dir || 'asc',
                 });
@@ -1607,7 +1623,7 @@ class QueryQueryIndexStage extends QueryQuery {
     }
     expandField(f) {
         const as = f.path.join('.');
-        const field = this.parent.getQueryFieldByName(f.path);
+        const field = this.parent.getQueryFieldByName(f.path, f.at);
         return { as, field };
     }
     expandFields(resultStruct) {
@@ -1636,12 +1652,12 @@ class QueryQueryIndexStage extends QueryQuery {
     generateSQL(stageWriter) {
         let measureSQL = 'COUNT(*)';
         const dialect = this.parent.dialect;
-        const fieldNameColumn = dialect.sqlMaybeQuoteIdentifier('fieldName');
-        const fieldPathColumn = dialect.sqlMaybeQuoteIdentifier('fieldPath');
-        const fieldValueColumn = dialect.sqlMaybeQuoteIdentifier('fieldValue');
-        const fieldTypeColumn = dialect.sqlMaybeQuoteIdentifier('fieldType');
-        const fieldRangeColumn = dialect.sqlMaybeQuoteIdentifier('fieldRange');
-        const weightColumn = dialect.sqlMaybeQuoteIdentifier('weight');
+        const fieldNameColumn = dialect.sqlQuoteIdentifier('fieldName');
+        const fieldPathColumn = dialect.sqlQuoteIdentifier('fieldPath');
+        const fieldValueColumn = dialect.sqlQuoteIdentifier('fieldValue');
+        const fieldTypeColumn = dialect.sqlQuoteIdentifier('fieldType');
+        const fieldRangeColumn = dialect.sqlQuoteIdentifier('fieldRange');
+        const weightColumn = dialect.sqlQuoteIdentifier('weight');
         const measureName = this.firstSegment.weightMeasure;
         if (measureName) {
             measureSQL = this.rootResult.getField(measureName).generateExpression();
@@ -1819,7 +1835,7 @@ class QueryQueryRaw extends QueryQuery {
         if (this.parent.structDef.type !== 'sql_select') {
             throw new Error('Invalid struct for QueryQueryRaw, currently only supports SQL');
         }
-        return stageWriter.addStage((0, sql_compiled_1.getCompiledSQL)(this.parent.structDef, (_a = this.parent.prepareResultOptions) !== null && _a !== void 0 ? _a : {}, path => this.parent.dialect.quoteTablePath(path), (query, opts) => {
+        return stageWriter.addStage((0, sql_compiled_1.getCompiledSQL)(this.parent.structDef, (_a = this.parent.prepareResultOptions) !== null && _a !== void 0 ? _a : {}, (query, opts) => {
             // Compile query to isolated SQL (not into parent's stageWriter)
             const ret = this.compileQueryToStages(query, opts !== null && opts !== void 0 ? opts : {}, undefined, false);
             return ret.sql;

package/dist/model/sql_compiled.d.ts

@@ -13,17 +13,15 @@ export type CompileQueryCallback = (query: Query, opts?: PrepareResultOptions) =
  *
  * @param src The SQLSourceDef to compile
  * @param opts PrepareResultOptions with buildManifest and connectionDigests
- * @param quoteTablePath Dialect function to safely quote a table path
  * @param compileQuery Callback to compile a Query to SQL
  */
-export declare function getCompiledSQL(src: SQLSourceDef, opts: PrepareResultOptions, quoteTablePath: (path: string) => string, compileQuery: CompileQueryCallback): string;
+export declare function getCompiledSQL(src: SQLSourceDef, opts: PrepareResultOptions, compileQuery: CompileQueryCallback): string;
 /**
  * Get the SQL for a PersistableSourceDef.
  *
  * @param source The persistable source to compile
- * @param quoteTablePath Dialect function to quote table paths
  * @param compileQuery Callback to compile a Query to SQL
  * @param opts Optional - if provided with manifest, nested sources may be substituted.
  *             Omit for "full SQL" (e.g., when computing BuildID).
  */
-export declare function getSourceSQL(source: PersistableSourceDef, quoteTablePath: (path: string) => string, compileQuery: CompileQueryCallback, opts?: PrepareResultOptions): string;
+export declare function getSourceSQL(source: PersistableSourceDef, compileQuery: CompileQueryCallback, opts?: PrepareResultOptions): string;

package/dist/model/sql_compiled.js

@@ -8,6 +8,7 @@ exports.getCompiledSQL = getCompiledSQL;
 exports.getSourceSQL = getSourceSQL;
 const malloy_types_1 = require("./malloy_types");
 const source_def_utils_1 = require("./source_def_utils");
+const malloy_compile_error_1 = require("./malloy_compile_error");
 /**
  * Compile a SQLSourceDef to its final SQL string.
  *
@@ -16,10 +17,9 @@ const source_def_utils_1 = require("./source_def_utils");
  *
  * @param src The SQLSourceDef to compile
  * @param opts PrepareResultOptions with buildManifest and connectionDigests
- * @param quoteTablePath Dialect function to safely quote a table path
  * @param compileQuery Callback to compile a Query to SQL
  */
-function getCompiledSQL(src, opts, quoteTablePath, compileQuery) {
+function getCompiledSQL(src, opts, compileQuery) {
     // If no segments, just return the pre-computed selectStr
     if (!src.selectSegments || src.selectSegments.length === 0) {
         return src.selectStr;
@@ -27,60 +27,63 @@ function getCompiledSQL(src, opts, quoteTablePath, compileQuery) {
     // Expand each segment
     const parts = [];
     for (const segment of src.selectSegments) {
-        parts.push(expandSegment(segment, opts, quoteTablePath, compileQuery));
+        parts.push(expandSegment(segment, opts, compileQuery));
     }
     return parts.join('');
 }
 /**
  * Expand a single SQLPhraseSegment to SQL.
  */
-function expandSegment(segment, opts, quoteTablePath, compileQuery) {
+function expandSegment(segment, opts, compileQuery) {
     // Plain SQL string
     if ((0, malloy_types_1.isSegmentSQL)(segment)) {
         return segment.sql;
     }
     // PersistableSourceDef (sql_select or query_source)
     if ((0, malloy_types_1.isSegmentSource)(segment)) {
-        return expandPersistableSource(segment, opts, quoteTablePath, compileQuery);
+        return expandPersistableSource(segment, opts, compileQuery);
     }
     // Query segment
-    return expandQuery(segment, opts, quoteTablePath, compileQuery);
+    return expandQuery(segment, opts, compileQuery);
 }
 /**
  * Expand a PersistableSourceDef, checking manifest for pre-built table.
  * Always returns a subquery form: (SELECT * FROM table) or (inline SQL)
  */
-function expandPersistableSource(source, opts, quoteTablePath, compileQuery) {
+function expandPersistableSource(source, opts, compileQuery) {
     const { buildManifest, connectionDigests } = opts;
     // Try manifest lookup if we have the required info (only for persistent sources)
     if (buildManifest && connectionDigests && source.persistent) {
         const connDigest = (0, malloy_types_1.safeRecordGet)(connectionDigests, source.connection);
         if (connDigest) {
             // Get the SQL for this source to compute BuildID (no opts = full SQL)
-            const sql = getSourceSQL(source, quoteTablePath, compileQuery);
+            const sql = getSourceSQL(source, compileQuery);
             const buildId = (0, source_def_utils_1.mkBuildID)(connDigest, sql);
             const entry = buildManifest.entries[buildId];
             if (entry) {
-                // Found in manifest - substitute with subquery from persisted table
-                return `(SELECT * FROM ${quoteTablePath(entry.tableName)})`;
+                // Found in manifest - substitute with subquery from persisted table.
+                // entry.tableName is canonical SQL, supplied by the manifest builder.
+                return `(SELECT * FROM ${entry.tableName})`;
             }
             // Not in manifest
             if (buildManifest.strict) {
-                const base = `Persist source '${source.sourceID}' not found in manifest (buildId: ${buildId})`;
-                throw new Error(buildManifest.loadError
+                const base = `Persist source '${source.sourceID}' not found in manifest ` +
+                    `(buildId: ${buildId}); strict manifest mode forbids fallback ` +
+                    'to live compilation.';
+                throw new malloy_compile_error_1.MalloyCompileError(buildManifest.loadError
                     ? `${base}\n  ${buildManifest.loadError}`
-                    : base);
+                    : base, 'runtime-manifest-strict-miss', source.location);
             }
         }
     }
     // No manifest or not found - expand inline as subquery
-    const sql = getSourceSQL(source, quoteTablePath, compileQuery, opts);
+    const sql = getSourceSQL(source, compileQuery, opts);
     return `(${sql})`;
 }
 /**
  * Expand a Query segment.
  */
-function expandQuery(query, opts, _quoteTablePath, compileQuery) {
+function expandQuery(query, opts, compileQuery) {
     // Set isPartialQuery so CTEs aren't used (they can't be nested in subqueries)
     const sql = compileQuery(query, { ...opts, isPartialQuery: true });
     return `(${sql})`;
@@ -89,15 +92,14 @@ function expandQuery(query, opts, _quoteTablePath, compileQuery) {
  * Get the SQL for a PersistableSourceDef.
  *
  * @param source The persistable source to compile
- * @param quoteTablePath Dialect function to quote table paths
  * @param compileQuery Callback to compile a Query to SQL
  * @param opts Optional - if provided with manifest, nested sources may be substituted.
  *             Omit for "full SQL" (e.g., when computing BuildID).
  */
-function getSourceSQL(source, quoteTablePath, compileQuery, opts) {
+function getSourceSQL(source, compileQuery, opts) {
     if (source.type === 'sql_select') {
         // Recursive call for nested sql_select
-        return getCompiledSQL(source, opts !== null && opts !== void 0 ? opts : {}, quoteTablePath, compileQuery);
+        return getCompiledSQL(source, opts !== null && opts !== void 0 ? opts : {}, compileQuery);
     }
     // query_source - compile the inner query
     return compileQuery(source.query, opts);

package/dist/test/test-models.js

@@ -194,7 +194,7 @@ function generateSQL(dialect, rows) {
             const sql = exprToSQL(typedValue.expr, dialect);
             if (idx === 0) {
                 // First row: include column aliases and explicit casts if needed
-                const quotedName = dialect.sqlMaybeQuoteIdentifier(colName);
+                const quotedName = dialect.sqlQuoteIdentifier(colName);
                 if (typedValue.needsCast) {
                     const sqlType = dialect.malloyTypeToSQLType(typedValue.malloyType);
                     fields.push(`CAST(${sql} AS ${sqlType}) AS ${quotedName}`);
@@ -225,7 +225,7 @@ function generateSQL(dialect, rows) {
     }
     // Multiple rows: wrap for sorting
     const quotedColumns = columnList
-        .map(col => dialect.sqlMaybeQuoteIdentifier(col))
+        .map(col => dialect.sqlQuoteIdentifier(col))
         .join(', ');
     const innerQuery = selects.join('\nUNION ALL ');
     // Generate ORDER BY based on dialect preference

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.394";
+export declare const MALLOY_VERSION = "0.0.396";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.394",
+  "version": "0.0.396",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -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.394",
-    "@malloydata/malloy-interfaces": "0.0.394",
-    "@malloydata/malloy-tag": "0.0.394",
+    "@malloydata/malloy-filter": "0.0.396",
+    "@malloydata/malloy-interfaces": "0.0.396",
+    "@malloydata/malloy-tag": "0.0.396",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",