@malloydata/malloy 0.0.119-dev240118211537 → 0.0.119-dev240118215411

package/dist/dialect/functions/all_functions.js

@@ -60,6 +60,7 @@ const simple_numeric_functions_1 = require("./simple_numeric_functions");
 const avg_moving_1 = require("./avg_moving");
 const function_map_1 = require("./function_map");
 const coalesce_1 = require("./coalesce");
+const sql_1 = require("./sql");
 /**
  * This is a function map containing default implementations of all Malloy
  * built-in functions. These don't work in all dialects, but are a good starting
@@ -131,5 +132,10 @@ exports.FUNCTIONS.add('min_window', sum_min_max_window_1.fnMinWindow);
 exports.FUNCTIONS.add('max_window', sum_min_max_window_1.fnMaxWindow);
 exports.FUNCTIONS.add('sum_window', sum_min_max_window_1.fnSumWindow);
 exports.FUNCTIONS.add('avg_moving', avg_moving_1.fnAvgRolling);
+exports.FUNCTIONS.add('sql_number', sql_1.fnSqlNumber);
+exports.FUNCTIONS.add('sql_string', sql_1.fnSqlString);
+exports.FUNCTIONS.add('sql_date', sql_1.fnSqlDate);
+exports.FUNCTIONS.add('sql_timestamp', sql_1.fnSqlTimestamp);
+exports.FUNCTIONS.add('sql_boolean', sql_1.fnSqlBoolean);
 exports.FUNCTIONS.seal();
 //# sourceMappingURL=all_functions.js.map

package/dist/dialect/functions/sql.d.ts

@@ -0,0 +1,6 @@
+import { DialectFunctionOverloadDef } from './util';
+export declare function fnSqlNumber(): DialectFunctionOverloadDef[];
+export declare function fnSqlString(): DialectFunctionOverloadDef[];
+export declare function fnSqlDate(): DialectFunctionOverloadDef[];
+export declare function fnSqlTimestamp(): DialectFunctionOverloadDef[];
+export declare function fnSqlBoolean(): DialectFunctionOverloadDef[];

package/dist/dialect/functions/sql.js

@@ -0,0 +1,62 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fnSqlBoolean = exports.fnSqlTimestamp = exports.fnSqlDate = exports.fnSqlString = exports.fnSqlNumber = void 0;
+const util_1 = require("./util");
+function fnSqlNumber() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('number'), [value.param], [{ type: 'sql-string', e: [value.arg] }]),
+    ];
+}
+exports.fnSqlNumber = fnSqlNumber;
+function fnSqlString() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('string'), [value.param], [{ type: 'sql-string', e: [value.arg] }]),
+    ];
+}
+exports.fnSqlString = fnSqlString;
+function fnSqlDate() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('date'), [value.param], [{ type: 'sql-string', e: [value.arg] }]),
+    ];
+}
+exports.fnSqlDate = fnSqlDate;
+function fnSqlTimestamp() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('timestamp'), [value.param], [{ type: 'sql-string', e: [value.arg] }]),
+    ];
+}
+exports.fnSqlTimestamp = fnSqlTimestamp;
+function fnSqlBoolean() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('boolean'), [value.param], [{ type: 'sql-string', e: [value.arg] }]),
+    ];
+}
+exports.fnSqlBoolean = fnSqlBoolean;
+//# sourceMappingURL=sql.js.map

package/dist/lang/ast/expressions/expr-aggregate-function.js

@@ -216,6 +216,7 @@ function getJoinUsage(fs, expr) {
     };
     (0, utils_1.exprWalk)(expr, frag => {
         if (typeof frag !== 'string') {
+            // TODO make this work for field references inside sql_* functions
             if (frag.type === 'field') {
                 const def = lookup(fs, frag.path);
                 if (def.def.type !== 'struct' && def.def.type !== 'turtle') {

package/dist/lang/ast/expressions/expr-func.js

@@ -161,7 +161,7 @@ class ExprFunc extends expression_def_1.ExpressionDef {
                 .join(', ')}) with source`);
             return (0, ast_utils_1.errorFor)('cannot call with source');
         }
-        const funcCall = [
+        let funcCall = [
             {
                 type: 'function_call',
                 overload,
@@ -170,6 +170,50 @@ class ExprFunc extends expression_def_1.ExpressionDef {
                 structPath,
             },
         ];
+        if ([
+            'sql_number',
+            'sql_string',
+            'sql_date',
+            'sql_timestamp',
+            'sql_boolean',
+        ].includes(func.name)) {
+            if (!this.inExperiment('sql_functions', true)) {
+                return (0, ast_utils_1.errorFor)(`Cannot use sql_function \`${func.name}\`; use \`sql_functions\` experiment to enable this behavior`);
+            }
+            const str = argExprs[0].value;
+            if (str.length !== 1 ||
+                typeof str[0] === 'string' ||
+                str[0].type !== 'dialect' ||
+                str[0].function !== 'stringLiteral') {
+                this.log(`Invalid string literal for \`${func.name}\``);
+            }
+            else {
+                const literal = str[0].literal;
+                const parts = parseSQLInterpolation(literal);
+                const unsupportedInterpolations = parts
+                    .filter(part => part.type === 'interpolation' && part.name.includes('.'))
+                    .map(unsupportedPart => unsupportedPart.type === 'interpolation'
+                    ? `\${${unsupportedPart.name}}`
+                    : `\${${unsupportedPart.value}}`);
+                if (unsupportedInterpolations.length > 0) {
+                    const unsupportedInterpolationMsg = unsupportedInterpolations.length === 1
+                        ? `'.' paths are not yet supported in sql interpolations, found ${unsupportedInterpolations.at(0)}`
+                        : `'.' paths are not yet supported in sql interpolations, found [${unsupportedInterpolations.join(', ')}]`;
+                    this.log(unsupportedInterpolationMsg);
+                    return (0, ast_utils_1.errorFor)(`${unsupportedInterpolationMsg}. See LookML \${...} documentation at https://cloud.google.com/looker/docs/reference/param-field-sql#sql_for_dimensions`);
+                }
+                funcCall = [
+                    {
+                        type: 'sql-string',
+                        e: parts.map(part => part.type === 'string'
+                            ? part.value
+                            : part.name === 'TABLE'
+                                ? { type: 'source-reference' }
+                                : { type: 'field-reference', path: part.name }),
+                    },
+                ];
+            }
+        }
         if (type.dataType === 'any') {
             this.log(`Invalid return type ${type.dataType} for function '${this.name}'`);
             return (0, ast_utils_1.errorFor)('invalid return type');
@@ -285,4 +329,31 @@ function findOverload(func, args) {
         }
     }
 }
+function parseSQLInterpolation(template) {
+    const parts = [];
+    let remaining = template;
+    while (remaining.length) {
+        const nextInterp = remaining.indexOf('${');
+        if (nextInterp === -1) {
+            parts.push({ type: 'string', value: remaining });
+            break;
+        }
+        else {
+            const interpEnd = remaining.slice(nextInterp).indexOf('}');
+            if (interpEnd === -1) {
+                parts.push({ type: 'string', value: remaining });
+                break;
+            }
+            if (nextInterp > 0) {
+                parts.push({ type: 'string', value: remaining.slice(0, nextInterp) });
+            }
+            parts.push({
+                type: 'interpolation',
+                name: remaining.slice(nextInterp + 2, interpEnd + nextInterp),
+            });
+            remaining = remaining.slice(interpEnd + nextInterp + 1);
+        }
+    }
+    return parts;
+}
 //# sourceMappingURL=expr-func.js.map

package/dist/model/malloy_query.d.ts

@@ -1,5 +1,5 @@
 import { Dialect, DialectFieldList } from '../dialect';
-import { AggregateFragment, AggregateFunctionType, CompiledQuery, DialectFragment, Expr, FieldDef, FieldFragment, FieldRef, Filtered, FilterExpression, FilterFragment, FunctionCallFragment, FunctionOverloadDef, JoinRelationship, ModelDef, OrderBy, OutputFieldFragment, Parameter, ParameterFragment, PipeSegment, Query, QueryFieldDef, QuerySegment, ResultMetadataDef, ResultStructMetadataDef, SearchIndexResult, SpreadFragment, SQLExpressionFragment, StructDef, StructRef, TurtleDef, UngroupFragment } from './malloy_types';
+import { AggregateFragment, AggregateFunctionType, CompiledQuery, DialectFragment, Expr, FieldDef, FieldFragment, FieldRef, FieldReferenceFragment, Filtered, FilterExpression, FilterFragment, FunctionCallFragment, FunctionOverloadDef, JoinRelationship, ModelDef, OrderBy, OutputFieldFragment, Parameter, ParameterFragment, PipeSegment, Query, QueryFieldDef, QuerySegment, ResultMetadataDef, ResultStructMetadataDef, SearchIndexResult, SourceReferenceFragment, SpreadFragment, SQLExpressionFragment, SqlStringFragment, StructDef, StructRef, TurtleDef, UngroupFragment } from './malloy_types';
 import { Connection } from '../runtime_types';
 import { AndChain } from './utils';
 import { QueryInfo } from '../dialect/dialect';
@@ -83,6 +83,9 @@ declare class QueryField extends QueryNode {
     generateAvgFragment(resultSet: FieldInstanceResult, context: QueryStruct, expr: AggregateFragment, state: GenerateState): string;
     generateCountFragment(resultSet: FieldInstanceResult, context: QueryStruct, expr: AggregateFragment, state: GenerateState): string;
     generateDialect(resultSet: FieldInstanceResult, context: QueryStruct, expr: DialectFragment, state: GenerateState): string;
+    generateFieldReference(resultSet: FieldInstanceResult, context: QueryStruct, expr: FieldReferenceFragment, state: GenerateState): string;
+    generateSqlString(resultSet: FieldInstanceResult, context: QueryStruct, expr: SqlStringFragment, state: GenerateState): string;
+    generateSourceReference(resultSet: FieldInstanceResult, context: QueryStruct, expr: SourceReferenceFragment): string;
     getAnalyticPartitions(resultStruct: FieldInstanceResult): string;
     generateAnalyticFragment(resultStruct: FieldInstanceResult, context: QueryStruct, expr: Expr, overload: FunctionOverloadDef, state: GenerateState, args: Expr[]): string;
     generateExpressionFromExpr(resultSet: FieldInstanceResult, context: QueryStruct, e: Expr, state?: GenerateState): string;

package/dist/model/malloy_query.js

@@ -479,6 +479,24 @@ class QueryField extends QueryNode {
     generateDialect(resultSet, context, expr, state) {
         return this.generateExpressionFromExpr(resultSet, context, context.dialect.dialectExpr(resultSet.getQueryInfo(), expr), state);
     }
+    generateFieldReference(resultSet, context, expr, state) {
+        return this.generateFieldFragment(resultSet, context, { type: 'field', path: expr.path }, state);
+    }
+    generateSqlString(resultSet, context, expr, state) {
+        return expr.e
+            .map(part => typeof part === 'string'
+            ? part
+            : this.generateExpressionFromExpr(resultSet, context, [part], state))
+            .join('');
+    }
+    generateSourceReference(resultSet, context, expr) {
+        if (expr.path === undefined) {
+            return context.getSQLIdentifier();
+        }
+        else {
+            return context.getFieldByName(expr.path).getIdentifier();
+        }
+    }
     getAnalyticPartitions(resultStruct) {
         const ret = [];
         let p = resultStruct.parent;
@@ -643,6 +661,15 @@ class QueryField extends QueryNode {
             else if (expr.type === 'dialect') {
                 s += this.generateDialect(resultSet, context, expr, state);
             }
+            else if (expr.type === 'sql-string') {
+                s += this.generateSqlString(resultSet, context, expr, state);
+            }
+            else if (expr.type === 'source-reference') {
+                s += this.generateSourceReference(resultSet, context, expr);
+            }
+            else if (expr.type === 'field-reference') {
+                s += this.generateFieldReference(resultSet, context, expr, state);
+            }
             else {
                 throw new Error(`Internal Error: Unknown expression fragment ${JSON.stringify(expr, undefined, 2)}`);
             }

package/dist/model/malloy_types.d.ts

@@ -151,6 +151,21 @@ export interface FieldFragment {
     path: string;
 }
 export declare function isFieldFragment(f: Fragment): f is FieldFragment;
+export interface FieldReferenceFragment {
+    type: 'field-reference';
+    path: string;
+}
+export declare function isFieldReferenceFragment(f: Fragment): f is FieldReferenceFragment;
+export interface SqlStringFragment {
+    type: 'sql-string';
+    e: Expr;
+}
+export declare function isSqlStringFragment(f: Fragment): f is SqlStringFragment;
+export interface SourceReferenceFragment {
+    type: 'source-reference';
+    path?: string;
+}
+export declare function isSourceReferenceFragment(f: Fragment): f is SourceReferenceFragment;
 export interface ParameterFragment {
     type: 'parameter';
     path: string;
@@ -234,7 +249,7 @@ export interface NumberLiteralFragment extends DialectFragmentBase {
     literal: string;
 }
 export type DialectFragment = DivFragment | TimeLiteralFragment | NowFragment | TimeDeltaFragment | TimeDiffFragment | TimeTruncFragment | TypecastFragment | TimeExtractFragment | StringLiteralFragment | RegexpLiteralFragment | NumberLiteralFragment | RegexpMatchFragment;
-export type Fragment = string | ApplyFragment | ApplyValueFragment | FieldFragment | ParameterFragment | FilterFragment | OutputFieldFragment | AggregateFragment | UngroupFragment | DialectFragment | FunctionParameterFragment | FunctionCallFragment | SQLExpressionFragment | SpreadFragment;
+export type Fragment = string | ApplyFragment | ApplyValueFragment | FieldFragment | FieldReferenceFragment | SourceReferenceFragment | SqlStringFragment | ParameterFragment | FilterFragment | OutputFieldFragment | AggregateFragment | UngroupFragment | DialectFragment | FunctionParameterFragment | FunctionCallFragment | SQLExpressionFragment | SpreadFragment;
 export type Expr = Fragment[];
 export interface TypedValue {
     value: Expr;

package/dist/model/malloy_types.js

@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMatrixOperation = exports.isIndexSegment = exports.isRawSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = 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.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = exports.isJoinOn = void 0;
+exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isSourceReferenceFragment = exports.isSqlStringFragment = exports.isFieldReferenceFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = 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.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = exports.isJoinOn = exports.isMatrixOperation = exports.isIndexSegment = exports.isRawSegment = void 0;
 function isValueParameter(p) {
     return p.value !== undefined;
 }
@@ -90,6 +90,18 @@ function isFieldFragment(f) {
     return (f === null || f === void 0 ? void 0 : f.type) === 'field';
 }
 exports.isFieldFragment = isFieldFragment;
+function isFieldReferenceFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'field-reference';
+}
+exports.isFieldReferenceFragment = isFieldReferenceFragment;
+function isSqlStringFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'sql-string';
+}
+exports.isSqlStringFragment = isSqlStringFragment;
+function isSourceReferenceFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'source-reference';
+}
+exports.isSourceReferenceFragment = isSourceReferenceFragment;
 function isParameterFragment(f) {
     return (f === null || f === void 0 ? void 0 : f.type) === 'parameter';
 }

package/dist/model/utils.js

@@ -126,6 +126,11 @@ function exprMap(expr, func) {
                 case 'parameter':
                 case 'outputField':
                     return fragment;
+                case 'sql-string':
+                    return {
+                        ...fragment,
+                        e: exprMap(fragment.e, func),
+                    };
                 case 'function_call':
                     return {
                         ...fragment,
@@ -232,6 +237,11 @@ function exprWalk(expr, func) {
                     ...fragment,
                     args: fragment.args.map(arg => exprWalk(arg, func)),
                 };
+            case 'sql-string':
+                return {
+                    ...fragment,
+                    e: exprWalk(fragment.e, func),
+                };
             case 'filterExpression':
                 return {
                     ...fragment,

package/package.json

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