@malloydata/malloy 0.0.66-dev230803195842 → 0.0.66

package/dist/dialect/dialect.d.ts

@@ -23,9 +23,9 @@ export declare type DialectFieldList = DialectField[];
 export declare abstract class Dialect {
     abstract name: string;
     abstract defaultNumberType: string;
+    abstract defaultDecimalType: string;
     abstract udfPrefix: string;
     abstract hasFinalStage: boolean;
-    abstract stringTypeName: string;
     abstract divisionIsInteger: boolean;
     abstract supportsSumDistinctFunction: boolean;
     abstract unnestWithNumbers: boolean;
@@ -36,6 +36,7 @@ export declare abstract class Dialect {
     abstract dontUnionIndex: boolean;
     abstract supportsQualify: boolean;
     abstract supportsSafeCast: boolean;
+    abstract supportsNesting: boolean;
     abstract getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
     abstract quoteTablePath(tablePath: string): string;
     abstract sqlGroupSetTable(groupSetCount: number): string;
@@ -67,6 +68,7 @@ export declare abstract class Dialect {
     abstract sqlLiteralString(literal: string): string;
     abstract sqlLiteralRegexp(literal: string): string;
     abstract sqlRegexpMatch(expr: Expr, regex: Expr): Expr;
+    abstract castToString(expression: string): string;
     sqlLiteralNumber(literal: string): string;
     dialectExpr(qi: QueryInfo, df: DialectFragment): Expr;
     sqlSumDistinct(_key: string, _value: string, _funcName: string): string;

package/dist/dialect/dialect.js

@@ -57,7 +57,7 @@ class Dialect {
     }
     // default implementation will probably work most of the time
     sqlDateToString(sqlDateExp) {
-        return `CAST(DATE(${sqlDateExp}) AS ${this.stringTypeName} )`;
+        return this.castToString(`DATE(${sqlDateExp})`);
     }
     // BigQuery has some fieldNames that are Pseudo Fields and shouldn't be
     //  included in projections.

package/dist/dialect/duckdb/duckdb.d.ts

@@ -4,8 +4,8 @@ import { Dialect, DialectFieldList, QueryInfo } from '../dialect';
 export declare class DuckDBDialect extends Dialect {
     name: string;
     defaultNumberType: string;
+    defaultDecimalType: string;
     hasFinalStage: boolean;
-    stringTypeName: string;
     divisionIsInteger: boolean;
     supportsSumDistinctFunction: boolean;
     unnestWithNumbers: boolean;
@@ -18,6 +18,7 @@ export declare class DuckDBDialect extends Dialect {
     dontUnionIndex: boolean;
     supportsQualify: boolean;
     supportsSafeCast: boolean;
+    supportsNesting: boolean;
     get udfPrefix(): string;
     quoteTablePath(tableName: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
@@ -53,4 +54,5 @@ export declare class DuckDBDialect extends Dialect {
     sqlLiteralString(literal: string): string;
     sqlLiteralRegexp(literal: string): string;
     getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
+    castToString(expression: string): string;
 }

package/dist/dialect/duckdb/duckdb.js

@@ -42,8 +42,8 @@ class DuckDBDialect extends dialect_1.Dialect {
         super(...arguments);
         this.name = 'duckdb';
         this.defaultNumberType = 'DOUBLE';
+        this.defaultDecimalType = 'NUMERIC';
         this.hasFinalStage = false;
-        this.stringTypeName = 'VARCHAR';
         this.divisionIsInteger = true;
         this.supportsSumDistinctFunction = true;
         this.unnestWithNumbers = true;
@@ -54,6 +54,7 @@ class DuckDBDialect extends dialect_1.Dialect {
         this.dontUnionIndex = true;
         this.supportsQualify = true;
         this.supportsSafeCast = true;
+        this.supportsNesting = true;
     }
     // hack until they support temporary macros.
     get udfPrefix() {
@@ -334,6 +335,9 @@ class DuckDBDialect extends dialect_1.Dialect {
     getGlobalFunctionDef(name) {
         return functions_1.DUCKDB_FUNCTIONS.get(name);
     }
+    castToString(expression) {
+        return `CAST(${expression} as VARCHAR)`;
+    }
 }
 exports.DuckDBDialect = DuckDBDialect;
 //# sourceMappingURL=duckdb.js.map

package/dist/dialect/index.d.ts

@@ -1,3 +1,5 @@
+export type { DialectFunctionOverloadDef } from './functions/util';
+export { anyExprType, makeParam, overload, minScalar, sql, } from './functions/util';
 export { Dialect } from './dialect';
 export type { DialectFieldList } from './dialect';
 export { StandardSQLDialect } from './standardsql';

package/dist/dialect/index.js

@@ -22,7 +22,13 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDialectFunction = exports.registerDialect = exports.getDialect = exports.DuckDBDialect = exports.PostgresDialect = exports.StandardSQLDialect = exports.Dialect = void 0;
+exports.getDialectFunction = exports.registerDialect = exports.getDialect = exports.DuckDBDialect = exports.PostgresDialect = exports.StandardSQLDialect = exports.Dialect = exports.sql = exports.minScalar = exports.overload = exports.makeParam = exports.anyExprType = void 0;
+var util_1 = require("./functions/util");
+Object.defineProperty(exports, "anyExprType", { enumerable: true, get: function () { return util_1.anyExprType; } });
+Object.defineProperty(exports, "makeParam", { enumerable: true, get: function () { return util_1.makeParam; } });
+Object.defineProperty(exports, "overload", { enumerable: true, get: function () { return util_1.overload; } });
+Object.defineProperty(exports, "minScalar", { enumerable: true, get: function () { return util_1.minScalar; } });
+Object.defineProperty(exports, "sql", { enumerable: true, get: function () { return util_1.sql; } });
 var dialect_1 = require("./dialect");
 Object.defineProperty(exports, "Dialect", { enumerable: true, get: function () { return dialect_1.Dialect; } });
 var standardsql_1 = require("./standardsql");

package/dist/dialect/postgres/postgres.d.ts

@@ -4,9 +4,9 @@ import { Dialect, DialectFieldList, QueryInfo } from '../dialect';
 export declare class PostgresDialect extends Dialect {
     name: string;
     defaultNumberType: string;
+    defaultDecimalType: string;
     udfPrefix: string;
     hasFinalStage: boolean;
-    stringTypeName: string;
     divisionIsInteger: boolean;
     supportsSumDistinctFunction: boolean;
     unnestWithNumbers: boolean;
@@ -20,6 +20,7 @@ export declare class PostgresDialect extends Dialect {
     dontUnionIndex: boolean;
     supportsQualify: boolean;
     globalFunctions: import("../functions/function_map").FunctionMap;
+    supportsNesting: boolean;
     quoteTablePath(tablePath: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     sqlAnyValue(groupSet: number, fieldName: string): string;
@@ -54,4 +55,5 @@ export declare class PostgresDialect extends Dialect {
     sqlLiteralString(literal: string): string;
     sqlLiteralRegexp(literal: string): string;
     getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
+    castToString(expression: string): string;
 }

package/dist/dialect/postgres/postgres.js

@@ -56,9 +56,9 @@ class PostgresDialect extends dialect_1.Dialect {
         super(...arguments);
         this.name = 'postgres';
         this.defaultNumberType = 'DOUBLE PRECISION';
+        this.defaultDecimalType = 'NUMERIC';
         this.udfPrefix = 'pg_temp.__udf';
         this.hasFinalStage = true;
-        this.stringTypeName = 'VARCHAR';
         this.divisionIsInteger = true;
         this.supportsSumDistinctFunction = false;
         this.unnestWithNumbers = false;
@@ -70,6 +70,7 @@ class PostgresDialect extends dialect_1.Dialect {
         this.dontUnionIndex = false;
         this.supportsQualify = false;
         this.globalFunctions = functions_1.POSTGRES_FUNCTIONS;
+        this.supportsNesting = true;
     }
     quoteTablePath(tablePath) {
         return tablePath
@@ -356,6 +357,9 @@ class PostgresDialect extends dialect_1.Dialect {
     getGlobalFunctionDef(name) {
         return functions_1.POSTGRES_FUNCTIONS.get(name);
     }
+    castToString(expression) {
+        return `CAST(${expression} as VARCHAR)`;
+    }
 }
 exports.PostgresDialect = PostgresDialect;
 //# sourceMappingURL=postgres.js.map

package/dist/dialect/standardsql/standardsql.d.ts

@@ -4,9 +4,9 @@ import { Dialect, DialectFieldList, QueryInfo } from '../dialect';
 export declare class StandardSQLDialect extends Dialect {
     name: string;
     defaultNumberType: string;
+    defaultDecimalType: string;
     udfPrefix: string;
     hasFinalStage: boolean;
-    stringTypeName: string;
     divisionIsInteger: boolean;
     supportsSumDistinctFunction: boolean;
     unnestWithNumbers: boolean;
@@ -19,6 +19,7 @@ export declare class StandardSQLDialect extends Dialect {
     dontUnionIndex: boolean;
     supportsQualify: boolean;
     supportsSafeCast: boolean;
+    supportsNesting: boolean;
     quoteTablePath(tablePath: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     sqlAnyValue(groupSet: number, fieldName: string): string;
@@ -50,4 +51,5 @@ export declare class StandardSQLDialect extends Dialect {
     sqlLiteralString(literal: string): string;
     sqlLiteralRegexp(literal: string): string;
     getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
+    castToString(expression: string): string;
 }

package/dist/dialect/standardsql/standardsql.js

@@ -62,9 +62,9 @@ class StandardSQLDialect extends dialect_1.Dialect {
         super(...arguments);
         this.name = 'standardsql';
         this.defaultNumberType = 'FLOAT64';
+        this.defaultDecimalType = 'NUMERIC';
         this.udfPrefix = '__udf';
         this.hasFinalStage = false;
-        this.stringTypeName = 'STRING';
         this.divisionIsInteger = false;
         this.supportsSumDistinctFunction = false;
         this.unnestWithNumbers = false;
@@ -75,6 +75,7 @@ class StandardSQLDialect extends dialect_1.Dialect {
         this.dontUnionIndex = true; // bigquery can't use a sample table more than once in a query.
         this.supportsQualify = true;
         this.supportsSafeCast = true;
+        this.supportsNesting = true;
         this.keywords = `
   ALL
   AND
@@ -416,6 +417,9 @@ ${(0, utils_1.indent)(sql)}
     getGlobalFunctionDef(name) {
         return functions_1.STANDARDSQL_FUNCTIONS.get(name);
     }
+    castToString(expression) {
+        return `CAST(${expression} as STRING)`;
+    }
 }
 exports.StandardSQLDialect = StandardSQLDialect;
 //# sourceMappingURL=standardsql.js.map

package/dist/index.d.ts

@@ -3,9 +3,9 @@ export { Segment, isFilteredAliasedName, flattenQuery, expressionIsCalculation,
 export { HighlightType, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
 export { Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, Result, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, } from './malloy';
-export type { Model, PreparedQuery, PreparedResult, Field, AtomicField, ExploreField, QueryField, SortableField, DataArray, DataRecord, DataColumn, DataArrayOrRecord, ModelMaterializer, DocumentSymbol, DocumentHighlight, ResultJSON, PreparedResultMaterializer, SQLBlockMaterializer, ExploreMaterializer, WriteStream, SerializedExplore, } from './malloy';
+export type { Model, PreparedQuery, PreparedResult, Field, AtomicField, ExploreField, QueryField, SortableField, DataArray, DataRecord, DataColumn, DataArrayOrRecord, Loggable, ModelMaterializer, DocumentSymbol, DocumentHighlight, ResultJSON, PreparedResultMaterializer, SQLBlockMaterializer, ExploreMaterializer, WriteStream, SerializedExplore, } from './malloy';
 export type { RunSQLOptions } from './run_sql_options';
-export type { URLReader, InfoConnection, LookupConnection, Connection, DialectProvider, QueryString, ModelString, QueryURL, ModelURL, PooledConnection, TestableConnection, PersistSQLResults, StreamingConnection, } from './runtime_types';
-export type { Loggable } from './malloy';
+export { DialectProvider } from './runtime_types';
+export type { URLReader, InfoConnection, LookupConnection, Connection, QueryString, ModelString, QueryURL, ModelURL, PooledConnection, TestableConnection, PersistSQLResults, StreamingConnection, } from './runtime_types';
 export { toAsyncGenerator } from './connection_utils';
 export { Tags, type MalloyTags, type MalloyTagProperties } from './tags';

package/dist/index.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tags = exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.MalloyTranslator = exports.HighlightType = exports.expressionIsCalculation = exports.flattenQuery = exports.isFilteredAliasedName = exports.Segment = void 0;
+exports.Tags = exports.toAsyncGenerator = exports.DialectProvider = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.MalloyTranslator = exports.HighlightType = exports.expressionIsCalculation = exports.flattenQuery = exports.isFilteredAliasedName = exports.Segment = void 0;
 var model_1 = require("./model");
 // Used in Composer Demo
 Object.defineProperty(exports, "Segment", { enumerable: true, get: function () { return model_1.Segment; } });
@@ -55,6 +55,8 @@ Object.defineProperty(exports, "JSONWriter", { enumerable: true, get: function (
 Object.defineProperty(exports, "Parse", { enumerable: true, get: function () { return malloy_1.Parse; } });
 Object.defineProperty(exports, "DataWriter", { enumerable: true, get: function () { return malloy_1.DataWriter; } });
 Object.defineProperty(exports, "Explore", { enumerable: true, get: function () { return malloy_1.Explore; } });
+var runtime_types_1 = require("./runtime_types");
+Object.defineProperty(exports, "DialectProvider", { enumerable: true, get: function () { return runtime_types_1.DialectProvider; } });
 var connection_utils_1 = require("./connection_utils");
 Object.defineProperty(exports, "toAsyncGenerator", { enumerable: true, get: function () { return connection_utils_1.toAsyncGenerator; } });
 var tags_1 = require("./tags");

package/dist/malloy.d.ts

@@ -802,6 +802,7 @@ export declare class SingleConnectionRuntime<T extends Connection = Connection>
     readonly connection: T;
     constructor(urls: URLReader, connection: T);
     constructor(connection: T);
+    get supportsNesting(): boolean;
 }
 declare class FluentState<T> {
     protected runtime: Runtime;

package/dist/malloy.js

@@ -27,6 +27,7 @@ const lang_1 = require("./lang");
 const model_1 = require("./model");
 const luxon_1 = require("luxon");
 const tags_1 = require("./tags");
+const dialect_1 = require("./dialect");
 class Malloy {
     // TODO load from file built during release
     static get version() {
@@ -1631,6 +1632,9 @@ class SingleConnectionRuntime extends Runtime {
             this.connection = connection;
         }
     }
+    get supportsNesting() {
+        return (0, dialect_1.getDialect)(this.connection.dialectName).supportsNesting;
+    }
 }
 exports.SingleConnectionRuntime = SingleConnectionRuntime;
 class FluentState {

package/dist/model/malloy_query.js

@@ -765,7 +765,7 @@ function sqlSumDistinct(dialect, sqlExp, sqlDistintKey) {
     const sumSQL = `
   (
     SUM(DISTINCT
-      (CAST(ROUND(COALESCE(${sqlExp},0)*(${multiplier}*1.0), ${NUMERIC_DECIMAL_PRECISION}) AS NUMERIC) +
+      (CAST(ROUND(COALESCE(${sqlExp},0)*(${multiplier}*1.0), ${NUMERIC_DECIMAL_PRECISION}) AS ${dialect.defaultDecimalType}) +
       ${uniqueInt}
     ))
     -
@@ -1861,7 +1861,7 @@ class QueryQuery extends QueryField {
         if ((0, malloy_types_1.isJoinOn)(structRelationship)) {
             if (ji.makeUniqueKey) {
                 const passKeys = this.generateSQLPassthroughKeys(qs);
-                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, * ${passKeys} FROM ${structSQL} as x)`;
+                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, x.* ${passKeys} FROM ${structSQL} as x)`;
             }
             let onCondition = '';
             if (qs.parent === undefined) {
@@ -1958,7 +1958,7 @@ class QueryQuery extends QueryField {
         if (structRelationship.type === 'basetable') {
             if (ji.makeUniqueKey) {
                 const passKeys = this.generateSQLPassthroughKeys(qs);
-                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, * ${passKeys} FROM ${structSQL} as x)`;
+                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, x.* ${passKeys} FROM ${structSQL} as x)`;
             }
             s += `FROM ${structSQL} as ${ji.alias}\n`;
         }
@@ -2152,7 +2152,7 @@ class QueryQuery extends QueryField {
                     r = r.parent;
                 }
                 fields.push(`MAX(CASE WHEN group_set IN (${result.childGroups.join(',')}) THEN __delete__${result.groupSet} END) OVER(partition by ${dimensions
-                    .map(x => `CAST(${x} AS ${this.parent.dialect.stringTypeName}) `)
+                    .map(this.parent.dialect.castToString)
                     .join(',')}) as __shaving__${result.groupSet}`);
             }
         }
@@ -2589,7 +2589,7 @@ class QueryQueryIndexStage extends QueryQuery {
         s += "  CASE group_set\n    WHEN 99999 THEN ''";
         for (let i = 0; i < fields.length; i++) {
             if (fields[i].type === 'number') {
-                s += `    WHEN ${i} THEN CAST(MIN(${fields[i].expression}) AS ${dialect.stringTypeName}) || ' to ' || CAST(MAX(${fields[i].expression}) AS ${dialect.stringTypeName})\n`;
+                s += `    WHEN ${i} THEN ${dialect.castToString(`MIN(${fields[i].expression})`)} || ' to ' || ${dialect.castToString(`MAX(${fields[i].expression})`)}\n`;
             }
             if (fields[i].type === 'timestamp' || fields[i].type === 'date') {
                 s += `    WHEN ${i} THEN MIN(${dialect.sqlDateToString(fields[i].expression)}) || ' to ' || MAX(${dialect.sqlDateToString(fields[i].expression)})\n`;

package/dist/runtime_types.d.ts

@@ -80,6 +80,7 @@ export interface Connection extends InfoConnection {
     canStream(): this is StreamingConnection;
     close(): Promise<void>;
     estimateQueryCost(sqlCommand: string): Promise<QueryRunStats>;
+    get dialectName(): string;
 }
 export interface TestableConnection extends Connection {
     test(): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.66-dev230803195842",
+  "version": "0.0.66",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",