@malloydata/malloy-tests 0.0.314 → 0.0.316

package/package.json

@@ -21,14 +21,14 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "0.0.314",
-    "@malloydata/db-duckdb": "0.0.314",
-    "@malloydata/db-postgres": "0.0.314",
-    "@malloydata/db-snowflake": "0.0.314",
-    "@malloydata/db-trino": "0.0.314",
-    "@malloydata/malloy": "0.0.314",
-    "@malloydata/malloy-tag": "0.0.314",
-    "@malloydata/render": "0.0.314",
+    "@malloydata/db-bigquery": "0.0.316",
+    "@malloydata/db-duckdb": "0.0.316",
+    "@malloydata/db-postgres": "0.0.316",
+    "@malloydata/db-snowflake": "0.0.316",
+    "@malloydata/db-trino": "0.0.316",
+    "@malloydata/malloy": "0.0.316",
+    "@malloydata/malloy-tag": "0.0.316",
+    "@malloydata/render": "0.0.316",
     "events": "^3.3.0",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
@@ -38,5 +38,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.314"
+  "version": "0.0.316"
 }

package/postgres/postgres_start.sh

@@ -11,15 +11,37 @@ mkdir .tmp
 SCRIPTDIR=$(cd $(dirname $0); pwd)
 DATADIR=$(dirname $SCRIPTDIR)/data/postgres
 
-// set these in your enviornment
-export PGHOST=localhost
-export PGPORT=5432
-export PGUSER=root
-export PGPASSWORD=postgres
+# Verify required environment variables and show export commands for any that are wrong
+EXPORTS=""
+
+if [ -z "$PGHOST" ] || [ "$PGHOST" != "localhost" ]; then
+  EXPORTS="${EXPORTS}export PGHOST=localhost\n"
+fi
+
+if [ -z "$PGPORT" ] || [ "$PGPORT" != "5432" ]; then
+  EXPORTS="${EXPORTS}export PGPORT=5432\n"
+fi
+
+if [ -z "$PGUSER" ] || [ "$PGUSER" != "root" ]; then
+  EXPORTS="${EXPORTS}export PGUSER=root\n"
+fi
+
+if [ -z "$PGPASSWORD" ] || [ "$PGPASSWORD" != "postgres" ]; then
+  EXPORTS="${EXPORTS}export PGPASSWORD=postgres\n"
+fi
+
+if [ -n "$EXPORTS" ]; then
+  echo "Required environment variables are missing or incorrect."
+  echo "Run these commands in your current shell or add them to your shell startup file (~/.bashrc, ~/.zshrc, etc.):"
+  echo ""
+  echo -e "$EXPORTS"
+  exit 1
+fi
 
 docker run -p 5432:5432 -d -v $DATADIR:/init_data \
  --name postgres-malloy \
   -e POSTGRES_USER=root -e POSTGRES_PASSWORD=postgres \
+  -e TZ=UTC \
   --health-cmd pg_isready \
   --health-interval 10s \
   --health-timeout 5s \
@@ -36,6 +58,9 @@ done
 
 echo "Container $CONTAINER_NAME is now healthy!"
 
+echo "Loading data ..."
 #  configure
 echo CREATE EXTENSION tsm_system_rows\; | psql
 gunzip -c ${DATADIR}/malloytest-postgres.sql.gz | psql
+
+echo "Ready"

package/src/core/bugless.spec.ts

@@ -51,3 +51,7 @@ describe('misc tests for regressions that have no better home', () => {
     }
   });
 });
+
+afterAll(async () => {
+  await runtime.connection.close();
+});

package/src/core/events.spec.ts

@@ -121,3 +121,7 @@ describe('emits events', () => {
     });
   });
 });
+
+afterAll(async () => {
+  await runtime.connection.close();
+});

package/src/core/experimental-dialects.spec.ts

@@ -74,10 +74,7 @@ describe('experimental dialects', () => {
     }
   }
 
-  const connection = new DuckdbXConnection(
-    duckdbX,
-    'test/data/duckdb/duckdb_test.db'
-  );
+  const connection = new DuckdbXConnection(duckdbX, ':memory:');
 
   class DuckdbXDialect extends DuckDBDialect {
     experimental = true;

package/src/core/sql_source.spec.ts

@@ -45,3 +45,7 @@ describe('turducken', () => {
     expect(qsql).toContain(`FROM (${sql}) as base`);
   });
 });
+
+afterAll(async () => {
+  await runtime.connection.close();
+});

