@malloydata/malloy 0.0.225-dev241217215316 → 0.0.225-dev241219181305

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

@@ -262,6 +262,18 @@ describe('expressions', () => {
         }
       `).toLog((0, test_translator_1.errorMessage)('Filtered expression requires an aggregate computation'));
     });
+    test('can use calculate with partition by in select', () => {
+        expect((0, test_translator_1.markSource) `
+    ##! experimental { partition_by function_order_by }
+    run: a -> {
+      select: ai, astr
+      calculate: prev is lag(ai) {
+        partition_by: astr
+        order_by: ai asc
+      }
+      order_by: ai asc, astr asc
+    }`).toTranslate();
+    });
     describe('expr props', () => {
         test('aggregate order by not allowed without experiments enabled', () => {
             expect((0, test_translator_1.markSource) `

package/dist/model/malloy_query.d.ts

@@ -4,6 +4,7 @@ import { Connection } from '../connection/types';
 import { AndChain } from './utils';
 import { QueryInfo } from '../dialect/dialect';
 import { EventStream } from '../runtime_types';
+import { Tag } from '../tags';
 interface TurtleDefPlus extends TurtleDef, Filtered {
 }
 /** Parent from QueryStruct. */
@@ -307,6 +308,8 @@ declare class QueryStruct {
     connectionName: string;
     recordAlias?: string;
     constructor(structDef: StructDef, sourceArguments: Record<string, Argument> | undefined, parent: ParentQueryStruct | ParentQueryModel, prepareResultOptions: PrepareResultOptions);
+    private _modelTag;
+    modelCompilerFlags(): Tag;
     protected findFirstDialect(): string;
     informOfAliasValue(av: string): void;
     maybeEmitParameterizedSourceUsage(): void;

package/dist/model/malloy_query.js

@@ -29,6 +29,7 @@ const standardsql_1 = require("../dialect/standardsql/standardsql");
 const malloy_types_1 = require("./malloy_types");
 const utils_1 = require("./utils");
 const utils_2 = require("./materialization/utils");
+const tags_1 = require("../tags");
 function pathToCol(path) {
     return path.map(el => encodeURIComponent(el)).join('/');
 }
@@ -2443,7 +2444,8 @@ class QueryQuery extends QueryField {
             outputPipelinedSQL: [],
         };
         this.generateStage0Fields(this.rootResult, f, stageWriter);
-        if (this.firstSegment.type === 'project') {
+        if (this.firstSegment.type === 'project' &&
+            !this.parent.modelCompilerFlags().has('unsafe_complex_select_query')) {
             throw new Error('PROJECT cannot be used on queries with turtles');
         }
         const groupBy = 'GROUP BY ' + f.dimensionIndexes.join(',') + '\n';
@@ -3061,6 +3063,7 @@ class QueryStruct {
         this.sourceArguments = sourceArguments;
         this.prepareResultOptions = prepareResultOptions;
         this.nameMap = new Map();
+        this._modelTag = undefined;
         this._arguments = undefined;
         this.setParent(parent);
         if ('model' in parent) {
@@ -3081,6 +3084,14 @@ class QueryStruct {
         this.dialect = (0, dialect_1.getDialect)(this.findFirstDialect());
         this.addFieldsFromFieldList(structDef.fields);
     }
+    modelCompilerFlags() {
+        if (this._modelTag === undefined) {
+            const annotation = this.structDef.modelAnnotation;
+            const { tag } = tags_1.Tag.annotationToTag(annotation, { prefix: /^##!\s*/ });
+            this._modelTag = tag;
+        }
+        return this._modelTag;
+    }
     findFirstDialect() {
         if ((0, malloy_types_1.isSourceDef)(this.structDef)) {
             return this.structDef.dialect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.225-dev241217215316",
+  "version": "0.0.225-dev241219181305",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",