@malloydata/malloy 0.0.11-dev221202152346 → 0.0.11

package/dist/malloy.d.ts

@@ -2,7 +2,7 @@
 import { InfoConnection } from ".";
 import { DocumentHighlight as DocumentHighlightDefinition, DocumentSymbol as DocumentSymbolDefinition, DocumentCompletion as DocumentCompletionDefinition, LogMessage, MalloyTranslator } from "./lang";
 import { DocumentHelpContext } from "./lang/parse-tree-walkers/document-help-context-walker";
-import { CompiledQuery, FieldBooleanDef, FieldDateDef, FieldNumberDef, FieldStringDef, FieldTimestampDef, FieldTypeDef, FilterExpression, ModelDef, Query as InternalQuery, QueryData, QueryDataRow, QueryResult, StructDef, TurtleDef, SQLBlock, DocumentReference, DocumentPosition as ModelDocumentPosition, SearchIndexResult, SearchValueMapResult, NamedQuery } from "./model";
+import { CompiledQuery, FieldBooleanDef, FieldDateDef, FieldNumberDef, FieldStringDef, FieldTimestampDef, FieldTypeDef, FilterExpression, ModelDef, Query as InternalQuery, QueryData, QueryDataRow, QueryResult, StructDef, TurtleDef, SQLBlock, DocumentReference, DocumentPosition as ModelDocumentPosition, SearchIndexResult, SearchValueMapResult, NamedQuery, SQLBlockStructDef } from "./model";
 import { LookupConnection, ModelString, ModelURL, QueryString, QueryURL, URLReader, Connection } from "./runtime_types";
 export interface Loggable {
     debug: (message?: any, ...optionalParams: any[]) => void;
@@ -56,7 +56,7 @@ export declare class Malloy {
         parse: Parse;
         model?: Model;
     }): Promise<Model>;
-    private static runSQLBlockAndFetchResultSchema;
+    private static compileSQLBlock;
     /**
      * Run a fully-prepared query.
      *
@@ -76,22 +76,22 @@ export declare class Malloy {
     }): Promise<Result>;
     static run(params: {
         connection: Connection;
-        sqlBlock: SQLBlock;
+        sqlStruct: SQLBlockStructDef;
         options?: RunSQLOptions;
     }): Promise<Result>;
     static run(params: {
         connections: LookupConnection<Connection>;
-        sqlBlock: SQLBlock;
+        sqlStruct: SQLBlockStructDef;
         options?: RunSQLOptions;
     }): Promise<Result>;
     static run(params: {
         connection: Connection;
-        sqlBlock: SQLBlock;
+        sqlStruct: SQLBlockStructDef;
         options?: RunSQLOptions;
     }): Promise<Result>;
     static run(params: {
         connections: LookupConnection<Connection>;
-        sqlBlock: SQLBlock;
+        sqlStruct: SQLBlockStructDef;
         options?: RunSQLOptions;
     }): Promise<Result>;
     static runStream(params: {
@@ -106,7 +106,7 @@ export declare class Malloy {
     }): AsyncIterableIterator<DataRecord>;
     static runStream(params: {
         connection: Connection;
-        sqlBlock: SQLBlock;
+        sqlStruct: SQLBlockStructDef;
         options?: RunSQLOptions;
     }): AsyncIterableIterator<DataRecord>;
     static runStream(params: {
@@ -116,12 +116,12 @@ export declare class Malloy {
     }): AsyncIterableIterator<DataRecord>;
     static runStream(params: {
         connection: Connection;
-        sqlBlock: SQLBlock;
+        sqlStruct: SQLBlockStructDef;
         options?: RunSQLOptions;
     }): AsyncIterableIterator<DataRecord>;
     static runStream(params: {
         connections: LookupConnection<Connection>;
-        sqlBlock: SQLBlock;
+        sqlStruct: SQLBlockStructDef;
         options?: RunSQLOptions;
     }): AsyncIterableIterator<DataRecord>;
 }
@@ -143,7 +143,7 @@ export declare class Model {
     private queryList;
     private sqlBlocks;
     _referenceAt: (location: ModelDocumentPosition) => DocumentReference | undefined;
-    constructor(modelDef: ModelDef, queryList: InternalQuery[], sqlBlocks: SQLBlock[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined);
+    constructor(modelDef: ModelDef, queryList: InternalQuery[], sqlBlocks: SQLBlockStructDef[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined);
     /**
      * Retrieve a document reference for the token at the given position within
      * the document that produced this model.
@@ -172,14 +172,14 @@ export declare class Model {
      * @param queryName Name of the query to retrieve.
      * @returns A prepared query.
      */
