@malloydata/malloy-tests 0.0.69-dev230808200646 → 0.0.69

package/dist/databases/shared/test_list.js

@@ -1,24 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.allDatabaseTestSets = void 0;
-const db_index_1 = require("./db_index");
-const expr_1 = require("./expr");
-const functions_1 = require("./functions");
-const join_1 = require("./join");
-const nomodel_1 = require("./nomodel");
-const orderby_1 = require("./orderby");
-const problems_1 = require("./problems");
-const sql_expressions_1 = require("./sql_expressions");
-const time_1 = require("./time");
-exports.allDatabaseTestSets = [
-    expr_1.exprSharedTests,
-    functions_1.functionsSharedTests,
-    db_index_1.indexSharedTests,
-    join_1.joinSharedTests,
-    nomodel_1.noModelSharedTests,
-    orderby_1.orderBySharedTests,
-    problems_1.problemsSharedTests,
-    sql_expressions_1.sqlExpressionsSharedTests,
-    time_1.timeSharedTests,
-];
+exports.allDatabaseTestSets = [];
 //# sourceMappingURL=test_list.js.map

package/dist/databases/shared/test_list.js.map

@@ -1 +1 @@
-{"version":3,"file":"test_list.js","sourceRoot":"","sources":["../../../src/databases/shared/test_list.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAE5C,iCAAuC;AACvC,2CAAiD;AACjD,iCAAuC;AACvC,uCAA6C;AAC7C,uCAA6C;AAC7C,yCAA+C;AAC/C,uDAA4D;AAC5D,iCAAuC;AAI1B,QAAA,mBAAmB,GAAsB;IACpD,sBAAe;IACf,gCAAoB;IACpB,2BAAgB;IAChB,sBAAe;IACf,4BAAkB;IAClB,4BAAkB;IAClB,8BAAmB;IACnB,2CAAyB;IACzB,sBAAe;CAChB,CAAC"}
+{"version":3,"file":"test_list.js","sourceRoot":"","sources":["../../../src/databases/shared/test_list.ts"],"names":[],"mappings":";;;AAIa,QAAA,mBAAmB,GAAsB,EAAE,CAAC"}

package/dist/index.d.ts

@@ -1,10 +1,2 @@
 export { allDatabaseTestSets } from './databases/shared/test_list';
 export { RuntimeList, testRuntimeFor } from './runtimes';
-export { exprSharedTests } from './databases/shared/expr';
-export { indexSharedTests } from './databases/shared/db_index';
-export { joinSharedTests } from './databases/shared/join';
-export { noModelSharedTests } from './databases/shared/nomodel';
-export { orderBySharedTests } from './databases/shared/orderby';
-export { problemsSharedTests } from './databases/shared/problems';
-export { sqlExpressionsSharedTests } from './databases/shared/sql_expressions';
-export { timeSharedTests } from './databases/shared/time';

package/dist/index.js

@@ -22,26 +22,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeSharedTests = exports.sqlExpressionsSharedTests = exports.problemsSharedTests = exports.orderBySharedTests = exports.noModelSharedTests = exports.joinSharedTests = exports.indexSharedTests = exports.exprSharedTests = exports.testRuntimeFor = exports.RuntimeList = exports.allDatabaseTestSets = void 0;
+exports.testRuntimeFor = exports.RuntimeList = exports.allDatabaseTestSets = void 0;
 var test_list_1 = require("./databases/shared/test_list");
 Object.defineProperty(exports, "allDatabaseTestSets", { enumerable: true, get: function () { return test_list_1.allDatabaseTestSets; } });
 var runtimes_1 = require("./runtimes");
 Object.defineProperty(exports, "RuntimeList", { enumerable: true, get: function () { return runtimes_1.RuntimeList; } });
 Object.defineProperty(exports, "testRuntimeFor", { enumerable: true, get: function () { return runtimes_1.testRuntimeFor; } });
-var expr_1 = require("./databases/shared/expr");
-Object.defineProperty(exports, "exprSharedTests", { enumerable: true, get: function () { return expr_1.exprSharedTests; } });
-var db_index_1 = require("./databases/shared/db_index");
-Object.defineProperty(exports, "indexSharedTests", { enumerable: true, get: function () { return db_index_1.indexSharedTests; } });
-var join_1 = require("./databases/shared/join");
-Object.defineProperty(exports, "joinSharedTests", { enumerable: true, get: function () { return join_1.joinSharedTests; } });
-var nomodel_1 = require("./databases/shared/nomodel");
-Object.defineProperty(exports, "noModelSharedTests", { enumerable: true, get: function () { return nomodel_1.noModelSharedTests; } });
-var orderby_1 = require("./databases/shared/orderby");
-Object.defineProperty(exports, "orderBySharedTests", { enumerable: true, get: function () { return orderby_1.orderBySharedTests; } });
-var problems_1 = require("./databases/shared/problems");
-Object.defineProperty(exports, "problemsSharedTests", { enumerable: true, get: function () { return problems_1.problemsSharedTests; } });
-var sql_expressions_1 = require("./databases/shared/sql_expressions");
-Object.defineProperty(exports, "sqlExpressionsSharedTests", { enumerable: true, get: function () { return sql_expressions_1.sqlExpressionsSharedTests; } });
-var time_1 = require("./databases/shared/time");
-Object.defineProperty(exports, "timeSharedTests", { enumerable: true, get: function () { return time_1.timeSharedTests; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAEH,0DAAiE;AAAzD,gHAAA,mBAAmB,OAAA;AAE3B,uCAAuD;AAA/C,uGAAA,WAAW,OAAA;AAAE,0GAAA,cAAc,OAAA;AAEnC,gDAAwD;AAAhD,uGAAA,eAAe,OAAA;AACvB,wDAA6D;AAArD,4GAAA,gBAAgB,OAAA;AACxB,gDAAwD;AAAhD,uGAAA,eAAe,OAAA;AACvB,sDAA8D;AAAtD,6GAAA,kBAAkB,OAAA;AAC1B,sDAA8D;AAAtD,6GAAA,kBAAkB,OAAA;AAC1B,wDAAgE;AAAxD,+GAAA,mBAAmB,OAAA;AAC3B,sEAA6E;AAArE,4HAAA,yBAAyB,OAAA;AACjC,gDAAwD;AAAhD,uGAAA,eAAe,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAEH,0DAAiE;AAAzD,gHAAA,mBAAmB,OAAA;AAE3B,uCAAuD;AAA/C,uGAAA,WAAW,OAAA;AAAE,0GAAA,cAAc,OAAA"}

package/package.json

@@ -18,11 +18,11 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.69-dev230808200646",
-    "@malloydata/db-duckdb": "^0.0.69-dev230808200646",
-    "@malloydata/db-postgres": "^0.0.69-dev230808200646",
-    "@malloydata/malloy": "^0.0.69-dev230808200646",
-    "@malloydata/render": "^0.0.69-dev230808200646",
+    "@malloydata/db-bigquery": "^0.0.69",
+    "@malloydata/db-duckdb": "^0.0.69",
+    "@malloydata/db-postgres": "^0.0.69",
+    "@malloydata/malloy": "^0.0.69",
+    "@malloydata/render": "^0.0.69",
     "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.69-dev230808200646"
+  "version": "0.0.69"
 }

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

@@ -26,12 +26,143 @@
 
 import {RuntimeList, allDatabases} from '../../runtimes';
 import {databasesFromEnvironmentOr} from '../../util';
-import {indexSharedTests} from '../shared/db_index';
+import '../../util/db-jest-matchers';
 
 const runtimes = new RuntimeList(databasesFromEnvironmentOr(allDatabases));
 
-/*
- * This test file reuses common tests definitions.
- * For actual test development please go to: test/src/databases/shared/index.spec.ts
- */
-indexSharedTests(runtimes);
+// No prebuilt shared model, each test is complete.  Makes debugging easier.
+afterAll(async () => {
+  await runtimes.closeAll();
+});
+
+runtimes.runtimeMap.forEach((runtime, databaseName) => {
+  it(`basic index  - ${databaseName}`, async () => {
+    const model = await runtime.loadModel(
+      `
+        source: airports is table('malloytest.airports') {
+        }
+    `
+    );
+    let result = await model.search('airports', 'SANTA', 10);
+
+    // if (result !== undefined) {
+    //   console.log(result);
+    // } else {
+    //   console.log("no result");
+    // }
+    expect(result).toBeDefined();
+    if (result !== undefined) {
+      expect(result[0].fieldName).toBe('county');
+      expect(result[0].fieldValue).toBe('SANTA ROSA');
+      expect(result[0].weight).toBe(26);
+      expect(result.length).toBe(10);
+    }
+
+    result = await model.search('airports', 'SANTA A', 100, 'city');
+    if (result !== undefined) {
+      // console.log(result);
+      expect(result[0].fieldName).toBe('city');
+      expect(result[0].fieldValue).toBe('SANTA ANA');
+    }
+  });
+
+  it(`index value map  - ${databaseName}`, async () => {
+    const model = await runtime.loadModel(
+      `
+        source: airports is table('malloytest.airports') {
+        }
+    `
+    );
+    const result = await model.searchValueMap('airports');
+    // if (result !== undefined) {
+    //   console.log(result[4].values);
+    // } else {
+    //   console.log("no result");
+    // }
+    expect(result).toBeDefined();
+    if (result !== undefined) {
+      expect(result[4].values[0].fieldValue).toBe('WASHINGTON');
+      expect(result[4].values[0].weight).toBe(214);
+    }
+  });
+
+  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 }
+          -> {project: 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);
+  });
+
+  // bigquery doesn't support row count based sampling.
+  (databaseName === 'bigquery' ? it.skip : it)(
+    `index rows count - ${databaseName}`,
+    async () => {
+      const result = await runtime
+        .loadQuery(
+          `
+        source: t is table('malloytest.state_facts') {
+          dimension: one is 'one'
+        }
+
+        query: t-> {index:one, state; sample: 10 }
+          -> {project: 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);
+    }
+  );
+
+  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% }
+          -> {project: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
+    `
+      )
+      .run();
+    // console.log(result.sql);
+    // 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') {
+  //       }
+  //   `
+  //     )
+  //     .search("movies", "Tom");
+  //   // if (result !== undefined) {
+  //   //   console.log(result);
+  //   // } else {
+  //   //   console.log("no result");
+  //   // }
+  //   expect(result).toBeDefined();
+  //   if (result !== undefined) {
+  //     expect(result[0].fieldName).toBe("county");
+  //     expect(result[0].fieldValue).toBe("SANTA ROSA");
+  //     expect(result[0].weight).toBe(26);
+  //   }
+  // });
+});