@malloydata/malloy-tests 0.0.95-dev231019211822 → 0.0.95

package/dist/util/db-jest-matchers.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable no-console */
 /*
  * Copyright 2023 Google LLC
  *
@@ -22,6 +23,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const malloy_1 = require("@malloydata/malloy");
 expect.extend({
     /**
      * Check the return of `sqlEQ(expr1,expr2)` and error if the database
@@ -41,50 +43,109 @@ expect.extend({
             message: () => 'SQL expression matched',
         };
     },
-    async queryMatches(runtime, querySrc, expected) {
-        if (!runtime.supportsNesting && querySrc.indexOf('nest:') >= 0) {
-            return {
-                pass: true,
-                message: () => 'Test was skipped since connection does not support nesting.',
-            };
+    async malloyResultMatches(querySrc, runtime, shouldEqual) {
+        // TODO -- THIS IS NOT OK BUT I AM NOT FIXING IT NOW
+        if (querySrc.indexOf('nest:') >= 0) {
+            if (runtime instanceof malloy_1.Runtime) {
+                return {
+                    pass: true,
+                    message: () => 'Test was skipped since connection does not support nesting.',
+                };
+            }
         }
         let query;
         try {
             query = runtime.loadQuery(querySrc);
         }
         catch (e) {
-            return { pass: false, message: () => `loadQuery failed: ${e.message}` };
+            return {
+                pass: false,
+                message: () => `loadQuery failed: ${e.message}`,
+            };
         }
         let result;
         try {
             result = await query.run();
         }
         catch (e) {
-            const failMsg = `query.run failed: ${e.message}\n` + `SQL: ${await query.getSQL()}`;
+            let failMsg = `query.run failed: ${e.message}`;
+            if (e instanceof malloy_1.MalloyError) {
+                failMsg = `Error in query compilation\n${errorLogToString(querySrc, e.problems)}`;
+            }
+            else {
+                try {
+                    failMsg += `\nSQL: ${await query.getSQL()}`;
+                }
+                catch (e2) {
+                    // we could not show the SQL for unknown reasons
+                }
+            }
             return { pass: false, message: () => failMsg };
         }
+        const allRows = Array.isArray(shouldEqual) ? shouldEqual : [shouldEqual];
+        let i = 0;
         const fails = [];
-        for (const [name, value] of Object.entries(expected)) {
-            try {
-                const got = result.data.path(0, name).value;
-                const mustBe = value instanceof Date ? value.getTime() : value;
-                const actuallyGot = got instanceof Date ? got.getTime() : got;
-                if (actuallyGot !== mustBe) {
-                    fails.push(`Expected {${name}: ${value}} Got: ${got}`);
-                }
+        const gotRows = result.data.toObject().length;
+        if (Array.isArray(shouldEqual)) {
+            if (gotRows !== allRows.length) {
+                fails.push(`Expected result.rows=${allRows.length}  Got: ${gotRows}`);
             }
-            catch (e) {
-                fails.push(`Expected {${name}: ${value}} Error: ${e.message}`);
+        }
+        for (const expected of allRows) {
+            for (const [name, value] of Object.entries(expected)) {
+                const pExpect = JSON.stringify(value);
+                const row = allRows.length > 1 ? `[${i}]` : '';
+                const expected = `Expected ${row}{${name}: ${pExpect}}`;
+                try {
+                    const nestOne = name.split('.');
+                    const resultPath = [i, nestOne[0]];
+                    for (const child of nestOne.slice(1)) {
+                        resultPath.push(0);
+                        resultPath.push(child);
+                    }
+                    const got = result.data.path(...resultPath).value;
+                    const pGot = JSON.stringify(got);
+                    const mustBe = value instanceof Date ? value.getTime() : value;
+                    const actuallyGot = got instanceof Date ? got.getTime() : got;
+                    if (typeof mustBe === 'number' && typeof actuallyGot !== 'number') {
+                        fails.push(`${expected} Got: Non Numeric '${pGot}'`);
+                    }
+                    else if (actuallyGot !== mustBe) {
+                        fails.push(`${expected} Got: ${pGot}`);
+                    }
+                }
+                catch (e) {
+                    fails.push(`${expected} Error: ${e.message}`);
+                }
             }
+            i += 1;
         }
         if (fails.length !== 0) {
-            const failMsg = `SQL: ${await query.getSQL()}\n${fails.join('\n')}`;
+            const fromSQL = '  ' + (await query.getSQL()).split('\n').join('\n  ');
+            const failMsg = `SQL Generated:\n${fromSQL}\n${fails.join('\n')}`;
             return { pass: false, message: () => failMsg };
         }
         return {
             pass: true,
-            message: () => `First row matched ${JSON.stringify(expected)}`,
+            message: () => 'All rows matched expected results',
         };
     },
 });
+function errorLogToString(src, msgs) {
+    let lovely = '';
+    let lineNo = 0;
+    for (const line of src.split('\n')) {
+        lovely += `    | ${line}\n`;
+        for (const entry of msgs) {
+            if (entry.at) {
+                if (entry.at.range.start.line === lineNo) {
+                    const charFrom = entry.at.range.start.character;
+                    lovely += `!!!!! ${' '.repeat(charFrom)}^ ${entry.message}\n`;
+                }
+            }
+        }
+        lineNo += 1;
+    }
+    return lovely;
+}
 //# sourceMappingURL=db-jest-matchers.js.map

package/dist/util/db-jest-matchers.js.map

@@ -1 +1 @@
-{"version":3,"file":"db-jest-matchers.js","sourceRoot":"","sources":["../../src/util/db-jest-matchers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"db-jest-matchers.js","sourceRoot":"","sources":["../../src/util/db-jest-matchers.ts"],"names":[],"mappings":"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"}

package/dist/util/index.d.ts

@@ -8,9 +8,8 @@ export declare function describeIfDatabaseAvailable(acceptableDatabases: string[
 interface InitValues {
     sql?: string;
     malloy?: string;
-    connection?: string;
 }
-export declare function mkSqlEqWith(runtime: Runtime, initV?: InitValues): (expr: string, result: string | boolean | number) => Promise<Result>;
+export declare function mkSqlEqWith(runtime: Runtime, cName: string, initV?: InitValues): (expr: string, result: string | boolean | number) => Promise<Result>;
 export declare function runQuery(runtime: Runtime, querySrc: string): Promise<Result>;
 export declare const testIf: (condition: boolean) => jest.It;
 export {};

package/dist/util/index.js

@@ -75,18 +75,14 @@ function sqlSafe(str) {
         .replace(/\\/g, '{backslash}')
         .replace(/"/g, '{double-quote}');
 }
-function mkSqlEqWith(runtime, initV) {
+function mkSqlEqWith(runtime, cName, initV) {
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     return async function (expr, result) {
         const qExpr = expr.replace(/'/g, '`');
         const sqlV = (initV === null || initV === void 0 ? void 0 : initV.sql) || 'SELECT 1 as one';
         const malloyV = (initV === null || initV === void 0 ? void 0 : initV.malloy) || '';
-        const select = (initV === null || initV === void 0 ? void 0 : initV.connection)
-            ? ` connection: "${initV.connection}" select`
-            : 'select';
         const sourceDef = `
-      sql: sqlData is {${select}: """${sqlV}""" }
-      source: basicTypes is from_sql(sqlData) ${malloyV}
+      source: basicTypes is ${cName}.sql("""${sqlV}""") ${malloyV}
     `;
         let query;
         if (typeof result === 'boolean') {
@@ -97,18 +93,20 @@ function mkSqlEqWith(runtime, initV) {
                 : `${notEq} when ${varName}`;
             const elsePick = result ? notEq : "'='";
             query = `${sourceDef}
-          query: basicTypes
+          run: basicTypes
           -> {
-            declare: ${varName} is ${expr}
+            extend: {dimension: ${varName} is ${expr}}
             select: calc is pick ${whenPick} else ${elsePick}
           }`;
         }
         else if (typeof result === 'number') {
             query = `${sourceDef}
-          query: basicTypes
+          run: basicTypes
           -> {
-            declare: expect is ${result}
-            declare: got is ${expr}
+            extend: {
+              dimension: expect is ${result}
+              dimension: got is ${expr}
+            }
             select: calc is
               pick '=' when expect = got
               else concat('sqlEq failed', CHR(10), '    Expected: ${qExpr} == ${result}', CHR(10), '    Received: ', got::string)
@@ -119,7 +117,7 @@ function mkSqlEqWith(runtime, initV) {
             const resultNoBacks = result.replace(/\\/g, '\\\\');
             const qResult = `'${resultNoBacks.replace(/'/g, "\\'")}'`;
             query = `${sourceDef}
-          query: basicTypes
+          run: basicTypes
           -> {
             select: expect is ${qResult}
             select: got is ${expr}
@@ -132,7 +130,7 @@ function mkSqlEqWith(runtime, initV) {
         else {
             const qResult = result.replace(/'/g, '`');
             query = `${sourceDef}
-          query: basicTypes
+          run: basicTypes
           -> {
             select: expect is ${result}
             select: got is ${expr}

package/dist/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -18,11 +18,11 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.95-dev231019211822",
-    "@malloydata/db-duckdb": "^0.0.95-dev231019211822",
-    "@malloydata/db-postgres": "^0.0.95-dev231019211822",
-    "@malloydata/malloy": "^0.0.95-dev231019211822",
-    "@malloydata/render": "^0.0.95-dev231019211822",
+    "@malloydata/db-bigquery": "^0.0.95",
+    "@malloydata/db-duckdb": "^0.0.95",
+    "@malloydata/db-postgres": "^0.0.95",
+    "@malloydata/malloy": "^0.0.95",
+    "@malloydata/render": "^0.0.95",
     "jsdom": "^22.1.0",
     "luxon": "^1.26.4",
     "madge": "^6.0.0"
@@ -31,5 +31,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^1.26.4"
   },
-  "version": "0.0.95-dev231019211822"
+  "version": "0.0.95"
 }

package/src/api.spec.ts

@@ -23,13 +23,14 @@
  */
 
 import {runtimeFor} from './runtimes';