package/src/core/tags.spec.ts

@@ -348,3 +348,7 @@ describe('tags in results', () => {
     expect(tags.has('n4')).toBeTruthy();
   });
 });
+
+afterAll(async () => {
+  await runtime.connection.close();
+});

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

@@ -0,0 +1,24 @@
+import {RuntimeList, allDatabases} from '../../runtimes';
+import {databasesFromEnvironmentOr} from '../../util';
+import '../../util/db-jest-matchers';
+
+const runtimes = new RuntimeList(databasesFromEnvironmentOr(allDatabases));
+
+describe.each(runtimes.runtimeList)(
+  'connection close test %s',
+  (conName, runtime) => {
+    const n = runtime.dialect.sqlMaybeQuoteIdentifier('n');
+    test.each(Array.from({length: 50}, (_, i) => i + 1))(
+      'run SELECT %i',
+      async queryNum => {
+        await expect(`
+          run: ${conName}.sql("""SELECT ${queryNum} as ${n} """)
+        `).malloyResultMatches(runtime, {n: queryNum});
+      }
+    );
+  }
+);
+
+afterAll(async () => {
+  await runtimes.closeAll();
+});

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

@@ -713,6 +713,22 @@ describe.each(runtimes.runtimeList)('%s: query tz', (dbName, runtime) => {
     ).malloyResultMatches(runtime, {mex_day: mex_19.toJSDate()});
   });
 
+  test.when(
+    !brokenIn('trino', dbName) && !brokenIn('presto', dbName) /* mtoy */
+  )('truncate week', async () => {
+    // the 19th in mexico is a wednesday, so trunc to the 15th
+    const mex_19 = LuxonDateTime.fromISO('2020-02-19T00:00:00', {zone});
+    // Find the sunday before then
+    const mex_sunday = mex_19.minus({days: mex_19.weekday % 7});
+    await expect(
+      `run: ${dbName}.sql("SELECT 1 as x") -> {
+        timezone: '${zone}'
+        extend: { dimension: utc_midnight is @2020-02-20 00:00:00[UTC] }
+        select: mex_week is utc_midnight.week
+      }`
+    ).malloyResultMatches(runtime, {mex_week: mex_sunday.toJSDate()});
+  });
+
   test.when(
     !brokenIn('trino', dbName) && !brokenIn('presto', dbName) /* mtoy */
   )('cast timestamp to date', async () => {

package/src/databases/bigquery/malloy_query.spec.ts

@@ -766,3 +766,7 @@ describe('unsupported type tests', () => {
     expect(result.data.value[0]['geo']).toBeDefined();
   });
 });
+
+afterAll(async () => {
+  await runtimeList.closeAll();
+});

package/src/databases/duckdb/model_caching.spec.ts

@@ -102,3 +102,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
     expect(model3._modelDef.contents['a']).not.toBeDefined();
   });
 });
+
+afterAll(async () => {
+  await runtimes.closeAll();
+});

package/src/runtimes.ts

@@ -132,6 +132,17 @@ export class DuckDBTestConnection extends DuckDBConnection {
   }
 }
 
+export class DuckDBROTestConnection extends DuckDBTestConnection {
+  constructor(name: string, databasePath?: string, workingDirectory?: string) {
+    super({
+      name,
+      databasePath,
+      workingDirectory,
+      readOnly: true,
+    });
+  }
+}
+
 export class DuckDBWASMTestConnection extends DuckDBWASMConnection {
   // we probably need a better way to do this.
 
@@ -190,6 +201,12 @@ export function runtimeFor(dbName: string): SingleConnectionRuntime {
         connection = new PostgresTestConnection(dbName);
         break;
       case 'duckdb':
+        connection = new DuckDBROTestConnection(
+          dbName,
+          'test/data/duckdb/duckdb_test.db'
+        );
+        break;
+      case 'duckdb_rw':
         connection = new DuckDBTestConnection(
           dbName,
           'test/data/duckdb/duckdb_test.db'
@@ -298,8 +315,8 @@ export class RuntimeList {
     for (const [_key, runtime] of this.runtimeMap) {
       await runtime.connection.close();
     }
-    // Unfortunate hack to avoid slow to die background threads tripping
-    // up jest
-    await new Promise(resolve => setTimeout(resolve, 10000));
+    // TODO delete this line if it turns out not to be needed.
+    // At one time duckdb_wasm needed this
+    // await new Promise(resolve => setTimeout(resolve, 2000));
   }
 }