@malloydata/malloy 0.0.123-dev240205203117 → 0.0.123-dev240205203120

package/dist/lang/ast/expressions/expr-aggregate-function.js

@@ -87,8 +87,7 @@ class ExprAggregateFunction extends expression_def_1.ExpressionDef {
                     // locality to be that join path
                     const joinUsage = this.getJoinUsage(inputFS);
                     const allUsagesSame = joinUsage.length === 1 ||
-                        (joinUsage.length > 1 &&
-                            joinUsage.slice(1).every(p => joinPathEq(p, joinUsage[0])));
+                        joinUsage.slice(1).every(p => joinPathEq(p, joinUsage[0]));
                     if (allUsagesSame) {
                         structPath = joinUsage[0].map(p => p.name);
                         sourceRelationship = joinUsage[0];
@@ -228,6 +227,7 @@ function getJoinUsage(fs, expr) {
     };
     (0, utils_1.exprWalk)(expr, frag => {
         if (typeof frag !== 'string') {
+            // TODO make this work for field references inside sql_* functions
             if (frag.type === 'field') {
                 const def = lookup(fs, frag.path);
                 if (def.def.type !== 'struct' && def.def.type !== 'turtle') {
@@ -240,15 +240,6 @@ function getJoinUsage(fs, expr) {
                     }
                 }
             }
-            else if (frag.type === 'source-reference') {
-                if (frag.path) {
-                    const def = lookup(fs, frag.path);
-                    result.push(def.relationship);
-                }
-                else {
-                    result.push([]);
-                }
-            }
         }
     });
     return result;

package/dist/lang/test/expressions.spec.js

@@ -475,18 +475,6 @@ describe('expressions', () => {
         test('source.sum(nested.column)', () => {
             expect(modelX `source.sum(nested.column)`).translationToFailWith('Cannot compute `sum` across repeated relationship `nested`; use `nested.column.sum()`');
         });
-        test('can aggregate field defined with no join usage', () => {
-            expect((0, test_translator_1.markSource) `
-        ##! experimental { sql_functions }
-        source: s is a extend {
-          measure: c is count()
-          dimension: f is 1
-        }
-        run: s -> {
-          aggregate: v is f.sum()
-        }
-      `).toTranslate();
-        });
         test('sum(inline.column)', () => {
             expect(modelX `sum(inline.column)`).toTranslateWithWarnings('Join path is required for this calculation; use `inline.column.sum()` or `source.sum(inline.column)` to get a result weighted with respect to `source`');
         });
@@ -811,11 +799,6 @@ describe('unspported fields in schema', () => {
     test('negative numbers are not tokens', () => {
         expect((0, test_translator_1.expr) `ai-1`).toTranslate();
     });
-    describe('sql functions', () => {
-        test('can aggregate a sql_ function', () => {
-            expect((0, test_translator_1.expr) `sum(sql_number("\${a} * 2"))`).toTranslate();
-        });
-    });
     describe('cast', () => {
         // The "+ 1"s are there to make sure the result is of type 'number'
         test('sql cast', () => {

package/dist/lang/test/parse.spec.js

@@ -875,19 +875,5 @@ describe('m3/m4 source query sentences', () => {
     `).toTranslate();
     });
 });
-describe('sql_functions', () => {
-    test('can aggregate sql function', () => {
-        expect((0, test_translator_1.markSource) `
-      ##! experimental { sql_functions }
-      source: s is a extend {
-        measure: c is count()
-        dimension: sql_expr is sql_number("LENGTH(\${TABLE}.astr)")
-      }
-      run: s -> {
-        aggregate: v is sql_expr.sum()
-      }
-    `).toTranslate();
-    });
-});
 test('non breaking space in source', () => expect('source:\u00a0z\u00a0is\u00a0a').toParse());
 //# sourceMappingURL=parse.spec.js.map

package/dist/model/utils.js

@@ -125,9 +125,6 @@ function exprMap(expr, func) {
                 case 'function_parameter':
                 case 'parameter':
                 case 'outputField':
-                case 'source-reference':
-                case 'aggregate_limit':
-                case 'aggregate_order_by':
                     return fragment;
                 case 'sql-string':
                     return {
@@ -234,9 +231,6 @@ function exprWalk(expr, func) {
             case 'function_parameter':
             case 'parameter':
             case 'outputField':
-            case 'source-reference':
-            case 'aggregate_limit':
-            case 'aggregate_order_by':
                 return fragment;
             case 'function_call':
                 return {
@@ -310,7 +304,7 @@ function exprWalk(expr, func) {
                 }
             }
             default:
-                throw new Error(`unexpected fragment type ${fragment.type}`);
+                throw new Error('unexpected');
         }
     });
 }

package/package.json

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