+import './util/db-jest-matchers';
 
 const runtime = runtimeFor('duckdb');
 
 describe('extendModel', () => {
   test('can run query in extend section', async () => {
     const model = runtime.loadModel(`
-      query: q1 is table('malloytest.aircraft')->{
+      query: q1 is duckdb.table('malloytest.aircraft')->{
         where: state = 'CA'
         group_by: state
       }
@@ -39,7 +40,7 @@ describe('extendModel', () => {
     expect(oneState.data.path(0, 'state').value).toBe('CA');
 
     const extended = model.extendModel(`
-      query: q2 is table('malloytest.aircraft')->{
+      query: q2 is duckdb.table('malloytest.aircraft')->{
         where: state = 'NV'
         group_by: state
       }
@@ -50,7 +51,7 @@ describe('extendModel', () => {
   });
   test('can reference query from previous section ', async () => {
     const model = runtime.loadModel(`
-      query: q1 is table('malloytest.aircraft')->{
+      query: q1 is duckdb.table('malloytest.aircraft')->{
         where: state = 'CA'
         group_by: state
       }
@@ -59,19 +60,7 @@ describe('extendModel', () => {
     const oneState = await q1.run();
     expect(oneState.data.path(0, 'state').value).toBe('CA');
 
-    const extended = model.extendModel('query: q2 is ->q1 -> { select: * }');
-    const q2 = extended.loadQueryByName('q2');
-    const twoState = await q2.run();
-    expect(twoState.data.path(0, 'state').value).toBe('CA');
-  });
-  test('can reference sql from previous section ', async () => {
-    const model = runtime.loadModel(`
-      sql: q1 is { connection: "duckdb" select: """SELECT 'CA' as state""" }
-    `);
-
-    const extended = model.extendModel(
-      'query: q2 is from_sql(q1)->{select: *}'
-    );
+    const extended = model.extendModel('query: q2 is q1 -> { select: * }');
     const q2 = extended.loadQueryByName('q2');
     const twoState = await q2.run();
     expect(twoState.data.path(0, 'state').value).toBe('CA');
@@ -82,3 +71,5 @@ describe('extendModel', () => {
     );
   });
 });
+
+afterAll(async () => await runtime.connection.close());

package/src/databases/all/db_index.spec.ts

@@ -25,7 +25,7 @@
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 import {RuntimeList, allDatabases} from '../../runtimes';
-import {databasesFromEnvironmentOr} from '../../util';
+import {databasesFromEnvironmentOr, testIf} from '../../util';
 import '../../util/db-jest-matchers';
 
 const runtimes = new RuntimeList(databasesFromEnvironmentOr(allDatabases));
@@ -39,7 +39,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
   it(`basic index  - ${databaseName}`, async () => {
     const model = await runtime.loadModel(
       `
-        source: airports is table('malloytest.airports') {
+        source: airports is ${databaseName}.table('malloytest.airports') extend {
         }
     `
     );
@@ -69,7 +69,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
   it(`index value map  - ${databaseName}`, async () => {
     const model = await runtime.loadModel(
       `
-        source: airports is table('malloytest.airports') {
+        source: airports is ${databaseName}.table('malloytest.airports') extend {
         }
     `
     );
@@ -87,68 +87,42 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
   });
 
   it(`index no sample rows - ${databaseName}`, async () => {
-    const result = await runtime
-      .loadQuery(
-        `
-        source: t is table('malloytest.state_facts') {
-          dimension: one is 'one'
-        }
-
-        query: t-> {index:one, state }
-          -> {select: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
-    `
-      )
-      .run();
-    // console.log(result.data.toObject());
-    expect(result.data.path(0, 'fieldName').value).toBe('one');
-    expect(result.data.path(0, 'weight').value).toBe(51);
+    await expect(`
+      run: ${databaseName}.table('malloytest.state_facts') extend {
+        dimension: one is 'one'
+      } -> {index:one, state }
+        -> {select: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
+    `).malloyResultMatches(runtime, {fieldName: 'one', weight: 51});
   });
 
   // bigquery doesn't support row count based sampling.
-  (databaseName === 'bigquery' ? it.skip : it)(
+  testIf(databaseName !== 'bigquery')(
     `index rows count - ${databaseName}`,
     async () => {
-      const result = await runtime
-        .loadQuery(
-          `
-        source: t is table('malloytest.state_facts') {
+      await expect(`
+        run: ${databaseName}.table('malloytest.state_facts') extend {
           dimension: one is 'one'
-        }
-
-        query: t-> {index:one, state; sample: 10 }
-          -> {select: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
-    `
-        )
-        .run();
-      expect(result.data.path(0, 'fieldName').value).toBe('one');
-      expect(result.data.path(0, 'weight').value).toBe(10);
+        } -> {index:one, state; sample: 10 }
+            -> {select: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
+      `).malloyResultMatches(runtime, {fieldName: 'one', weight: 10});
     }
   );
 
   it(`index rows count - ${databaseName}`, async () => {
-    const result = await runtime
-      .loadQuery(
-        `
-        source: t is table('malloytest.flights') {
-          dimension: one is 'one'
-        }
-
-        query: t-> {index:one, tailnum; sample: 50% }
-          -> {select: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
-    `
-      )
-      .run();
-    // console.log(result.sql);
+    await expect(`
+      run: ${databaseName}.table('malloytest.flights') extend {
+        dimension: one is 'one'
+      } -> {index:one, tailnum; sample: 50% }
+        -> {select: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
+    `).malloyResultMatches(runtime, {fieldName: 'one'});
     // Hard to get consistent results here so just check that we get a value back.
-    //console.log(result.data.toObject());
-    expect(result.data.path(0, 'fieldName').value).toBe('one');
   });
 
   // it(`fanned data index  - ${databaseName}`, async () => {
   //   const result = await runtime
   //     .loadModel(
   //       `
-  //       source: movies is table('malloy-303216.imdb.movies') {
+  //       source: movies is ${databaseName}.table('malloy-303216.imdb.movies') extend {
   //       }
   //   `
   //     )