@malloydata/malloy 0.0.394 → 0.0.395

package/dist/lang/ast/source-elements/table-source.js

@@ -22,24 +22,38 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableFunctionSource = exports.TableMethodSource = exports.TableSource = void 0;
+exports.TableMethodSource = exports.TableSource = void 0;
 const find_external_references_1 = require("../../parse-tree-walkers/find-external-references");
 const source_1 = require("./source");
 const error_factory_1 = require("../error-factory");
+const dialect_1 = require("../../../dialect");
 class TableSource extends source_1.Source {
     getSourceDef() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const info = this.getTableInfo();
         if (info === undefined) {
             return error_factory_1.ErrorFactory.structDef;
         }
-        const { tablePath, connectionName } = info;
+        const { tablePath: rawTablePath, connectionName } = info;
+        // Re-validate the table path. ImportsAndTablesStep validated and
+        // silently skipped invalid entries; we re-validate here so we can
+        // log a precise translator error at the AST element's location.
+        let tablePath = rawTablePath;
+        const dialectName = (_a = this.translator()) === null || _a === void 0 ? void 0 : _a.root.connectionDialectZone.get(connectionName);
+        if (dialectName !== undefined) {
+            const validation = (0, dialect_1.getDialect)(dialectName).sqlValidateTableName(rawTablePath);
+            if (!validation.ok) {
+                this.logError('invalid-table-path', validation.error);
+                return error_factory_1.ErrorFactory.structDef;
+            }
+            tablePath = validation.canonical;
+        }
         const key = (0, find_external_references_1.constructTableKey)(connectionName, tablePath);
-        const tableDefEntry = (_a = this.translator()) === null || _a === void 0 ? void 0 : _a.root.schemaZone.getEntry(key);
+        const tableDefEntry = (_b = this.translator()) === null || _b === void 0 ? void 0 : _b.root.schemaZone.getEntry(key);
         let msg = `Schema read failure for table '${tablePath}' for connection '${connectionName}'`;
         if (tableDefEntry) {
             if (tableDefEntry.status === 'present') {
-                (_b = this.document()) === null || _b === void 0 ? void 0 : _b.checkExperimentalDialect(this, tableDefEntry.value.dialect);
+                (_c = this.document()) === null || _c === void 0 ? void 0 : _c.checkExperimentalDialect(this, tableDefEntry.value.dialect);
                 tableDefEntry.value.location = this.location;
                 tableDefEntry.value.fields.forEach(field => {
                     field.location = this.location;
@@ -58,7 +72,7 @@ class TableSource extends source_1.Source {
                     }),
                     location: this.location,
                 };
-                (_c = this.document()) === null || _c === void 0 ? void 0 : _c.rememberToAddModelAnnotations(ret);
+                (_d = this.document()) === null || _d === void 0 ? void 0 : _d.rememberToAddModelAnnotations(ret);
                 return ret;
             }
             if (tableDefEntry.status === 'error') {
@@ -96,17 +110,4 @@ class TableMethodSource extends TableSource {
     }
 }
 exports.TableMethodSource = TableMethodSource;
-class TableFunctionSource extends TableSource {
-    constructor(tableURI) {
-        super();
-        this.tableURI = tableURI;
-        this.elementType = 'tableFunctionSource';
-    }
-    getTableInfo() {
-        // This use of `deprecatedParseTableURI` is ok because it is for handling the
-        // old, soon-to-be-deprecated table syntax.
-        return (0, find_external_references_1.deprecatedParseTableURI)(this.tableURI);
-    }
-}
-exports.TableFunctionSource = TableFunctionSource;
 //# sourceMappingURL=table-source.js.map

package/dist/lang/parse-log.d.ts

@@ -275,6 +275,7 @@ type MessageParameterTypes = {
     'parameter-name-conflict': string;
     'parameter-shadowing-field': string;
     'invalid-import-url': string;
+    'invalid-table-path': string;
     'no-translator-for-import': string;
     'name-conflict-on-selective-import': string;
     'selective-import-not-found': string;

package/dist/lang/parse-malloy.js

@@ -61,6 +61,7 @@ const ast = __importStar(require("./ast"));
 const malloy_to_ast_1 = require("./malloy-to-ast");
 const parse_log_1 = require("./parse-log");
 const find_external_references_1 = require("./parse-tree-walkers/find-external-references");
+const dialect_1 = require("../dialect");
 const zone_1 = require("./zone");
 const document_symbol_walker_1 = require("./parse-tree-walkers/document-symbol-walker");
 const document_completion_walker_1 = require("./parse-tree-walkers/document-completion-walker");
@@ -140,12 +141,9 @@ class ImportsAndTablesStep {
         }
         if (!this.parseReferences) {
             this.parseReferences = (0, find_external_references_1.findReferences)(that, parseReq.parse.tokenStream, parseReq.parse.root);
-            for (const ref in this.parseReferences.tables) {
-                that.root.schemaZone.reference(ref, {
-                    url: that.sourceURL,
-                    range: this.parseReferences.tables[ref].firstReference,
-                });
-            }
+            // Register connection dialects and imports immediately. Table
+            // references are deferred until dialects are resolved, because
+            // validating a table path requires knowing its dialect's grammar.
             for (const connName in this.parseReferences.connectionDialects) {
                 that.root.connectionDialectZone.reference(connName, {
                     url: that.sourceURL,
@@ -180,17 +178,49 @@ class ImportsAndTablesStep {
             return { timingInfo: parseReq.timingInfo };
         }
         let allMissing = {};
+        // Validate each table reference against its dialect's grammar (if
+        // the dialect is resolved) and register the canonical entry. Bad
+        // paths are silently dropped — the AST step re-validates and logs
+        // an error at the precise source range. Entries whose dialect
+        // isn't resolved yet are preserved unchanged and re-processed on a
+        // later step.
+        {
+            const refs = this.parseReferences.tables;
+            const canonical = {};
+            for (const rawKey in refs) {
+                const info = refs[rawKey];
+                let { tablePath } = info;
+                const dialectName = that.root.connectionDialectZone.get(info.connectionName);
+                if (dialectName !== undefined) {
+                    const result = (0, dialect_1.getDialect)(dialectName).sqlValidateTableName(tablePath);
+                    if (!result.ok)
+                        continue;
+                    tablePath = result.canonical;
+                }
+                const key = `${info.connectionName}:${tablePath}`;
+                canonical[key] = { ...info, tablePath };
+                that.root.schemaZone.reference(key, {
+                    url: that.sourceURL,
+                    range: info.firstReference,
+                });
+            }
+            this.parseReferences.tables = canonical;
+        }
         const missingTables = that.root.schemaZone.getUndefined();
         if (missingTables) {
             const tables = {};
             for (const key of missingTables) {
                 const info = this.parseReferences.tables[key];
+                if (info === undefined)
+                    continue;
                 tables[key] = {
                     connectionName: info.connectionName,
                     tablePath: info.tablePath,
                 };
             }
-            allMissing = { tables };
+            if (Object.keys(tables).length > 0) {
+                allMissing = { tables };
+            }
         }
         const missingDialects = that.root.connectionDialectZone.getUndefined();
         if (missingDialects) {

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

@@ -4,27 +4,14 @@ import type { DocumentRange } from '../../model/malloy_types';
 import type { MalloyTranslation } from '../parse-malloy';
 type NeedImports = Record<string, DocumentRange>;
 type NeedTables = Record<string, {
-    connectionName: string | undefined;
+    connectionName: string;
     tablePath: string;
     firstReference: DocumentRange;
 }>;
 type NeedConnectionDialects = Record<string, {
     firstReference: DocumentRange;
 }>;
-export declare function constructTableKey(connectionName: string | undefined, tablePath: string): string;
-/**
- * This function parses an old-style `tableURI` into a connection name and
- * table path. The name includes `deprecated` because it should only be used
- * in the (deprecated) old-style `table('conn:tab')` syntax. Any use of this
- * anywhere else is bad.
- * @param tableURI The sting that is passed into the `table('conn:tab')` syntax.
- * @returns A connection name and table path.
- * @deprecated
- */
-export declare function deprecatedParseTableURI(tableURI: string): {
-    connectionName?: string;
-    tablePath: string;
-};
+export declare function constructTableKey(connectionName: string, tablePath: string): string;
 export interface FindReferencesData {
     tables: NeedTables;
     urls: NeedImports;

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

@@ -23,7 +23,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constructTableKey = constructTableKey;
-exports.deprecatedParseTableURI = deprecatedParseTableURI;
 exports.findReferences = findReferences;
 const ParseTreeWalker_1 = require("antlr4ts/tree/ParseTreeWalker");
 const parse_utils_1 = require("../parse-utils");
@@ -70,6 +69,11 @@ class FindExternalReferences {
         const tablePath = getPlainString(pcx.tablePath());
         const reference = this.trans.rangeFromContext(pcx);
         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 };
+        }
     }
     enterVirtualSource(pcx) {
         const connId = (0, parse_utils_1.getId)(pcx.connectionId());
@@ -87,28 +91,7 @@ class FindExternalReferences {
     }
 }
 function constructTableKey(connectionName, tablePath) {
-    return connectionName === undefined
-        ? tablePath
-        : `${connectionName}:${tablePath}`;
-}
-/**
- * This function parses an old-style `tableURI` into a connection name and
- * table path. The name includes `deprecated` because it should only be used
- * in the (deprecated) old-style `table('conn:tab')` syntax. Any use of this
- * anywhere else is bad.
- * @param tableURI The sting that is passed into the `table('conn:tab')` syntax.
- * @returns A connection name and table path.
- * @deprecated
- */
-function deprecatedParseTableURI(tableURI) {
-    const parts = tableURI.match(/^([^:]*):(.*)$/);
-    if (parts) {
-        const [, firstPart, secondPart] = parts;
-        return { connectionName: firstPart, tablePath: secondPart };
-    }
-    else {
-        return { tablePath: tableURI };
-    }
+    return `${connectionName}:${tablePath}`;
 }
 function findReferences(trans, tokens, parseTree) {
     const finder = new FindExternalReferences(trans, tokens);

package/dist/lang/translate-response.d.ts

@@ -22,7 +22,7 @@ export interface ProblemResponse {
 export type FatalResponse = FinalResponse & ProblemResponse;
 export interface NeedSchemaData {
     tables: Record<string, {
-        connectionName: string | undefined;
+        connectionName: string;
         tablePath: string;
     }>;
 }

package/dist/model/filter_compilers.js

@@ -129,7 +129,7 @@ exports.FilterCompilers = {
         // For some databases checking NULL combined with a boolean check
         // is faster than a COALESCE, for now, just detect if the expression
         // is just a column reference, and if so, don't use COALECSE.
-        const quoteChar = d.sqlMaybeQuoteIdentifier('select')[0];
+        const quoteChar = d.sqlQuoteIdentifier('select')[0];
         const isColumn = x.match(`^[()${quoteChar}\\w.]+$`);
         if (isColumn) {
             if (bc.operator === 'true') {

package/dist/model/query_model_impl.js

@@ -107,12 +107,12 @@ class QueryModelImpl {
             const fieldNames = [];
             for (const f of ret.outputStruct.fields) {
                 if ((0, malloy_types_1.isAtomic)(f)) {
-                    const quoted = q.parent.dialect.sqlMaybeQuoteIdentifier(f.name);
+                    const quoted = q.parent.dialect.sqlQuoteIdentifier(f.name);
                     fieldNames.push(quoted);
                 }
             }
             // const fieldNames = getAtomicFields(ret.outputStruct).map(fieldDef =>
-            //   q.parent.dialect.sqlMaybeQuoteIdentifier(fieldDef.name)
+            //   q.parent.dialect.sqlQuoteIdentifier(fieldDef.name)
             // );
             ret.lastStageName = stageWriter.addStage(q.parent.dialect.sqlFinalStage(ret.lastStageName, fieldNames));
         }
@@ -217,11 +217,11 @@ class QueryModelImpl {
                 },
             ],
         };
-        const fieldNameColumn = d.sqlMaybeQuoteIdentifier('fieldName');
-        const fieldPathColumn = d.sqlMaybeQuoteIdentifier('fieldPath');
-        const fieldValueColumn = d.sqlMaybeQuoteIdentifier('fieldValue');
-        const fieldTypeColumn = d.sqlMaybeQuoteIdentifier('fieldType');
-        const weightColumn = d.sqlMaybeQuoteIdentifier('weight');
+        const fieldNameColumn = d.sqlQuoteIdentifier('fieldName');
+        const fieldPathColumn = d.sqlQuoteIdentifier('fieldPath');
+        const fieldValueColumn = d.sqlQuoteIdentifier('fieldValue');
+        const fieldTypeColumn = d.sqlQuoteIdentifier('fieldType');
+        const weightColumn = d.sqlQuoteIdentifier('weight');
         // if we've compiled the SQL before use it otherwise
         let sqlPDT = this.exploreSearchSQLMap.get(explore);
         if (sqlPDT === undefined) {

package/dist/model/query_query.js

@@ -517,14 +517,17 @@ 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}'`);
                 }
-                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 +536,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,8 +554,9 @@ 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})`;
@@ -631,7 +635,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 +768,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 +850,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();
@@ -863,7 +867,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 +891,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 +941,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 +960,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 +979,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 +1090,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 +1124,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.
@@ -1225,7 +1229,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 +1333,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 +1352,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 +1379,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 +1394,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 +1408,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 +1419,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 +1453,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',
                 });
@@ -1636,12 +1640,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 +1823,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

@@ -16,10 +16,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,42 +26,43 @@ 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) {
@@ -74,13 +74,13 @@ function expandPersistableSource(source, opts, quoteTablePath, compileQuery) {
         }
     }
     // 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 +89,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);