@malloydata/malloy-tests 0.0.149-dev240704171255 → 0.0.149

package/package.json

@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.149-dev240704171255",
-    "@malloydata/db-duckdb": "^0.0.149-dev240704171255",
-    "@malloydata/db-postgres": "^0.0.149-dev240704171255",
-    "@malloydata/db-snowflake": "^0.0.149-dev240704171255",
-    "@malloydata/db-trino": "^0.0.149-dev240704171255",
-    "@malloydata/malloy": "^0.0.149-dev240704171255",
-    "@malloydata/render": "^0.0.149-dev240704171255",
+    "@malloydata/db-bigquery": "^0.0.149",
+    "@malloydata/db-duckdb": "^0.0.149",
+    "@malloydata/db-postgres": "^0.0.149",
+    "@malloydata/db-snowflake": "^0.0.149",
+    "@malloydata/db-trino": "^0.0.149",
+    "@malloydata/malloy": "^0.0.149",
+    "@malloydata/render": "^0.0.149",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
     "madge": "^6.0.0"
@@ -36,5 +36,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.149-dev240704171255"
+  "version": "0.0.149"
 }

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

@@ -52,6 +52,8 @@ function getSplitFunction(db: string) {
       `split(${column}, '${splitChar}')`,
     'trino': (column: string, splitChar: string) =>
       `split(${column}, '${splitChar}')`,
+    'presto': (column: string, splitChar: string) =>
+      `split(${column}, '${splitChar}')`,
   }[db];
 }
 
@@ -548,6 +550,17 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
     }
   );
 
+  it(`sql block- ${databaseName}`, async () => {
+    await expect(`
+      source: one is ${databaseName}.sql("""
+        SELECT 2 as ${q`a`}
+      """)
+      run: one -> {
+        select: a
+      }`).malloyResultMatches(runtime, {a: 2});
+  });
+
+
   // average should only include non-null values in the denominator
   it(`avg ignore null- ${databaseName}`, async () => {
     await expect(`
@@ -628,6 +641,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
     'ungrouped nested with no grouping above - ${databaseName}',
     async () => {
       await expect(`
+        // # test.debug
         run: ${databaseName}.table('malloytest.state_facts') extend {
           measure: total_births is births.sum()
           measure: births_per_100k is floor(total_births/ all(total_births) * 100000)

package/src/runtimes.ts

@@ -37,6 +37,7 @@ import {SnowflakeConnection} from '@malloydata/db-snowflake';
 import {PooledPostgresConnection} from '@malloydata/db-postgres';
 import {TrinoConnection, TrinoExecutor} from '@malloydata/db-trino';
 import {SnowflakeExecutor} from '@malloydata/db-snowflake/src/snowflake_executor';
+import {PrestoConnection} from '@malloydata/db-trino/src/trino_connection';
 
 export class SnowflakeTestConnection extends SnowflakeConnection {
   public async runSQL(
@@ -166,7 +167,14 @@ export function runtimeFor(dbName: string): SingleConnectionRuntime {
         connection = new TrinoConnection(
           dbName,
           {},
-          TrinoExecutor.getConnectionOptionsFromEnv()
+          TrinoExecutor.getConnectionOptionsFromEnv(dbName)
+        );
+        break;
+      case 'presto':
+        connection = new PrestoConnection(
+          dbName,
+          {},
+          TrinoExecutor.getConnectionOptionsFromEnv(dbName) // they share configs.
         );
         break;
       default:

package/trino/trino_start.sh

@@ -0,0 +1,34 @@
+#! /bin/bash
+rm -rf .tmp
+mkdir .tmp
+
+# generate config file
+> ./.tmp/bigquery.properties
+cat << EOF > ./.tmp/bigquery.properties
+connector.name=bigquery
+bigquery.project-id=advance-lacing-417917
+bigquery.credentials-key=$BQ_CREDENTIALS_KEY
+bigquery.arrow-serialization.enabled=false
+EOF
+
+# run docker
+docker run -p 8080:8080 -d -v ./.tmp/bigquery.properties:/etc/trino/catalog/bigquery.properties --name trino-malloy trinodb/trino
+
+# wait for server to start
+counter=0
+while ! docker logs trino-malloy 2>&1 | grep -q "SERVER STARTED"
+do
+  sleep 1
+  counter=$((counter+1))
+  # if doesn't start after 2 minutes, output logs and kill process
+  if [ $counter -eq 300 ]
+  then
+    docker logs trino-malloy >& ./.tmp/trino-malloy.logs
+    docker rm -f trino-malloy
+    echo "Trino did not start successfully, check .tmp/trino-malloy.logs"
+    exit 1
+    break
+  fi
+done
+
+echo "Trino running on port localhost:8080"

package/trino/trino_stop.sh

@@ -0,0 +1,7 @@
+#! /bin/bash
+
+# clear tmp files
+rm -rf .tmp
+
+# stop container
+docker rm -f trino-malloy