@malloydata/malloy 0.0.110 → 0.0.111-dev231204165238

package/dist/lang/lib/Malloy/MalloyParserListener.d.ts

@@ -137,6 +137,7 @@ import { QueryExtendStatementContext } from "./MalloyParser";
 import { QueryExtendStatementListContext } from "./MalloyParser";
 import { JoinListContext } from "./MalloyParser";
 import { IsExploreContext } from "./MalloyParser";
+import { MatrixOperationContext } from "./MalloyParser";
 import { JoinDefContext } from "./MalloyParser";
 import { JoinExpressionContext } from "./MalloyParser";
 import { FilterStatementContext } from "./MalloyParser";
@@ -1742,6 +1743,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitIsExplore?: (ctx: IsExploreContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.matrixOperation`.
+     * @param ctx the parse tree
+     */
+    enterMatrixOperation?: (ctx: MatrixOperationContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.matrixOperation`.
+     * @param ctx the parse tree
+     */
+    exitMatrixOperation?: (ctx: MatrixOperationContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.joinDef`.
      * @param ctx the parse tree

package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts

@@ -137,6 +137,7 @@ import { QueryExtendStatementContext } from "./MalloyParser";
 import { QueryExtendStatementListContext } from "./MalloyParser";
 import { JoinListContext } from "./MalloyParser";
 import { IsExploreContext } from "./MalloyParser";
+import { MatrixOperationContext } from "./MalloyParser";
 import { JoinDefContext } from "./MalloyParser";
 import { JoinExpressionContext } from "./MalloyParser";
 import { FilterStatementContext } from "./MalloyParser";
@@ -1117,6 +1118,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitIsExplore?: (ctx: IsExploreContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.matrixOperation`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitMatrixOperation?: (ctx: MatrixOperationContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.joinDef`.
      * @param ctx the parse tree

package/dist/lang/malloy-to-ast.js

@@ -432,10 +432,18 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return result;
     }
     visitJoinOn(pcx) {
+        var _a;
         const joinAs = this.getModelEntryName(pcx.joinNameDef());
         const { joinFrom, notes } = this.getJoinSource(joinAs, pcx.isExplore());
         const join = new ast.ExpressionJoin(joinAs, joinFrom);
         const onCx = pcx.joinExpression();
+        const mop = ((_a = pcx.matrixOperation()) === null || _a === void 0 ? void 0 : _a.text.toLocaleLowerCase()) || 'left';
+        if ((0, malloy_types_1.isMatrixOperation)(mop)) {
+            join.matrixOperation = mop;
+        }
+        else {
+            this.contextError(pcx, 'Internal Error: Unknown matrixOperation');
+        }
         if (onCx) {
             join.joinOn = this.getFieldExpr(onCx);
         }

package/dist/lang/test/field-symbols.spec.js

@@ -143,6 +143,7 @@ describe('structdef comprehension', () => {
             dialect: 'standardsql',
             structRelationship: {
                 type: 'one',
+                matrixOperation: 'left',
                 onExpression: [
                     { type: 'field', path: 'aKey' },
                     '=',

package/dist/lang/test/test-translator.js

@@ -240,6 +240,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
                             as: 'b',
                             structRelationship: {
                                 type: 'one',
+                                matrixOperation: 'left',
                                 onExpression: [
                                     { type: 'field', path: 'astr' },
                                     '=',

package/dist/model/malloy_query.d.ts

@@ -195,6 +195,7 @@ declare class JoinInstance {
     children: JoinInstance[];
     constructor(queryStruct: QueryStruct, alias: string, parent: JoinInstance | undefined);
     parentRelationship(): 'root' | JoinRelationship;
+    forceAllSymmetricCalculations(): boolean;
     getDialectFieldList(): DialectFieldList;
 }
 /** nested query */

package/dist/model/malloy_query.js

@@ -696,6 +696,7 @@ class QueryFieldStruct extends QueryAtomicField {
             ...this.parent.fieldDef,
             structRelationship: {
                 type: 'one',
+                matrixOperation: 'left',
                 onExpression: [
                     {
                         type: 'field',
@@ -1138,7 +1139,8 @@ class FieldInstanceResultRoot extends FieldInstanceResult {
         for (const [name, join] of this.joins) {
             // first join is by default the
             const relationship = join.parentRelationship();
-            if (relationship === 'many_to_many') {
+            if (relationship === 'many_to_many' ||
+                join.forceAllSymmetricCalculations()) {
                 // everything must be calculated with symmetric aggregates
                 leafiest = '0never';
             }
@@ -1231,6 +1233,20 @@ class JoinInstance {
                 throw new Error(`Internal error unknown relationship type to parent for ${this.queryStruct.fieldDef.name}`);
         }
     }
+    // For now, we force all symmetric calculations for full and right joins
+    //  because we need distinct keys for COUNT(xx) operations.  Don't really need
+    //  this for sums.  This will produce correct results and we can optimize this
+    //  at some point..
+    forceAllSymmetricCalculations() {
+        const sr = this.queryStruct.fieldDef.structRelationship;
+        if (this.queryStruct.parent === undefined || !(0, malloy_types_1.isJoinOn)(sr)) {
+            return false;
+        }
+        if (sr.matrixOperation === 'right' || sr.matrixOperation === 'full') {
+            return true;
+        }
+        return false;
+    }
     // postgres unnest needs to know the names of the physical fields.
     getDialectFieldList() {
         const dialectFieldList = [];
@@ -1869,6 +1885,7 @@ class QueryQuery extends QueryField {
         const structRelationship = qs.fieldDef.structRelationship;
         let structSQL = qs.structSourceSQL(stageWriter);
         if ((0, malloy_types_1.isJoinOn)(structRelationship)) {
+            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)`;
@@ -1896,7 +1913,7 @@ class QueryQuery extends QueryField {
                 if (conditions !== undefined && conditions.length >= 1) {
                     filters = ` AND (${conditions.join(' AND ')})`;
                 }
-                s += `LEFT JOIN ${structSQL} AS ${ji.alias}\n  ON ${onCondition}${filters}\n`;
+                s += ` ${matrixOperation} JOIN ${structSQL} AS ${ji.alias}\n  ON ${onCondition}${filters}\n`;
             }
             else {
                 let select = `SELECT ${ji.alias}.*`;
@@ -1907,7 +1924,7 @@ class QueryQuery extends QueryField {
                     select += `, ${this.parent.dialect.sqlSelectAliasAsStruct(childJoin.alias, physicalFields)} AS ${childJoin.alias}`;
                 }
                 select += `\nFROM ${structSQL} AS ${ji.alias}\n${joins}\nWHERE ${conditions === null || conditions === void 0 ? void 0 : conditions.join(' AND ')}\n`;
-                s += `LEFT JOIN (\n${(0, utils_1.indent)(select)}) AS ${ji.alias}\n  ON ${onCondition}\n`;
+                s += `${matrixOperation} JOIN (\n${(0, utils_1.indent)(select)}) AS ${ji.alias}\n  ON ${onCondition}\n`;
                 return s;
             }
         }

package/dist/model/malloy_types.d.ts

@@ -459,8 +459,11 @@ export interface TurtleDef extends NamedObject, Pipeline {
     annotation?: Annotation;
 }
 export type JoinRelationship = 'one_to_one' | 'one_to_many' | 'many_to_one' | 'many_to_many';
+export type MatrixOperation = 'left' | 'right' | 'full' | 'inner';
+export declare function isMatrixOperation(x: string): x is MatrixOperation;
 export interface JoinOn {
     type: 'one' | 'many' | 'cross';
+    matrixOperation: MatrixOperation;
     onExpression?: Expr;
 }
 export declare function isJoinOn(sr: StructRelationship): sr is JoinOn;

package/dist/model/malloy_types.js

@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSQLFragment = exports.isJoinOn = exports.isIndexSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
-exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = void 0;
+exports.isJoinOn = exports.isMatrixOperation = exports.isIndexSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
+exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = void 0;
 function isValueParameter(p) {
     return p.value !== undefined;
 }
@@ -314,6 +314,10 @@ function isIndexSegment(pe) {
     return pe.type === 'index';
 }
 exports.isIndexSegment = isIndexSegment;
+function isMatrixOperation(x) {
+    return ['left', 'right', 'full', 'inner'].includes(x);
+}
+exports.isMatrixOperation = isMatrixOperation;
 function isJoinOn(sr) {
     return ['one', 'many', 'cross'].includes(sr.type);
 }

package/package.json

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