@malloydata/malloy 0.0.38-dev230609163341 → 0.0.38-dev230609221655

package/dist/model/malloy_query.d.ts

@@ -243,6 +243,7 @@ declare class QueryQuery extends QueryField {
     /**  returns a fields and primary key of a struct for this query */
     getResultStructDef(resultStruct?: FieldInstanceResult, isRoot?: boolean): StructDef;
     generateSQLJoinBlock(stageWriter: StageWriter, ji: JoinInstance): string;
+    generateSQLPassthroughKeys(qs: QueryStruct): string;
     generateSQLJoins(stageWriter: StageWriter): string;
     genereateSQLOrderBy(queryDef: QuerySegment, resultStruct: FieldInstanceResult): string;
     generateSimpleSQL(stageWriter: StageWriter): string;

package/dist/model/malloy_query.js

@@ -1679,7 +1679,8 @@ class QueryQuery extends QueryField {
         let structSQL = qs.structSourceSQL(stageWriter);
         if ((0, malloy_types_1.isJoinOn)(structRelationship)) {
             if (ji.makeUniqueKey) {
-                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, * FROM ${structSQL} as x)`;
+                const passKeys = this.generateSQLPassthroughKeys(qs);
+                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, * ${passKeys} FROM ${structSQL} as x)`;
             }
             let onCondition = '';
             if (qs.parent === undefined) {
@@ -1740,6 +1741,25 @@ class QueryQuery extends QueryField {
         }
         return s;
     }
+    // BigQuery has wildcard psudo columns that are treated differently
+    //  SELECT * FROM xxx doesn't include these psuedo columns but we need them so
+    //  filters can get pushed down properly when generating a UNIQUE key.
+    //  No other dialect really needs this so we are coding here but maybe someday
+    //  this makes its way into the dialect.
+    generateSQLPassthroughKeys(qs) {
+        let ret = '';
+        if (qs.dialect.name === 'standardsql') {
+            const psudoCols = [
+                '_TABLE_SUFFIX',
+                '_PARTITIONDATE',
+                '_PARTITIONTIME',
+            ].filter(element => qs.getChildByName(element) !== undefined);
+            if (psudoCols.length > 0) {
+                ret = ', ' + psudoCols.join(', ');
+            }
+        }
+        return ret;
+    }
     generateSQLJoins(stageWriter) {
         let s = '';
         // get the first value from the map (weird, I know)
@@ -1756,7 +1776,8 @@ class QueryQuery extends QueryField {
         const structRelationship = qs.fieldDef.structRelationship;
         if (structRelationship.type === 'basetable') {
             if (ji.makeUniqueKey) {
-                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, * FROM ${structSQL} as x)`;
+                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`;
         }

package/package.json

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