@malloydata/malloy 0.0.125 → 0.0.126-dev240305182920

package/dist/model/malloy_query.js

@@ -562,7 +562,7 @@ class QueryField extends QueryNode {
             throw new Error(`Join ${joinName} not found in result set`);
         }
         if (!join.leafiest || join.makeUniqueKey) {
-            func = 'COUNT(DISTINCT';
+            func = 'COUNT(DISTINCT ';
             thing = struct.getDistinctKey().generateExpression(resultSet);
         }
         // const distinctKeySQL = this.generateDistinctKeyIfNecessary(
@@ -576,10 +576,10 @@ class QueryField extends QueryNode {
         // }
         // find the structDef and return the path to the field...
         if (state.whereSQL) {
-            return `${func} CASE WHEN ${state.whereSQL} THEN ${thing} END)`;
+            return `${func}CASE WHEN ${state.whereSQL} THEN ${thing} END)`;
         }
         else {
-            return `${func} ${thing})`;
+            return `${func}${thing})`;
         }
     }
     generateDialect(resultSet, context, expr, state) {
@@ -927,7 +927,7 @@ function sqlSumDistinct(dialect, sqlExp, sqlDistintKey) {
      SUM(DISTINCT ${uniqueInt})
   )`;
     let ret = `(${sumSQL}/(${multiplier}*1.0))`;
-    ret = `CAST(${ret} as ${dialect.defaultNumberType})`;
+    ret = `CAST(${ret} AS ${dialect.defaultNumberType})`;
     return ret;
 }
 class FieldInstanceField {
@@ -1416,6 +1416,7 @@ class JoinInstance {
             dialectFieldList.push({
                 type: f.type,
                 sqlExpression: (0, malloy_types_1.getIdentifier)(f),
+                rawName: (0, malloy_types_1.getIdentifier)(f),
                 sqlOutputName: (0, malloy_types_1.getIdentifier)(f),
             });
         }
@@ -1953,7 +1954,7 @@ class QueryQuery extends QueryField {
             const matrixOperation = structRelationship.matrixOperation.toUpperCase();
             if (ji.makeUniqueKey) {
                 const passKeys = this.generateSQLPassthroughKeys(qs);
-                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, x.* ${passKeys} FROM ${structSQL} as x)`;
+                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as ${qs.dialect.sqlMaybeQuoteIdentifier('__distinct_key')}, x.* ${passKeys} FROM ${structSQL} as x)`;
             }
             let onCondition = '';
             if (qs.parent === undefined) {
@@ -2050,7 +2051,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, x.* ${passKeys} FROM ${structSQL} as x)`;
+                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as ${qs.dialect.sqlMaybeQuoteIdentifier('__distinct_key')}, x.* ${passKeys} FROM ${structSQL} as x)`;
             }
             s += `FROM ${structSQL} as ${ji.alias}\n`;
         }
@@ -2472,6 +2473,7 @@ class QueryQuery extends QueryField {
                         ? field.f.fieldDef.type
                         : 'struct',
                     sqlExpression: this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultStruct.groupSet}`),
+                    rawName: name,
                     sqlOutputName: sqlName,
                 });
             }
@@ -2484,6 +2486,7 @@ class QueryQuery extends QueryField {
                 dialectFieldList.push({
                     type: field.type,
                     sqlExpression: field.f.generateExpression(resultStruct),
+                    rawName: name,
                     sqlOutputName: sqlName,
                 });
             }
@@ -2664,6 +2667,7 @@ class QueryQueryIndexStage extends QueryQuery {
         const fieldValueColumn = dialect.sqlMaybeQuoteIdentifier('fieldValue');
         const fieldTypeColumn = dialect.sqlMaybeQuoteIdentifier('fieldType');
         const fieldRangeColumn = dialect.sqlMaybeQuoteIdentifier('fieldRange');
+        const weightColumn = dialect.sqlMaybeQuoteIdentifier('weight');
         const measureName = this.firstSegment.weightMeasure;
         if (measureName) {
             measureSQL = this.rootResult
@@ -2703,7 +2707,7 @@ class QueryQueryIndexStage extends QueryQuery {
             }
         }
         s += `  END as ${fieldValueColumn},\n`;
-        s += ` ${measureSQL} as weight,\n`;
+        s += ` ${measureSQL} as ${weightColumn},\n`;
         // just in case we don't have any field types, force the case statement to have at least one value.
         s += "  CASE group_set\n    WHEN 99999 THEN ''";
         for (let i = 0; i < fields.length; i++) {
@@ -2737,7 +2741,7 @@ class QueryQueryIndexStage extends QueryQuery {
   ${fieldPathColumn},
   ${fieldTypeColumn},
   COALESCE(${fieldValueColumn}, ${fieldRangeColumn}) as ${fieldValueColumn},
-  weight
+  ${weightColumn}
 FROM ${resultStage}\n`);
         return this.resultStage;
     }
@@ -3390,6 +3394,7 @@ class QueryModel {
         const fieldPathColumn = struct.dialect.sqlMaybeQuoteIdentifier('fieldPath');
         const fieldValueColumn = struct.dialect.sqlMaybeQuoteIdentifier('fieldValue');
         const fieldTypeColumn = struct.dialect.sqlMaybeQuoteIdentifier('fieldType');
+        const weightColumn = struct.dialect.sqlMaybeQuoteIdentifier('weight');
         // if we've compiled the SQL before use it otherwise
         let sqlPDT = this.exploreSearchSQLMap.get(explore);
         if (sqlPDT === undefined) {
@@ -3401,13 +3406,13 @@ class QueryModel {
               ${fieldPathColumn},
               ${fieldValueColumn},
               ${fieldTypeColumn},
-              weight,
+              ${weightColumn},
               CASE WHEN lower(${fieldValueColumn}) LIKE lower(${generateSQLStringLiteral(searchValue + '%')}) THEN 1 ELSE 0 END as match_first
             FROM  ${await connection.manifestTemporaryTable(sqlPDT)}
             WHERE lower(${fieldValueColumn}) LIKE lower(${generateSQLStringLiteral('%' + searchValue + '%')}) ${searchField !== undefined
             ? ` AND ${fieldNameColumn} = '` + searchField + "' \n"
             : ''}
-            ORDER BY CASE WHEN lower(${fieldValueColumn}) LIKE  lower(${generateSQLStringLiteral(searchValue + '%')}) THEN 1 ELSE 0 END DESC, weight DESC
+            ORDER BY CASE WHEN lower(${fieldValueColumn}) LIKE  lower(${generateSQLStringLiteral(searchValue + '%')}) THEN 1 ELSE 0 END DESC, ${weightColumn} DESC
             LIMIT ${limit}
           `;
         if (struct.dialect.hasFinalStage) {
@@ -3416,7 +3421,7 @@ class QueryModel {
                 fieldPathColumn,
                 fieldValueColumn,
                 fieldTypeColumn,
-                'weight',
+                weightColumn,
                 'match_first',
             ])}`;
         }

package/package.json

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