@malloydata/malloy 0.0.334 → 0.0.335

package/dist/lang/ast/expressions/expr-count-distinct.js

@@ -61,7 +61,13 @@ const expr_aggregate_function_1 = require("./expr-aggregate-function");
 class ExprCountDistinct extends expr_aggregate_function_1.ExprAggregateFunction {
     constructor(expr) {
         super('distinct', expr);
-        this.legalChildTypes = [TDU.numberT, TDU.stringT, TDU.dateT, TDU.timestampT];
+        this.legalChildTypes = [
+            TDU.numberT,
+            TDU.stringT,
+            TDU.dateT,
+            TDU.timestampT,
+            TDU.timestamptzT,
+        ];
     }
     returns(ev) {
         return {

package/dist/lang/ast/expressions/expr-granular-time.js

@@ -77,7 +77,7 @@ class ExprGranularTime extends expression_def_1.ExpressionDef {
         this.units = units;
         this.truncate = truncate;
         this.elementType = 'granularTime';
-        this.legalChildTypes = [TDU.timestampT, TDU.dateT];
+        this.legalChildTypes = [TDU.timestampT, TDU.timestamptzT, TDU.dateT];
     }
     granular() {
         return true;

package/dist/lang/ast/expressions/expr-max.js

@@ -61,7 +61,13 @@ const expr_aggregate_function_1 = require("./expr-aggregate-function");
 class ExprMax extends expr_aggregate_function_1.ExprAggregateFunction {
     constructor(expr) {
         super('max', expr);
-        this.legalChildTypes = [TDU.numberT, TDU.stringT, TDU.dateT, TDU.timestampT];
+        this.legalChildTypes = [
+            TDU.numberT,
+            TDU.stringT,
+            TDU.dateT,
+            TDU.timestampT,
+            TDU.timestamptzT,
+        ];
     }
     returns(ev) {
         return ev;

package/dist/lang/ast/expressions/expr-min.js

@@ -61,7 +61,13 @@ const expr_aggregate_function_1 = require("./expr-aggregate-function");
 class ExprMin extends expr_aggregate_function_1.ExprAggregateFunction {
     constructor(expr) {
         super('min', expr);
-        this.legalChildTypes = [TDU.numberT, TDU.stringT, TDU.dateT, TDU.timestampT];
+        this.legalChildTypes = [
+            TDU.numberT,
+            TDU.stringT,
+            TDU.dateT,
+            TDU.timestampT,
+            TDU.timestamptzT,
+        ];
     }
     returns(ev) {
         return ev;

package/dist/lang/ast/expressions/for-range.js

@@ -71,7 +71,7 @@ class ForRange extends expression_def_1.ExpressionDef {
         this.duration = duration;
         this.timeframe = timeframe;
         this.elementType = 'forRange';
-        this.legalChildTypes = [TDU.timestampT, TDU.dateT];
+        this.legalChildTypes = [TDU.timestampT, TDU.timestamptzT, TDU.dateT];
     }
     apply(fs, op, expr) {
         const startV = this.from.getExpression(fs);

package/dist/lang/ast/types/expression-def.js

@@ -233,7 +233,7 @@ function timeCompare(left, lhs, op, rhs) {
             const lval = willMorphTo(lhs, 'timestamp');
             const rval = willMorphTo(rhs, 'timestamp');
             if (lval && rval) {
-                return { node, kids: { left: lval, right: lval } };
+                return { node, kids: { left: lval, right: rval } };
             }
         }
         else {

package/dist/lang/test/test-translator.d.ts

@@ -1,4 +1,4 @@
-import type { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, QueryFieldDef, StructDef, TurtleDef, SourceDef, SQLSourceDef } from '../../model/malloy_types';
+import type { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, QueryFieldDef, StructDef, TurtleDef, SourceDef, TableSourceDef, SQLSourceDef } from '../../model/malloy_types';
 import { MalloyElement } from '../ast';
 import type { NameSpace } from '../ast/types/name-space';
 import type { ModelEntry } from '../ast/types/model-entry';
@@ -17,7 +17,14 @@ export declare function pretty(thing: unknown): string;
  * @returns prettified printable version
  */
 export declare function humanify(value: unknown): string;
-export declare const aTableDef: SourceDef;
+export declare const TEST_DIALECT = "duckdb";
+export declare const aTableDef: TableSourceDef;
+export declare const bqTableDef: SourceDef;
+/**
+ * A TestTranlator never actually talks to connection, instead uses
+ * some mocked schema definitions.
+ */
+export declare const mockSchema: TableSourceDef[];
 /**
  * When translating partial trees, there will not be a document node
  * to handle namespace requests, this stands in for document in that case.

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

@@ -23,7 +23,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.aTableDef = void 0;
+exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.mockSchema = exports.bqTableDef = exports.aTableDef = exports.TEST_DIALECT = void 0;
 exports.pretty = pretty;
 exports.humanify = humanify;
 exports.getExplore = getExplore;
@@ -134,65 +134,85 @@ function humanify(value) {
 }
 const intType = { type: 'number', numberType: 'integer' };
 const bigintType = { type: 'number', numberType: 'bigint' };
-const mockSchema = {
-    'aTable': {
-        type: 'table',
-        name: 'aTable',
-        dialect: 'standardsql',
-        tablePath: 'aTable',
-        connection: 'test',
+// Base fields shared by both duckdb and BigQuery table definitions
+const baseFields = [
+    { type: 'string', name: 'astr' },
+    { type: 'number', name: 'af', numberType: 'float' },
+    { ...intType, name: 'ai' },
+    { ...bigintType, name: 'abig' },
+    { type: 'date', name: 'ad' },
+    { type: 'boolean', name: 'abool' },
+    { type: 'timestamp', name: 'ats' },
+    { type: 'sql native', name: 'aun' },
+    { type: 'sql native', name: 'aweird', rawType: 'weird' },
+    {
+        type: 'array',
+        name: 'astruct',
+        elementTypeDef: { type: 'record_element' },
+        join: 'many',
         fields: [
-            { type: 'string', name: 'astr' },
-            { type: 'number', name: 'af', numberType: 'float' },
-            { ...intType, name: 'ai' },
-            { ...bigintType, name: 'abig' },
-            { type: 'date', name: 'ad' },
-            { type: 'boolean', name: 'abool' },
-            { type: 'timestamp', name: 'ats' },
-            { type: 'sql native', name: 'aun' },
-            { type: 'sql native', name: 'aweird', rawType: 'weird' },
-            {
-                type: 'array',
-                name: 'astruct',
-                elementTypeDef: { type: 'record_element' },
-                join: 'many',
-                fields: [
-                    {
-                        name: 'column',
-                        type: 'number',
-                        numberType: 'integer',
-                    },
-                ],
-            },
             {
-                type: 'record',
-                name: 'aninline',
-                fields: [{ ...intType, name: 'column' }],
-                join: 'one',
-                matrixOperation: 'left',
+                name: 'column',
+                type: 'number',
+                numberType: 'integer',
             },
-            (0, malloy_types_1.mkArrayDef)(intType, 'ais'),
         ],
     },
-    'malloytest.carriers': {
+    {
+        type: 'record',
+        name: 'aninline',
+        fields: [{ ...intType, name: 'column' }],
+        join: 'one',
+        matrixOperation: 'left',
+    },
+    (0, malloy_types_1.mkArrayDef)(intType, 'ais'),
+];
+exports.TEST_DIALECT = 'duckdb';
+exports.aTableDef = {
+    type: 'table',
+    name: 'aTable',
+    dialect: exports.TEST_DIALECT,
+    tablePath: 'aTable',
+    connection: '_db_',
+    fields: [
+        ...baseFields,
+        { type: 'timestamptz', name: 'atstz' }, // duckdb supports timestamptz
+    ],
+};
+// BigQuery-compatible table definition (no timestamptz support)
+exports.bqTableDef = {
+    type: 'table',
+    name: 'aTable',
+    dialect: 'standardsql',
+    tablePath: 'aTable',
+    connection: '_bq_',
+    fields: baseFields,
+};
+/**
+ * A TestTranlator never actually talks to connection, instead uses
+ * some mocked schema definitions.
+ */
+exports.mockSchema = [
+    exports.aTableDef,
+    exports.bqTableDef,
+    {
         type: 'table',
-        name: 'malloytest.carriers',
-        dialect: 'standardsql',
+        name: 'carriers',
+        dialect: exports.TEST_DIALECT,
         tablePath: 'malloytest.carriers',
-        connection: 'bigquery',
+        connection: '_db_',
         fields: [
             { name: 'code', type: 'string' },
             { name: 'name', type: 'string' },
             { name: 'nickname', type: 'string' },
         ],
-        as: 'carriers',
     },
-    'malloytest.flights': {
+    {
         type: 'table',
-        name: 'malloytest.flights',
-        dialect: 'standardsql',
+        name: 'flights',
+        dialect: exports.TEST_DIALECT,
         tablePath: 'malloytest.flights',
-        connection: 'bigquery',
+        connection: '_db_',
         fields: [
             { name: 'carrier', type: 'string' },
             { name: 'origin', type: 'string' },
@@ -211,14 +231,13 @@ const mockSchema = {
             { name: 'diverted', type: 'string' },
             { name: 'id2', type: 'number', numberType: 'integer' },
         ],
-        as: 'flights',
     },
-    'malloytest.airports': {
+    {
         type: 'table',
-        name: 'malloytest.airports',
-        dialect: 'standardsql',
+        name: 'airports',
+        dialect: exports.TEST_DIALECT,
         tablePath: 'malloytest.airports',
-        connection: 'bigquery',
+        connection: '_db_',
         fields: [
             { name: 'id', type: 'number', numberType: 'integer' },
             { name: 'code', type: 'string' },
@@ -248,17 +267,11 @@ const mockSchema = {
             { name: 'cntl_twr', type: 'string' },
             { name: 'major', type: 'string' },
         ],
-        as: 'airports',
     },
-};
-exports.aTableDef = mockSchema['aTable'];
+];
 const bJoinedIntoA = {
-    type: 'table',
-    name: 'aTable',
-    dialect: 'standardsql',
-    tablePath: 'aTable',
-    connection: 'test',
-    as: 'b',
+    ...exports.aTableDef,
+    name: 'b',
     join: 'one',
     matrixOperation: 'left',
     onExpression: {
@@ -268,7 +281,6 @@ const bJoinedIntoA = {
             right: { node: 'field', path: ['b', 'astr'] },
         },
     },
-    fields: exports.aTableDef.fields,
 };
 /**
  * When translating partial trees, there will not be a document node
@@ -323,19 +335,31 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         this.testSrc = testSrc;
         this.allDialectsEnabled = true;
         /*
+         * There are two connections:
+         *   _db_  - duckdb dialect, with the following tables ...
+         *      aTable, malloytest.carriers, malloytest.flights, malloytest.airports
+         *   _bq_  - bigquery/standardsql dialect, with one table
+         *      aTable
+         *
+         * The "aTable" table is a mocked table with one column of each type.
+         * The _bq_ version does not have the timestamptz column, and when
+         * DATETIME support is added, the _db_ version will not have that.
+         *
          * All test source files can assume that an import of this
-      
          *
-         * Also the following tables will be available on _db_
-         *   aTable, malloytest.carriers, malloytest.flights, malloytest.airports
+         *   source:
+         *     bq_a is _bq_.table('aTable') extend { primary_key: astr }
+         *     carriers is _db_.table('malloytest.carriers')
+         *     flights is _db_.table('malloytest.flights')
+         *     airports is _db_.table('malloytest.airports')
+         *     a is _db_.table('aTable') extend { primary_key: astr }
+         *     b is a
+         *     ab is a extend {
+         *       join_one: b with astr
+         *       measure: acount is count()
+         *       view: aturtle is { group_by: astr; aggregate: acount }
+         *     }
          *
-         *   source: a is _db_.table('aTable') extend { primary_key: astr }
-         *   source: b is a
-         *   source: ab is a extend {
-         *     join_one: b with astr
-         *     measure: acount is count()
-         *     query: aturtle is { group_by: astr; aggregate: acount }
-         *   }
          */
         this.internalModel = {
             name: testURI,
@@ -344,8 +368,10 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
             dependencies: {},
             contents: {
                 _db_: { type: 'connection', name: '_db_' },
-                a: { ...exports.aTableDef, primaryKey: 'astr', as: 'a' },
-                b: { ...exports.aTableDef, primaryKey: 'astr', as: 'b' },
+                _bq_: { type: 'connection', name: '_bq_' },
+                a: { ...exports.aTableDef, primaryKey: 'astr', name: 'a' },
+                b: { ...exports.aTableDef, primaryKey: 'astr', name: 'b' },
+                bq_a: { ...exports.bqTableDef, primaryKey: 'astr', name: 'bq_a' },
                 ab: {
                     ...exports.aTableDef,
                     primaryKey: 'astr',
@@ -378,7 +404,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
                                             { type: 'string', name: 'acount' },
                                         ],
                                         connection: 'test',
-                                        dialect: 'standardsql',
+                                        dialect: exports.TEST_DIALECT,
                                     },
                                     isRepeated: true,
                                 },
@@ -393,9 +419,8 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         if (internalModel !== undefined) {
             this.internalModel = internalModel;
         }
-        for (const tableName in mockSchema) {
-            this.schemaZone.define(tableName, mockSchema[tableName]);
-            this.schemaZone.define(`_db_:${tableName}`, mockSchema[tableName]);
+        for (const actualSchema of exports.mockSchema) {
+            this.schemaZone.define(`${actualSchema.connection}:${actualSchema.tablePath}`, actualSchema);
         }
     }
     translate() {
@@ -645,7 +670,7 @@ function getSelectOneStruct(sqlBlock) {
         [key]: {
             type: 'sql_select',
             name: key,
-            dialect: 'standardsql',
+            dialect: exports.TEST_DIALECT,
             connection: '_db_',
             selectStr: sqlBlock.selectStr,
             fields: [{ type: 'number', name: 'one' }],

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.334";
+export declare const MALLOY_VERSION = "0.0.335";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.334';
+exports.MALLOY_VERSION = '0.0.335';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.334",
+  "version": "0.0.335",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -45,9 +45,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.334",
-    "@malloydata/malloy-interfaces": "0.0.334",
-    "@malloydata/malloy-tag": "0.0.334",
+    "@malloydata/malloy-filter": "0.0.335",
+    "@malloydata/malloy-interfaces": "0.0.335",
+    "@malloydata/malloy-tag": "0.0.335",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",