@malloydata/malloy-tests 0.0.313 → 0.0.315

package/package.json

@@ -21,14 +21,14 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "0.0.313",
-    "@malloydata/db-duckdb": "0.0.313",
-    "@malloydata/db-postgres": "0.0.313",
-    "@malloydata/db-snowflake": "0.0.313",
-    "@malloydata/db-trino": "0.0.313",
-    "@malloydata/malloy": "0.0.313",
-    "@malloydata/malloy-tag": "0.0.313",
-    "@malloydata/render": "0.0.313",
+    "@malloydata/db-bigquery": "0.0.315",
+    "@malloydata/db-duckdb": "0.0.315",
+    "@malloydata/db-postgres": "0.0.315",
+    "@malloydata/db-snowflake": "0.0.315",
+    "@malloydata/db-trino": "0.0.315",
+    "@malloydata/malloy": "0.0.315",
+    "@malloydata/malloy-tag": "0.0.315",
+    "@malloydata/render": "0.0.315",
     "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.313"
+  "version": "0.0.315"
 }

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/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 () => {