@malloydata/malloy 0.0.180 → 0.0.181-dev240907212110

package/dist/dialect/postgres/postgres.d.ts

@@ -24,6 +24,7 @@ export declare class PostgresDialect extends PostgresBase {
     supportsNesting: boolean;
     experimental: boolean;
     readsNestedData: boolean;
+    supportsComplexFilteredSources: boolean;
     quoteTablePath(tablePath: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     sqlAnyValue(groupSet: number, fieldName: string): string;

package/dist/dialect/postgres/postgres.js

@@ -92,6 +92,7 @@ class PostgresDialect extends pg_impl_1.PostgresBase {
         this.supportsNesting = true;
         this.experimental = false;
         this.readsNestedData = false;
+        this.supportsComplexFilteredSources = false;
     }
     quoteTablePath(tablePath) {
         return tablePath

package/dist/dialect/snowflake/snowflake.d.ts

@@ -23,6 +23,7 @@ export declare class SnowflakeDialect extends Dialect {
     dontUnionIndex: boolean;
     supportsQualify: boolean;
     supportsPipelinesInViews: boolean;
+    supportsComplexFilteredSources: boolean;
     quoteTablePath(tablePath: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     sqlAnyValue(groupSet: number, fieldName: string): string;

package/dist/dialect/snowflake/snowflake.js

@@ -96,6 +96,7 @@ class SnowflakeDialect extends dialect_1.Dialect {
         this.dontUnionIndex = false;
         this.supportsQualify = false;
         this.supportsPipelinesInViews = false;
+        this.supportsComplexFilteredSources = false;
     }
     // don't mess with the table pathing.
     quoteTablePath(tablePath) {

package/dist/model/malloy_query.js

@@ -2006,16 +2006,28 @@ class QueryQuery extends QueryField {
             if (ji.joinFilterConditions) {
                 conditions = ji.joinFilterConditions.map(qf => qf.generateExpression(this.rootResult));
             }
-            if (ji.children.length === 0 || conditions === undefined) {
+            if (ji.children.length === 0 ||
+                conditions === undefined ||
+                !this.parent.dialect.supportsComplexFilteredSources) {
+                // LTNOTE: need a check here to see the children's where: conditions are local
+                //  to the source and not to any of it's joined children.
+                //  In Presto, we're going to get a SQL error if in this case
+                //  for now.  We need to inspect the 'condition' of each of the children
+                //  to see if they reference subchildren and blow up if they do
+                //  or move them to the where clause with a (x.distnct_key is NULL or (condition))
+                //
+                // const childrenFiltersAreComplex = somethign(conditions)
+                // if (conditions && childrenFiltersAreComplex !this.parent.dialect.supportsComplexFilteredSources) {
+                //   throw new Error(
+                //     'Cannot join a source with a complex filter on a joined source'
+                //   );
+                // }
                 if (conditions !== undefined && conditions.length >= 1) {
                     filters = ` AND (${conditions.join(' AND ')})`;
                 }
                 s += ` ${matrixOperation} JOIN ${structSQL} AS ${ji.alias}\n  ON ${onCondition}${filters}\n`;
             }
             else {
-                if (!this.parent.dialect.supportsComplexFilteredSources) {
-                    throw new Error('Cannot join a source with a filter on a joined source');
-                }
                 let select = `SELECT ${ji.alias}.*`;
                 let joins = '';
                 for (const childJoin of ji.children) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.180",
+  "version": "0.0.181-dev240907212110",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",