@malloydata/malloy 0.0.32-dev230505153727 → 0.0.32-dev230506192652

package/dist/dialect/duckdb.d.ts

@@ -25,7 +25,7 @@ export declare class DuckDBDialect extends Dialect {
     sqlAnyValueTurtle(groupSet: number, fieldList: DialectFieldList): string;
     sqlAnyValueLastTurtle(name: string, groupSet: number, sqlName: string): string;
     sqlCoaleseMeasuresInline(groupSet: number, fieldList: DialectFieldList): string;
-    sqlUnnestAlias(source: string, alias: string, _fieldList: DialectFieldList, _needDistinctKey: boolean): string;
+    sqlUnnestAlias(source: string, alias: string, _fieldList: DialectFieldList, needDistinctKey: boolean): string;
     sqlSumDistinctHashedKey(_sqlDistinctKey: string): string;
     sqlGenerateUUID(): string;
     sqlDateToString(sqlDateExp: string): string;

package/dist/dialect/duckdb.js

@@ -129,11 +129,11 @@ class DuckDBDialect extends dialect_1.Dialect {
         this.stringTypeName = 'VARCHAR';
         this.divisionIsInteger = true;
         this.supportsSumDistinctFunction = true;
-        this.unnestWithNumbers = true;
+        this.unnestWithNumbers = false;
         this.defaultSampling = { rows: 50000 };
         this.supportUnnestArrayAgg = true;
         this.supportsCTEinCoorelatedSubQueries = true;
-        this.dontUnionIndex = false;
+        this.dontUnionIndex = true;
         this.supportsQualify = true;
         this.functionInfo = {
             concat: { returnType: 'string' },
@@ -183,13 +183,27 @@ class DuckDBDialect extends dialect_1.Dialect {
             .join(', ');
         return `COALESCE(FIRST({${fields}}) FILTER(WHERE group_set=${groupSet}), {${nullValues}})`;
     }
-    sqlUnnestAlias(source, alias, _fieldList, _needDistinctKey) {
-        return `LEFT JOIN (select UNNEST(generate_series(1,
-        100000, --
-        -- (SELECT genres_length FROM movies limit 1),
-        1)) as __row_id) as ${alias} ON  ${alias}.__row_id <= array_length(${source})`;
-        // When DuckDB supports lateral joins...
-        //return `,(select UNNEST(generate_series(1, length(${source}),1))) as ${alias}(__row_id)`;
+    // sqlUnnestAlias(
+    //   source: string,
+    //   alias: string,
+    //   _fieldList: DialectFieldList,
+    //   _needDistinctKey: boolean
+    // ): string {
+    //   return `LEFT JOIN (select UNNEST(generate_series(1,
+    //       100000, --
+    //       -- (SELECT genres_length FROM movies limit 1),
+    //       1)) as __row_id) as ${alias} ON  ${alias}.__row_id <= array_length(${source})`;
+    //   // When DuckDB supports lateral joins...
+    //   //return `,(select UNNEST(generate_series(1, length(${source}),1))) as ${alias}(__row_id)`;
+    // }
+    sqlUnnestAlias(source, alias, _fieldList, needDistinctKey) {
+        //Simulate left joins by guarenteeing there is at least one row.
+        if (!needDistinctKey) {
+            return `LEFT JOIN LATERAL (SELECT UNNEST(${source}), 1 as ignoreme) as ${alias}_outer(${alias},ignoreme) ON ${alias}_outer.ignoreme=1`;
+        }
+        else {
+            return `LEFT JOIN LATERAL (SELECT UNNEST(GENERATE_SERIES(1, length(${source}),1)) as __row_id, UNNEST(${source}), 1 as ignoreme) as ${alias}_outer(__row_id, ${alias},ignoreme) ON  ${alias}_outer.ignoreme=1`;
+        }
     }
     sqlSumDistinctHashedKey(_sqlDistinctKey) {
         return 'uses sumDistinctFunction, should not be called';
@@ -201,7 +215,11 @@ class DuckDBDialect extends dialect_1.Dialect {
         return `(${sqlDateExp})::date::varchar`;
     }
     sqlFieldReference(alias, fieldName, _fieldType, _isNested, isArray) {
-        if (isArray) {
+        // LTNOTE: hack, in duckdb we can't have structs as tables so we kind of simulate it.
+        if (fieldName === '__row_id') {
+            return `${alias}_outer.__row_id`;
+        }
+        else if (isArray) {
             return alias;
         }
         else {

package/dist/model/malloy_query.js

@@ -1328,6 +1328,7 @@ class QueryQuery extends QueryField {
             else if ((0, malloy_types_1.isFilterFragment)(expr)) {
                 for (const filterCond of expr.filterList) {
                     this.addDependantExpr(resultStruct, context, filterCond.expression, joinStack);
+                    this.addDependantExpr(resultStruct, context, expr.e, joinStack);
                 }
             }
             else if ((0, malloy_types_1.isDialectFragment)(expr)) {

package/package.json

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