-    getSQLBlockByName(sqlBlockName: string): SQLBlock;
+    getSQLBlockByName(sqlBlockName: string): SQLBlockStructDef;
     /**
      * Retrieve a prepared query by the name of a query at the top level of the model.
      *
      * @param index Index of the SQL Block to retrieve.
      * @returns A prepared query.
      */
-    getSQLBlockByIndex(index: number): SQLBlock;
+    getSQLBlockByIndex(index: number): SQLBlockStructDef;
     /**
      * Retrieve a prepared query for the final unnamed query at the top level of a model.
      *
@@ -708,9 +708,9 @@ export declare class Runtime {
      *
      * @param model The model URL or contents to load and (eventually) compile to retrieve the requested query.
      * @param name The name of the sql block to use within the model.
-     * @returns A promise of a `SQLBlock`.
+     * @returns A promise of a `CompiledSQLBlock`.
      */
-    getSQLBlockByName(model: ModelURL | ModelString, name: string): Promise<SQLBlock>;
+    getSQLBlockByName(model: ModelURL | ModelString, name: string): Promise<SQLBlockStructDef>;
     /**
      * Get a SQL block by the URL or contents of a Malloy model document
      * and the name of a query contained in the model.
@@ -719,7 +719,7 @@ export declare class Runtime {
      * @param index The index of the SQL block to use within the model. Note: named blocks are indexable, too.
      * @returns A promise of a `SQLBlock`.
      */
