@malloydata/malloy 0.0.239-dev250226010331 → 0.0.239-dev250227145856

package/dist/lang/test/parse.spec.js

@@ -25,6 +25,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const test_translator_1 = require("./test-translator");
 require("./parse-expects");
+const sql_block_1 = require("../../model/sql_block");
 describe('model statements', () => {
     describe('table method', () => {
         test('table method works', () => {
@@ -193,10 +194,11 @@ describe('error handling', () => {
         const needSchema = badTrans.translate();
         expect(needSchema.compileSQL).toBeDefined();
         if (needSchema.compileSQL) {
+            const key = (0, sql_block_1.sqlKey)(needSchema.compileSQL.connection, needSchema.compileSQL.selectStr);
             badTrans.update({
                 errors: {
                     compileSQL: {
-                        [needSchema.compileSQL.name]: 'Nobody ZZZZ',
+                        [key]: 'Nobody ZZZZ',
                     },
                 },
             });
@@ -243,7 +245,8 @@ describe('translation need error locations', () => {
         const req = m.translate().compileSQL;
         expect(req).toBeDefined();
         if (req) {
-            m.update({ errors: { compileSQL: { [req.name]: 'Bad SQL!' } } });
+            const key = (0, sql_block_1.sqlKey)(req.connection, req.selectStr);
+            m.update({ errors: { compileSQL: { [key]: 'Bad SQL!' } } });
         }
         expect(m).not.toTranslate();
         const errList = m.problems();
@@ -472,7 +475,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.translator.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toTranslate();
         }
@@ -486,7 +489,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.translator.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toTranslate();
         }
@@ -500,7 +503,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.translator.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toTranslate();
         }
@@ -515,7 +518,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.translator.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toTranslate();
         }
@@ -529,7 +532,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toTranslate();
         }
@@ -543,7 +546,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toTranslate();
         }
@@ -557,7 +560,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toLog((0, test_translator_1.errorMessage)('Cannot add view refinements to a source'));
         }
@@ -574,7 +577,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.translator.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toTranslate();
         }
@@ -588,7 +591,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toTranslate();
         }
@@ -602,7 +605,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toTranslate();
         }
@@ -616,7 +619,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toTranslate();
         }
@@ -631,7 +634,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toLog((0, test_translator_1.errorMessage)('A raw query cannot be refined'));
         }
@@ -645,7 +648,7 @@ describe('sql expressions', () => {
         expect(compileSql).toBeDefined();
         if (compileSql) {
             m.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
+                compileSQL: (0, test_translator_1.getSelectOneStruct)(compileSql),
             });
             expect(m).toLog((0, test_translator_1.errorMessage)('Cannot add view refinements to a source'));
         }

package/dist/lang/test/sql-block.spec.js

@@ -23,22 +23,24 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const sql_block_1 = require("../../model/sql_block");
 const test_translator_1 = require("./test-translator");
 require("./parse-expects");
 const parse_malloy_1 = require("../parse-malloy");
