@malloydata/malloy 0.0.40 → 0.0.41-dev230615144150

package/dist/dialect/duckdb/duckdb.js

@@ -87,7 +87,7 @@ class DuckDBDialect extends dialect_1.Dialect {
         return `ANY_VALUE(CASE WHEN group_set=${groupSet} THEN ROW(${fields}))`;
     }
     sqlAnyValueLastTurtle(name, groupSet, sqlName) {
-        return `MAX(CASE WHEN group_set=${groupSet} THEN ${name}__${groupSet} END) as ${sqlName}`;
+        return `MAX(CASE WHEN group_set=${groupSet} THEN ${name} END) as ${sqlName}`;
     }
     sqlCoaleseMeasuresInline(groupSet, fieldList) {
         const fields = fieldList

package/dist/dialect/postgres/postgres.js

@@ -105,7 +105,7 @@ class PostgresDialect extends dialect_1.Dialect {
         return `ANY_VALUE(CASE WHEN group_set=${groupSet} THEN STRUCT(${fields}))`;
     }
     sqlAnyValueLastTurtle(name, groupSet, sqlName) {
-        return `(ARRAY_AGG(${name}__${groupSet}) FILTER (WHERE group_set=${groupSet} AND ${name}__${groupSet} IS NOT NULL))[1] as ${sqlName}`;
+        return `(ARRAY_AGG(${name}) FILTER (WHERE group_set=${groupSet} AND ${name} IS NOT NULL))[1] as ${sqlName}`;
     }
     sqlCoaleseMeasuresInline(groupSet, fieldList) {
         const fields = this.mapFields(fieldList);

package/dist/dialect/standardsql/standardsql.js

@@ -198,7 +198,7 @@ class StandardSQLDialect extends dialect_1.Dialect {
         return `ANY_VALUE(CASE WHEN group_set=${groupSet} THEN STRUCT(${fields}))`;
     }
     sqlAnyValueLastTurtle(name, groupSet, sqlName) {
-        return `ANY_VALUE(CASE WHEN group_set=${groupSet} THEN ${name}__${groupSet} END) as ${sqlName}`;
+        return `ANY_VALUE(CASE WHEN group_set=${groupSet} THEN ${name} END) as ${sqlName}`;
     }
     sqlCoaleseMeasuresInline(groupSet, fieldList) {
         const fields = fieldList
@@ -274,9 +274,10 @@ ${(0, utils_1.indent)(sql)}
         return `(SELECT AS STRUCT ${alias}.*)`;
     }
     sqlMaybeQuoteIdentifier(identifier) {
-        return this.keywords.indexOf(identifier.toUpperCase()) > 0
-            ? '`' + identifier + '`'
-            : identifier;
+        // return this.keywords.indexOf(identifier.toUpperCase()) > 0
+        //   ? '`' + identifier + '`'
+        //   : identifier;
+        return '`' + identifier + '`';
     }
     sqlNow() {
         return (0, malloy_types_1.mkExpr) `CURRENT_TIMESTAMP()`;

package/dist/model/malloy_query.js

@@ -35,6 +35,9 @@ const utils_1 = require("./utils");
 function generateSQLStringLiteral(sourceString) {
     return `'${sourceString}'`;
 }
+function identifierNormalize(s) {
+    return s.replace(/[^a-zA-Z0-9_]/g, '_o_');
+}
 class StageWriter {
     constructor(useCTE = true, parent) {
         this.withs = [];
@@ -1947,7 +1950,7 @@ class QueryQuery extends QueryField {
                 const passKeys = this.generateSQLPassthroughKeys(qs);
                 structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, * ${passKeys} FROM ${structSQL} as x)`;
             }
-            s += `FROM ${structSQL} as ${this.parent.getIdentifier()}\n`;
+            s += `FROM ${structSQL} as ${ji.alias}\n`;
         }
         else {
             throw new Error('Internal Error, queries must start from a basetable');
@@ -2051,10 +2054,11 @@ class QueryQuery extends QueryField {
                             output.lateralJoinSQLExpressions.push(`${exp} as ${outputName}`);
                             output.sql.push(outputFieldName);
                             if (fi.f.fieldDef.type === 'number') {
-                                const outputFieldNameString = `${outputFieldName}_string`;
+                                const outputNameString = this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultSet.groupSet}_string`);
+                                const outputFieldNameString = `__lateral_join_bag.${outputNameString}`;
                                 output.sql.push(outputFieldNameString);
                                 output.dimensionIndexes.push(output.fieldIndex++);
-                                output.lateralJoinSQLExpressions.push(`CAST(${exp} as STRING) as ${outputName}_string`);
+                                output.lateralJoinSQLExpressions.push(`CAST(${exp} as STRING) as ${outputNameString}`);
                                 fi.partitionSQL = outputFieldNameString;
                             }
                         }
@@ -2268,7 +2272,7 @@ class QueryQuery extends QueryField {
                         dimensionIndexes.push(fieldIndex++);
                     }
                     else if (isCalculatedField(fi.f)) {
-                        fieldsSQL.push(this.parent.dialect.sqlAnyValueLastTurtle(name, this.rootResult.groupSet, sqlName));
+                        fieldsSQL.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${this.rootResult.groupSet}`), this.rootResult.groupSet, sqlName));
                         fieldIndex++;
                     }
                 }
@@ -2279,7 +2283,7 @@ class QueryQuery extends QueryField {
                     fieldIndex++;
                 }
                 else if (fi.firstSegment.type === 'project') {
-                    fieldsSQL.push(this.parent.dialect.sqlAnyValueLastTurtle(name, this.rootResult.groupSet, sqlName));
+                    fieldsSQL.push(this.parent.dialect.sqlAnyValueLastTurtle(this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${this.rootResult.groupSet}`), this.rootResult.groupSet, sqlName));
                     fieldIndex++;
                 }
             }
@@ -2793,7 +2797,7 @@ class QueryStruct extends QueryNode {
         // make a unique alias name
         if (ret === undefined) {
             const aliases = Array.from(this.pathAliasMap.values());
-            const base = (0, malloy_types_1.getIdentifier)(this.fieldDef);
+            const base = identifierNormalize((0, malloy_types_1.getIdentifier)(this.fieldDef));
             let name = `${base}_0`;
             let n = 1;
             while (aliases.includes(name) && n < 1000) {
@@ -2860,7 +2864,7 @@ class QueryStruct extends QueryNode {
                 return 'base';
             }
             else {
-                return super.getIdentifier();
+                return identifierNormalize(super.getIdentifier());
             }
         }
         // if this is an inline object, include the parents alias.

package/package.json

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