-    getSQLBlockByIndex(model: ModelURL | ModelString, index: number): Promise<SQLBlock>;
+    getSQLBlockByIndex(model: ModelURL | ModelString, index: number): Promise<SQLBlockStructDef>;
 }
 export declare class ConnectionRuntime extends Runtime {
     readonly rawConnections: Connection[];
@@ -741,7 +741,7 @@ declare class FluentState<T> {
     protected makeQueryMaterializer(materialize: () => Promise<PreparedQuery>): QueryMaterializer;
     protected makeExploreMaterializer(materialize: () => Promise<Explore>): ExploreMaterializer;
     protected makePreparedResultMaterializer(materialize: () => Promise<PreparedResult>): PreparedResultMaterializer;
-    protected makeSQLBlockMaterializer(materialize: () => Promise<SQLBlock>): SQLBlockMaterializer;
+    protected makeSQLBlockMaterializer(materialize: () => Promise<SQLBlockStructDef>): SQLBlockMaterializer;
 }
 /**
  * An object representing the task of loading a `Model`, capable of
@@ -833,7 +833,7 @@ export declare class ModelMaterializer extends FluentState<Model> {
      * @param name The name of the SQL Block to load.
      * @returns A promise of a `SQLBlock`.
      */
-    getSQLBlockByName(name: string): Promise<SQLBlock>;
+    getSQLBlockByName(name: string): Promise<SQLBlockStructDef>;
     /**
      * Get a SQL Block by index.
      *
@@ -842,7 +842,7 @@ export declare class ModelMaterializer extends FluentState<Model> {
      *
      * TODO feature-sql-block Should named SQL blocks be indexable? This is not the way unnamed queries work.
      */
-    getSQLBlockByIndex(index: number): Promise<SQLBlock>;
+    getSQLBlockByIndex(index: number): Promise<SQLBlockStructDef>;
     _loadQueryFromQueryDef(query: InternalQuery): QueryMaterializer;
     /**
      * Load an explore contained within this loaded `Model` by name.
@@ -940,7 +940,7 @@ export declare class PreparedResultMaterializer extends FluentState<PreparedResu
  * materializing the SQLBlock (via `getSQLBlock()`) or extending the task run
  * the query.
  */
-export declare class SQLBlockMaterializer extends FluentState<SQLBlock> {
+export declare class SQLBlockMaterializer extends FluentState<SQLBlockStructDef> {
     /**
      * Run this SQL block.
      *
@@ -955,7 +955,7 @@ export declare class SQLBlockMaterializer extends FluentState<SQLBlock> {
      *
      * @returns A promise of a SQL block.
      */
-    getSQLBlock(): Promise<SQLBlock>;
+    getSQLBlock(): Promise<SQLBlockStructDef>;
     /**
      * Materialize the SQL of this loaded SQL block.
      *

package/dist/malloy.js

@@ -131,85 +131,84 @@ class Malloy {
                         }
                     }
                 }
-                if (result.sqlStructs) {
-                    // collect sql refs by connection name since there may be multiple connections
-                    const sqlRefsByConnection = new Map();
-                    for (const missingSQLSchemaRef of result.sqlStructs) {
-                        const connectionName = missingSQLSchemaRef.connection;
-                        // if (connectionName === undefined) {
-                        //   throw new Error("Oops have not made it required here yet...");
-                        // }
-                        let connectionToSQLReferencesMap = sqlRefsByConnection.get(connectionName);
-                        if (!connectionToSQLReferencesMap) {
-                            connectionToSQLReferencesMap = [missingSQLSchemaRef];
-                        }
-                        else {
-                            connectionToSQLReferencesMap.push(missingSQLSchemaRef);
-                        }
-                        sqlRefsByConnection.set(connectionName, connectionToSQLReferencesMap);
-                    }
-                    for (const [connectionName, connectionToSQLReferencesMap,] of sqlRefsByConnection) {
-                        try {
-                            const connection = await connections.lookupConnection(connectionName);
-                            // TODO detect if the union of `Object.keys(sqlStructs)` and `Object.keys(errors)` is not the same
-                            //      as `Object.keys(connectionToSQLReferencesMap)`, i.e. that all tables are accounted for. Otherwise
-                            //      the translator runs into an infinite loop fetching SQL structs.
-                            const { schemas: sqlStructs, errors } = await connection.fetchSchemaForSQLBlocks(connectionToSQLReferencesMap);
-                            translator.update({ sqlStructs });
-                            translator.update({ sqlStructs, errors: { sqlStructs: errors } });
+                if (result.compileSQL) {
+                    // Unlike other requests, these do not come in batches
+                    const toCompile = result.compileSQL;
+                    const connectionName = toCompile.connection;
+                    try {
+                        const conn = await connections.lookupConnection(connectionName);
+                        const expanded = Malloy.compileSQLBlock(result.partialModel, toCompile);
+                        const resolved = await conn.fetchSchemaForSQLBlock(expanded);
+                        if (resolved.error) {
+                            translator.update({
+                                errors: { compileSQL: { [expanded.name]: resolved.error } },
+                            });
                         }
-                        catch (error) {
-                            // There was an exception getting the connection, associate that error
-                            // with all its schemas
-                            const sqlStructs = {};
-                            const errors = {};
-                            for (const sqlRef of connectionToSQLReferencesMap) {
-                                errors[sqlRef.name] = error.toString();
+                        if (resolved.structDef) {
+                            if ((0, model_1.isSQLBlock)(resolved.structDef)) {
+                                translator.update({
+                                    compileSQL: { [expanded.name]: resolved.structDef },
+                                });
                             }
-                            translator.update({ sqlStructs, errors: { sqlStructs: errors } });
                         }
                     }
+                    catch (error) {
+                        const errors = {};
+                        errors[toCompile.name] = error.toString();
+                        translator.update({ errors: { compileSQL: errors } });
+                    }
                 }
             }
         }
     }
-    static async runSQLBlockAndFetchResultSchema(connection, sqlBlock, options) {
-        if (connection.canFetchSchemaAndRunSimultaneously()) {
-            return connection.runSQLBlockAndFetchResultSchema(sqlBlock, options);
-        }
-        const [schema, data] = await Promise.all([
-            connection
-                .fetchSchemaForSQLBlocks([sqlBlock])
-                .then((result) => result.schemas[sqlBlock.name]),
-            connection.runSQL(sqlBlock.select),
-        ]);
-        return { schema, data };
+    static compileSQLBlock(partialModel, toCompile) {
+        let queryModel;
+        const sqlStrings = toCompile.select.map((segment) => {
+            if ((0, model_1.isSQLFragment)(segment)) {
+                return segment.sql;
+            }
+            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);
+                }
+                return queryModel.compileQuery(segment).sql;
+            }
+        });
+        const { name, connection } = toCompile;
+        return {
+            type: "sqlBlock",
+            name,
+            connection,
+            selectStr: sqlStrings.join(""),
+        };
     }
-    static async run({ connections, preparedResult, sqlBlock, connection, options, }) {
-        if (sqlBlock === undefined && preparedResult === undefined) {
-            throw new Error("Internal error: sqlBlock or preparedResult must be provided.");
-        }
-        const connectionName = (sqlBlock === null || sqlBlock === void 0 ? void 0 : sqlBlock.connection) || (preparedResult === null || preparedResult === void 0 ? void 0 : preparedResult.connectionName);
-        if (connection === undefined) {
-            if (connections === undefined) {
+    static async run({ connections, preparedResult, sqlStruct, connection, options, }) {
+        const sqlBlock = sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.structSource.sqlBlock;
+        if (!connection) {
+            if (!connections) {
                 throw new Error("Internal Error: Connection or LookupConnection<Connection> must be provided.");
             }
+            const connectionName = (sqlBlock === null || sqlBlock === void 0 ? void 0 : sqlBlock.connection) || (preparedResult === null || preparedResult === void 0 ? void 0 : preparedResult.connectionName);
             connection = await connections.lookupConnection(connectionName);
         }
-        if (sqlBlock !== undefined) {
-            const { schema, data } = await this.runSQLBlockAndFetchResultSchema(connection, sqlBlock, options);
-            if (schema.structRelationship.type !== "basetable") {
+        if (sqlStruct && sqlBlock) {
+            if (sqlStruct.structRelationship.type !== "basetable") {
                 throw new Error("Expected schema's structRelationship type to be 'basetable'.");
             }
+            const data = await connection.runSQL(sqlBlock.selectStr);
             return new Result({
-                structs: [schema],
-                sql: sqlBlock.select,
+                structs: [sqlStruct],
+                sql: sqlBlock.selectStr,
                 result: data.rows,
                 totalRows: data.totalRows,
-                lastStageName: schema.name,
+                lastStageName: sqlBlock.name,
                 // TODO feature-sql-block There is no malloy code...
                 malloy: "",
-                connectionName: schema.structRelationship.connectionName,
+                connectionName: sqlStruct.structRelationship.connectionName,
                 // TODO feature-sql-block There is no source explore...
                 sourceExplore: "",
                 sourceFilters: [],
@@ -219,7 +218,7 @@ class Malloy {
                 contents: {},
             });
         }
-        else if (preparedResult !== undefined) {
+        else if (preparedResult) {
             const result = await connection.runSQL(preparedResult.sql, options);
             return new Result({
                 ...preparedResult._rawQuery,
@@ -228,10 +227,11 @@ class Malloy {
             }, preparedResult._modelDef);
         }
         else {
-            throw new Error("Internal error: sqlBlock or preparedResult must be provided.");
+            throw new Error("Internal error: sqlStruct or preparedResult must be provided.");
         }
     }
-    static async *runStream({ connections, preparedResult, sqlBlock, connection, options, }) {
+    static async *runStream({ connections, preparedResult, sqlStruct, connection, options, }) {
+        const sqlBlock = sqlStruct === null || sqlStruct === void 0 ? void 0 : sqlStruct.structSource.sqlBlock;
         if (sqlBlock === undefined && preparedResult === undefined) {
             throw new Error("Internal error: sqlBlock or preparedResult must be provided.");
         }
@@ -248,21 +248,19 @@ class Malloy {
         }
         let sql;
         let resultExplore;
-        if (sqlBlock !== undefined) {
-            const schema = (await connection.fetchSchemaForSQLBlocks([sqlBlock]))
-                .schemas[sqlBlock.name];
-            if (schema.structRelationship.type !== "basetable") {
+        if (sqlStruct) {
+            if (sqlStruct.structRelationship.type !== "basetable") {
                 throw new Error("Expected schema's structRelationship type to be 'basetable'.");
             }
-            resultExplore = new Explore(schema);
-            sql = sqlBlock.select;
+            resultExplore = new Explore(sqlStruct);
+            sql = sqlStruct.structSource.sqlBlock.selectStr;
         }
         else if (preparedResult !== undefined) {
             resultExplore = preparedResult.resultExplore;
             sql = preparedResult.sql;
         }
         else {
-            throw new Error("Internal error: sqlBlock or preparedResult must be provided.");
+            throw new Error("Internal error: sqlStruct or preparedResult must be provided.");
         }
         let index = 0;
         for await (const row of connection.runSQLStream(sql, options)) {
@@ -1419,7 +1417,7 @@ class Runtime {
      *
      * @param model The model URL or contents to load and (eventually) compile to retrieve the requested query.
      * @param name The name of the sql block to use within the model.
-     * @returns A promise of a `SQLBlock`.
+     * @returns A promise of a `CompiledSQLBlock`.
      */
     getSQLBlockByName(model, name) {
         return this.loadSQLBlockByName(model, name).getSQLBlock();
@@ -1847,14 +1845,14 @@ class SQLBlockMaterializer extends FluentState {
         const connections = this.runtime.connections;
         return Malloy.run({
             connections,
-            sqlBlock,
+            sqlStruct: sqlBlock,
             options,
         });
     }
     async *runStream(options) {
-        const sqlBlock = await this.getSQLBlock();
+        const sqlStruct = await this.getSQLBlock();
         const connections = this.runtime.connections;
-        const stream = Malloy.runStream({ connections, sqlBlock, options });
+        const stream = Malloy.runStream({ connections, sqlStruct, options });
         for await (const row of stream) {
             yield row;
         }
@@ -1873,8 +1871,8 @@ class SQLBlockMaterializer extends FluentState {
      * @returns A promise to the SQL string.
      */
     async getSQL() {
-        const sqlBlock = await this.getSQLBlock();
-        return sqlBlock.select;
+        const sqlStruct = await this.getSQLBlock();
+        return sqlStruct.structSource.sqlBlock.selectStr;
     }
 }
 exports.SQLBlockMaterializer = SQLBlockMaterializer;

package/dist/md5.d.ts

@@ -0,0 +1 @@
+export declare const md5: (val: string) => string;

package/dist/md5.js

@@ -0,0 +1,30 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.md5 = void 0;
+const crypto = __importStar(require("crypto"));
+const md5 = (val) => crypto.createHash("md5").update(val).digest("hex");
+exports.md5 = md5;
+//# sourceMappingURL=md5.js.map

package/dist/model/malloy_query.js

@@ -2663,7 +2663,7 @@ class QueryStruct extends QueryNode {
                     return this.fieldDef.name;
                 }
                 else if (this.fieldDef.structSource.method === "subquery") {
-                    return `(${this.fieldDef.structSource.sqlBlock.select})`;
+                    return `(${this.fieldDef.structSource.sqlBlock.selectStr})`;
                 }
                 throw new Error("Internal Error: Unknown structSource type 'sql' method");
             case "nested":

package/dist/model/malloy_types.d.ts

@@ -43,7 +43,7 @@ export interface DocumentJoinReference extends DocumentReferenceBase {
 }
 export interface DocumentSQLBlockReference extends DocumentReferenceBase {
     type: "sqlBlockReference";
-    definition: SQLBlock;
+    definition: SQLBlockStructDef;
 }
 export interface DocumentQueryReference extends DocumentReferenceBase {
     type: "queryReference";
@@ -371,19 +371,25 @@ export declare type StructRelationship = {
     field: FieldRef;
     isArray: boolean;
 };
-export interface SQLSelectStatements {
-    before?: string[];
-    select: string;
-    after?: string[];
+export interface SQLFragment {
+    sql: string;
 }
+export declare type SQLPhrase = Query | SQLFragment;
+export declare function isSQLFragment(f: SQLPhrase): f is SQLFragment;
 /**
- * Use factory makeSQLBlock to create one of these, it will compute the
- * name: property and fill it in.
+ * A source reference to an SQL block. The compiler uses these to request
+ * an SQLBlock with it's schema and structdef defined. Use the factory
+ * makeSQLBlock to construct these.
  */
-export interface SQLBlock extends NamedObject, SQLSelectStatements {
-    type: "sqlBlock";
+export interface SQLBlockSource {
     name: string;
     connection?: string;
+    select: SQLPhrase[];
+}
+export interface SQLBlock extends NamedObject {
+    type: "sqlBlock";
+    connection?: string;
+    selectStr: string;
 }
 interface SubquerySource {
     type: "sql";
@@ -417,6 +423,10 @@ export interface StructDef extends NamedObject, ResultStructMetadata, Filtered {
     parameters?: Record<string, Parameter>;
     dialect: string;
 }
+export interface SQLBlockStructDef extends StructDef {
+    structSource: SubquerySource;
+}
+export declare function isSQLBlock(sd: StructDef): sd is SQLBlockStructDef;
 /** any of the different field types */
 export declare type FieldTypeDef = FieldStringDef | FieldDateDef | FieldTimestampDef | FieldNumberDef | FieldBooleanDef;
 export declare function isFieldTypeDef(f: FieldDef): f is FieldTypeDef;

package/dist/model/malloy_types.js

@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isJoinOn = exports.isIndexSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
+exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlock = exports.isSQLFragment = exports.isJoinOn = exports.isIndexSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
 function isValueParameter(p) {
     return p.value !== undefined;
 }
@@ -199,6 +199,15 @@ function isJoinOn(sr) {
     return ["one", "many", "cross"].includes(sr.type);
 }
 exports.isJoinOn = isJoinOn;
+function isSQLFragment(f) {
+    return f.sql !== undefined;
+}
+exports.isSQLFragment = isSQLFragment;
+function isSQLBlock(sd) {
+    const src = sd.structSource;
+    return src.type == "sql" && src.method == "subquery";
+}
+exports.isSQLBlock = isSQLBlock;
 function isFieldTypeDef(f) {
     return (f.type === "string" ||
         f.type === "date" ||

package/dist/model/sql_block.d.ts

@@ -1,11 +1,7 @@
-import { SQLBlock } from "./malloy_types";
+import { SQLBlockSource, SQLPhrase } from "./malloy_types";
 /**
- * SQLBlockRequest does not have a digest in it
+ * The factory for SQLBlocks. Exists because the name is computed
+ * from the components of the block and that name needs to be
+ * unique, but predictable.
  */
-export interface SQLBlockRequest extends Partial<SQLBlock> {
-    select: string;
-}
-/**
- * The factory for SQLBlocks.
- */
-export declare function makeSQLBlock(from: SQLBlockRequest): SQLBlock;
+export declare function makeSQLBlock(select: SQLPhrase[], connection?: string): SQLBlockSource;

package/dist/model/sql_block.js

@@ -16,26 +16,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSQLBlock = void 0;
+const malloy_types_1 = require("./malloy_types");
 const md5_1 = __importDefault(require("md5"));
 /**
- * The factory for SQLBlocks.
+ * The factory for SQLBlocks. Exists because the name is computed
+ * from the components of the block and that name needs to be
+ * unique, but predictable.
  */
-function makeSQLBlock(from) {
+function makeSQLBlock(select, connection) {
     const theBlock = {
-        type: "sqlBlock",
-        name: `md5:/${from.connection || "$default"}//${(0, md5_1.default)(from.select)}`,
-        select: from.select,
+        name: `md5:/${connection || "$default"}//${nameFor(select)}`,
+        select,
     };
-    if (from.before) {
-        theBlock.before = from.before;
-    }
-    if (from.after) {
-        theBlock.after = from.after;
-    }
-    if (from.connection) {
-        theBlock.connection = from.connection;
+    if (connection) {
+        theBlock.connection = connection;
     }
     return theBlock;
 }
 exports.makeSQLBlock = makeSQLBlock;
+// 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.isSQLFragment)(el) ? el.sql : JSON.stringify(el));
+    return (0, md5_1.default)(phrases.join(";"));
+}
 //# sourceMappingURL=sql_block.js.map

package/dist/runtime_types.d.ts

@@ -43,14 +43,17 @@ export interface InfoConnection {
         errors: Record<string, string>;
     }>;
     /**
-     * Fetch schemas for multiple SQL blocks.
+     * Fetch schemas an SQL blocks
      *
-     * @param tables The SQL blocks to fetch schemas for.
+     * @param block The SQL blocks to fetch schemas for.
      * @returns A mapping of SQL block names to schemas.
      */
-    fetchSchemaForSQLBlocks(sqlStructs: SQLBlock[]): Promise<{
-        schemas: Record<string, StructDef>;
-        errors: Record<string, string>;
+    fetchSchemaForSQLBlock(block: SQLBlock): Promise<{
+        structDef: StructDef;
+        error?: undefined;
+    } | {
+        error: string;
+        structDef?: undefined;
     }>;
     /**
      * The name of the connection.
@@ -72,9 +75,7 @@ export interface Connection extends InfoConnection {
     runSQL(sql: string, options?: RunSQLOptions): Promise<MalloyQueryData>;
     isPool(): this is PooledConnection;
     canPersist(): this is PersistSQLResults;
-    canFetchSchemaAndRunSimultaneously(): this is FetchSchemaAndRunSimultaneously;
     canStream(): this is StreamingConnection;
-    canFetchSchemaAndRunStreamSimultaneously(): this is FetchSchemaAndRunStreamSimultaneously;
 }
 export interface TestableConnection extends Connection {
     test(): Promise<void>;
@@ -86,27 +87,11 @@ export interface PooledConnection extends Connection {
 export interface PersistSQLResults extends Connection {
     manifestTemporaryTable(sqlCommand: string): Promise<string>;
 }
-export interface FetchSchemaAndRunSimultaneously extends Connection {
-    runSQLBlockAndFetchResultSchema(sqlBlock: SQLBlock, options?: {
-        rowLimit?: number;
-    }): Promise<{
-        data: MalloyQueryData;
-        schema: StructDef;
-    }>;
-}
 export interface StreamingConnection extends Connection {
     runSQLStream(sqlCommand: string, options?: {
         rowLimit?: number;
     }): AsyncIterableIterator<QueryDataRow>;
 }
-export interface FetchSchemaAndRunStreamSimultaneously extends StreamingConnection, FetchSchemaAndRunSimultaneously {
-    runSQLBlockStreamAndFetchResultSchema(sqlCommand: string, options?: {
-        rowLimit?: number;
-    }): Promise<{
-        stream: AsyncIterableIterator<QueryDataRow>;
-        schema: StructDef;
-    }>;
-}
 /**
  * A mapping of connection names to connections.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.11-dev221202152346",
+  "version": "0.0.11",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",