-const model_1 = require("../../model");
+const sql_block_1 = require("../../model/sql_block");
 describe('connection sql()', () => {
     const selStmt = 'SELECT * FROM aTable';
     function makeSchemaResponse(sql) {
         const cname = sql.connection || 'bigquery';
+        const key = (0, sql_block_1.sqlKey)(cname, sql.selectStr);
         return {
-            type: 'sql_select',
-            name: sql.name,
-            dialect: 'standardsql',
-            connection: cname,
-            selectStr: selStmt,
-            fields: test_translator_1.aTableDef.fields,
+            [key]: {
+                type: 'sql_select',
+                name: key,
+                dialect: 'standardsql',
+                connection: cname,
+                selectStr: selStmt,
+                fields: test_translator_1.aTableDef.fields,
+            },
         };
     }
     test('source from sql', () => {
@@ -51,9 +53,7 @@ describe('connection sql()', () => {
         const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
         expect(needs).toBeDefined();
         if (needs) {
-            const sql = (0, sql_block_1.makeSQLSentence)([{ sql: selStmt }], 'aConnection');
-            const refKey = needs.name;
-            model.update({ compileSQL: { [refKey]: makeSchemaResponse(sql) } });
+            model.update({ compileSQL: makeSchemaResponse(needs) });
             expect(model).toTranslate();
             const users = model.getSourceDef('malloyUsers');
             expect(users).toBeDefined();
@@ -74,8 +74,7 @@ describe('connection sql()', () => {
         const needReq = model.translate();
         const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
         expect(needs).toBeDefined();
-        const sql = (0, sql_block_1.makeSQLSentence)([{ sql: selStmt }], '_db_');
-        model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
+        model.update({ compileSQL: makeSchemaResponse(needs) });
         expect(model).toTranslate();
     });
     it('simple turducken', () => {
@@ -86,12 +85,7 @@ describe('connection sql()', () => {
         const compileSql = m.translate().compileSQL;
         expect(compileSql).toBeDefined();
         if (compileSql) {
-            const select = compileSql.select[0];
-            const star = compileSql.select[1];
-            const where = compileSql.select[2];
-            expect(select).toEqual({ sql: 'SELECT * FROM ' });
-            expect((0, model_1.isSegmentSQL)(star)).toBeFalsy();
-            expect(where).toEqual({ sql: ' WHERE 1=1' });
+            expect(compileSql.selectStr).toEqual('SELECT * FROM (SELECT \n   base.`astr` as `astr`\nFROM `aTable` as base\nGROUP BY 1\nORDER BY 1 asc\n) WHERE 1=1');
         }
     });
     it('turduckenzilla', () => {
@@ -132,8 +126,11 @@ describe('connection sql()', () => {
       source: sql_block is aConnection.sql("""${selStmt}""")
       source: malloy_source is sql_block extend { primary_key: ai }
     `);
-        const sql = (0, sql_block_1.makeSQLSentence)([{ sql: selStmt }], 'aConnection');
-        model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
+        expect(model).toParse();
+        const needReq = model.translate();
+        const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
+        expect(needs).toBeDefined();
+        model.update({ compileSQL: makeSchemaResponse(needs) });
         expect(model).toTranslate();
         const modelDef = (_a = model === null || model === void 0 ? void 0 : model.translate()) === null || _a === void 0 ? void 0 : _a.modelDef;
         // this tests the underlying api that .extendModel calls

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

@@ -1,9 +1,9 @@
-import { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, QueryFieldDef, StructDef, TurtleDef, SourceDef, SQLSourceDef, SQLSentence } from '../../model/malloy_types';
+import { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, QueryFieldDef, StructDef, TurtleDef, SourceDef, SQLSourceDef } from '../../model/malloy_types';
 import { MalloyElement } from '../ast';
 import { NameSpace } from '../ast/types/name-space';
 import { ModelEntry } from '../ast/types/model-entry';
 import { MalloyChildTranslator, MalloyTranslator } from '../parse-malloy';
-import { DataRequestResponse, TranslateResponse } from '../translate-response';
+import { DataRequestResponse, SQLSourceRequest, TranslateResponse } from '../translate-response';
 import { ExprValue } from '../ast/types/expr-value';
 import { LogSeverity, MessageCode, MessageParameterType } from '../parse-log';
 import { EventStream } from '../../runtime_types';
@@ -75,7 +75,9 @@ export declare function makeModelFunc(options: {
 }): (unmarked: TemplateStringsArray, ...marked: string[]) => HasTranslator<TestTranslator>;
 export declare function makeExprFunc(model: ModelDef, sourceName: string): (unmarked: TemplateStringsArray, ...marked: string[]) => HasTranslator<TestTranslator>;
 export declare function markSource(unmarked: TemplateStringsArray, ...marked: string[]): MarkedSource;
-export declare function getSelectOneStruct(sqlBlock: SQLSentence): SQLSourceDef;
+export declare function getSelectOneStruct(sqlBlock: SQLSourceRequest): {
+    [key: string]: SQLSourceDef;
+};
 export declare function error<T extends MessageCode>(code: T, data?: MessageParameterType<T>): {
     code: T;
     data: MessageParameterType<T> | undefined;

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

@@ -30,6 +30,7 @@ const ast_1 = require("../ast");
 const parse_malloy_1 = require("../parse-malloy");
 const static_space_1 = require("../ast/field-space/static-space");
 const global_name_space_1 = require("../ast/types/global-name-space");
+const sql_block_1 = require("../../model/sql_block");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/explicit-module-boundary-types
 function pretty(thing) {
     return (0, util_1.inspect)(thing, { breakLength: 72, depth: Infinity });
@@ -541,17 +542,16 @@ function markSource(unmarked, ...marked) {
 }
 exports.markSource = markSource;
 function getSelectOneStruct(sqlBlock) {
-    const selectThis = sqlBlock.select[0];
-    if (!(0, malloy_types_1.isSegmentSQL)(selectThis)) {
-        throw new Error('weird test support error sorry');
-    }
+    const key = (0, sql_block_1.sqlKey)(sqlBlock.connection, sqlBlock.selectStr);
     return {
-        type: 'sql_select',
-        name: sqlBlock.name,
-        dialect: 'standardsql',
-        connection: 'bigquery',
-        selectStr: selectThis.sql,
-        fields: [{ type: 'number', name: 'one' }],
+        [key]: {
+            type: 'sql_select',
+            name: key,
+            dialect: 'standardsql',
+            connection: 'bigquery',
+            selectStr: sqlBlock.selectStr,
+            fields: [{ type: 'number', name: 'one' }],
+        },
     };
 }
 exports.getSelectOneStruct = getSelectOneStruct;

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

@@ -1,4 +1,4 @@
-import { Annotation, ModelDef, SQLSentence } from '../model/malloy_types';
+import { Annotation, ModelDef } from '../model/malloy_types';
 import { MalloyElement } from './ast';
 import { LogMessage } from './parse-log';
 import { DocumentSymbol } from './parse-tree-walkers/document-symbol-walker';
@@ -25,9 +25,12 @@ export interface NeedSchemaData {
 export interface NeedURLData {
     urls: string[];
 }
+export interface SQLSourceRequest {
+    connection: string;
+    selectStr: string;
+}
 export interface NeedCompileSQL {
-    compileSQL: SQLSentence;
-    partialModel: ModelDef | undefined;
+    compileSQL: SQLSourceRequest;
 }
 interface NeededData extends NeedURLData, NeedSchemaData, NeedCompileSQL {
 }

package/dist/malloy.d.ts

@@ -3,7 +3,7 @@
 import { RunSQLOptions } from './run_sql_options';
 import { DocumentCompletion as DocumentCompletionDefinition, DocumentSymbol as DocumentSymbolDefinition, LogMessage, MalloyTranslator } from './lang';
 import { DocumentHelpContext } from './lang/parse-tree-walkers/document-help-context-walker';
-import { CompiledQuery, DocumentLocation, DocumentReference, BooleanFieldDef, JSONFieldDef, NumberFieldDef, StringFieldDef, FilterCondition, Query as InternalQuery, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQuery, QueryData, QueryDataRow, QueryResult, SearchIndexResult, SearchValueMapResult, StructDef, TurtleDef, NativeUnsupportedFieldDef, QueryRunStats, ImportLocation, Annotation, SQLSentence, SQLSourceDef, AtomicFieldDef, DateFieldDef, TimestampFieldDef, SourceDef, QueryToMaterialize } from './model';
+import { CompiledQuery, DocumentLocation, DocumentReference, BooleanFieldDef, JSONFieldDef, NumberFieldDef, StringFieldDef, FilterCondition, Query as InternalQuery, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQuery, QueryData, QueryDataRow, QueryResult, SearchIndexResult, SearchValueMapResult, StructDef, TurtleDef, NativeUnsupportedFieldDef, QueryRunStats, ImportLocation, Annotation, SQLSourceDef, AtomicFieldDef, DateFieldDef, TimestampFieldDef, SourceDef, QueryToMaterialize } from './model';
 import { EventStream, InvalidationKey, ModelString, ModelURL, QueryString, QueryURL, URLReader } from './runtime_types';
 import { Connection, FetchSchemaOptions, InfoConnection, LookupConnection } from './connection/types';
 import { Tag } from '@malloydata/malloy-tag';
@@ -87,11 +87,10 @@ export declare class Malloy {
      * @param model A compiled model to build upon (optional).
      * @return A (promise of a) compiled `Model`.
      */
-    static compile({ url, source, parse, urlReader, connections, model, refreshSchemaCache, noThrowOnError, eventStream, replaceMaterializedReferences, materializedTablePrefix, importBaseURL, cacheManager, }: {
+    static compile({ url, source, parse, urlReader, connections, model, refreshSchemaCache, noThrowOnError, eventStream, importBaseURL, cacheManager, }: {
         urlReader: URLReader;
         connections: LookupConnection<InfoConnection>;
         model?: Model;
-        replaceMaterializedReferences?: boolean;
         cacheManager?: CacheManager;
     } & Compilable & CompileOptions & CompileQueryOptions & ParseOptions): Promise<Model>;
     /**
@@ -103,7 +102,6 @@ export declare class Malloy {
         schemas: Record<string, import("./model").TableSourceDef>;
         errors: Record<string, string>;
     }>;
-    static compileSQLBlock(dialect: string, partialModel: ModelDef | undefined, toCompile: SQLSentence, options?: CompileQueryOptions): SQLSourceDef;
     /**
      * Run a fully-prepared query.
      *

package/dist/malloy.js

@@ -30,6 +30,7 @@ const dialect_1 = require("./dialect");
 const version_1 = require("./version");
 const uuid_1 = require("uuid");
 const annotation_1 = require("./annotation");
+const sql_block_1 = require("./model/sql_block");
 const MALLOY_INTERNAL_URL = 'internal://internal.malloy';
 class Malloy {
     static get version() {
@@ -76,7 +77,7 @@ class Malloy {
      * @param model A compiled model to build upon (optional).
      * @return A (promise of a) compiled `Model`.
      */
-    static async compile({ url, source, parse, urlReader, connections, model, refreshSchemaCache, noThrowOnError, eventStream, replaceMaterializedReferences, materializedTablePrefix, importBaseURL, cacheManager, }) {
+    static async compile({ url, source, parse, urlReader, connections, model, refreshSchemaCache, noThrowOnError, eventStream, importBaseURL, cacheManager, }) {
         var _a, _b, _c, _d, _e;
         let refreshTimestamp;
         if (refreshSchemaCache) {
@@ -243,31 +244,31 @@ class Malloy {
                     // Unlike other requests, these do not come in batches
                     const toCompile = result.compileSQL;
                     const connectionName = toCompile.connection;
+                    const key = (0, sql_block_1.sqlKey)(toCompile.connection, toCompile.selectStr);
                     try {
                         const conn = await connections.lookupConnection(connectionName);
-                        const expanded = Malloy.compileSQLBlock(conn.dialectName, result.partialModel, toCompile, {
-                            replaceMaterializedReferences,
-                            materializedTablePrefix,
-                            eventStream,
-                        });
-                        const resolved = await conn.fetchSchemaForSQLStruct(expanded, {
+                        const resolved = await conn.fetchSchemaForSQLStruct(toCompile, {
                             refreshTimestamp,
                             modelAnnotation,
                         });
                         if (resolved.error) {
                             translator.update({
-                                errors: { compileSQL: { [expanded.name]: resolved.error } },
+                                errors: {
+                                    compileSQL: {
+                                        [key]: resolved.error,
+                                    },
+                                },
                             });
                         }
                         if (resolved.structDef) {
                             translator.update({
-                                compileSQL: { [expanded.name]: resolved.structDef },
+                                compileSQL: { [key]: resolved.structDef },
                             });
                         }
                     }
                     catch (error) {
                         const errors = {};
-                        errors[toCompile.name] = error.toString();
+                        errors[key] = error.toString();
                         translator.update({ errors: { compileSQL: errors } });
                     }
                 }
@@ -288,41 +289,6 @@ class Malloy {
         }
         return ret;
     }
-    static compileSQLBlock(dialect, partialModel, toCompile, options) {
-        let queryModel = undefined;
-        let selectStr = '';
-        let parenAlready = false;
-        for (const segment of toCompile.select) {
-            if ((0, model_1.isSegmentSQL)(segment)) {
-                selectStr += segment.sql;
-                parenAlready = segment.sql.match(/\(\s*$/) !== null;
-            }
-            else {
-                // TODO catch exceptions and throw errors ...
-                if (!queryModel) {
-                    if (!partialModel) {
-                        throw new Error('Internal error: Partial model missing when compiling SQL block');
-                    }
-                    queryModel = new model_1.QueryModel(partialModel, options === null || options === void 0 ? void 0 : options.eventStream);
-                }
-                const compiledSql = queryModel.compileQuery(segment, {
-                    ...options,
-                    defaultRowLimit: undefined,
-                }, false).sql;
-                selectStr += parenAlready ? compiledSql : `(${compiledSql})`;
-                parenAlready = false;
-            }
-        }
-        const { name, connection } = toCompile;
-        return {
-            type: 'sql_select',
-            name,
-            connection,
-            dialect,
-            selectStr,
-            fields: [],
-        };
-    }
     static async run({ connections, preparedResult, sqlStruct, connection, options, }) {
         if (!connection) {
             if (!connections) {

package/dist/model/malloy_types.d.ts

@@ -603,11 +603,6 @@ export interface SQLStringSegment {
 }
 export type SQLPhraseSegment = Query | SQLStringSegment;
 export declare function isSegmentSQL(f: SQLPhraseSegment): f is SQLStringSegment;
-export interface SQLSentence {
-    name: string;
-    connection: string;
-    select: SQLPhraseSegment[];
-}
 export interface SQLSourceDef extends SourceDefBase {
     type: 'sql_select';
     selectStr: string;

package/dist/model/sql_block.d.ts

@@ -1,7 +1,4 @@
-import { SQLSentence, SQLPhraseSegment } from './malloy_types';
-/**
- * The factory for SQLSentences. Exists because the name is computed
- * from the components of the block and that name needs to be
- * unique, but predictable so that it can be used to cache schema fetches.
- */
-export declare function makeSQLSentence(select: SQLPhraseSegment[], connection: string): SQLSentence;
+import { SQLSourceRequest } from '../lang/translate-response';
+import { SQLPhraseSegment, ModelDef } from './malloy_types';
+export declare function compileSQLInterpolation(select: SQLPhraseSegment[], connection: string, partialModel: ModelDef | undefined): SQLSourceRequest;
+export declare function sqlKey(connectionName: string, sql: string): string;

package/dist/model/sql_block.js

@@ -22,32 +22,42 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSQLSentence = void 0;
+exports.sqlKey = exports.compileSQLInterpolation = void 0;
+const malloy_query_1 = require("./malloy_query");
 const malloy_types_1 = require("./malloy_types");
 const utils_1 = require("./utils");
-/**
- * The factory for SQLSentences. Exists because the name is computed
- * from the components of the block and that name needs to be
- * unique, but predictable so that it can be used to cache schema fetches.
- */
-function makeSQLSentence(select, connection) {
+function compileSQLInterpolation(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 {
+            // TODO catch exceptions and throw errors ...
+            if (!queryModel) {
+                if (!partialModel) {
+                    throw new Error('Internal error: Partial model missing when compiling SQL block');
+                }
+                queryModel = new malloy_query_1.QueryModel(partialModel);
+            }
+            const compiledSql = queryModel.compileQuery(segment, {
+                defaultRowLimit: undefined,
+            }, false).sql;
+            selectStr += parenAlready ? compiledSql : `(${compiledSql})`;
+            parenAlready = false;
+        }
+    }
     return {
-        name: `sql://${connection}/${nameFor(select)}`,
         connection,
-        select,
+        selectStr,
     };
 }
-exports.makeSQLSentence = makeSQLSentence;
-// This feels like wrongness on toast, before SQL contained a query we
-// could compute a stable hash from the select property to use to
-// indentify this piece of SQL. Now the actual SQL isn't known until
-// runtime and I am not certain what the right thing to do is, and
-// at this moment when I am still trying to imagine how this is all
-// going to work, I am using stringify(), but I suspect I will be back
-// here for later, and that the whole "how to determine the name of a query"
-// algorithm needs to change
-function nameFor(select) {
-    const phrases = select.map(el => (0, malloy_types_1.isSegmentSQL)(el) ? el.sql : JSON.stringify(el));
-    return (0, utils_1.generateHash)(phrases.join(';'));
+exports.compileSQLInterpolation = compileSQLInterpolation;
+function sqlKey(connectionName, sql) {
+    return `sql://${connectionName}/${(0, utils_1.generateHash)(sql)}`;
 }
+exports.sqlKey = sqlKey;
 //# sourceMappingURL=sql_block.js.map

package/dist/to_stable.js

@@ -33,6 +33,15 @@ function modelDefToModelInfo(modelDef) {
             modelInfo.entries.push(queryInfo);
         }
     }
+    for (const query of modelDef.queryList) {
+        const outputStruct = (0, malloy_query_1.getResultStructDefForQuery)(modelDef, query);
+        const queryInfo = {
+            schema: {
+                fields: convertFieldInfos(outputStruct, outputStruct.fields),
+            },
+        };
+        modelInfo.anonymous_queries.push(queryInfo);
+    }
     return modelInfo;
 }
 exports.modelDefToModelInfo = modelDefToModelInfo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.239-dev250226010331",
+  "version": "0.0.239-dev250227145856",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,8 +41,8 @@
     "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-interfaces": "^0.0.239-dev250226010331",
-    "@malloydata/malloy-tag": "^0.0.239-dev250226010331",
+    "@malloydata/malloy-interfaces": "^0.0.239-dev250227145856",
+    "@malloydata/malloy-tag": "^0.0.239-dev250227145856",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jest-diff": "^29.6.2",