test: misc test fixes

Author: jacek-prisma

.github/workflows/test-driver-adapters-template.yml

@@ -5,6 +5,9 @@ on:
       setup_task:
         type: string
         required: true
+      relation_load_strategy:
+        type: string
+        default: '["join", "query"]'
 
 jobs:
   select_prisma_branch:
@@ -20,6 +23,8 @@ jobs:
       matrix:
         node_version: ['20']
         partition: ['1/4', '2/4', '3/4', '4/4']
+        relation_load_strategy: ${{ fromJson(inputs.relation_load_strategy) }}
+
     env:
       LOG_LEVEL: 'info' # Set to "debug" to trace the query engine and node process running the driver adapter
       LOG_QUERIES: 'y'
@@ -32,6 +37,7 @@ jobs:
       QUERY_BATCH_SIZE: '10'
       WASM_BUILD_PROFILE: 'profiling' # Include debug info for proper backtraces
       WORKSPACE_ROOT: ${{ github.workspace }}
+      PRISMA_RELATION_LOAD_STRATEGY: ${{ matrix.relation_load_strategy }}
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/test-query-engine.yml

@@ -229,14 +229,19 @@ jobs:
             setup_task: 'dev-neon-wasm'
           - name: 'libsql (wasm)'
             setup_task: 'dev-libsql-wasm'
+            relation_load_strategy: '["query"]'
           - name: 'd1 (wasm)'
             setup_task: 'dev-d1'
+            relation_load_strategy: '["query"]'
           - name: 'better-sqlite3 (wasm)'
             setup_task: 'dev-better-sqlite3-wasm'
+            relation_load_strategy: '["query"]'
           - name: 'mssql (wasm)'
             setup_task: 'dev-mssql-wasm'
+            relation_load_strategy: '["query"]'
           - name: 'mariadb (wasm)'
             setup_task: 'dev-mariadb-wasm'
+            relation_load_strategy: '["query"]'
           - name: 'mariadb-mysql (wasm)'
             setup_task: 'dev-mariadb-mysql-wasm'
           - name: 'pg-cockroachdb (wasm)'

docker-compose.yml

@@ -297,6 +297,7 @@ services:
       MYSQL_USER: root
       MYSQL_ROOT_PASSWORD: prisma
       MYSQL_DATABASE: prisma
+    command: --max-connections=256
     ports:
       - '3308:3306'
     networks:
@@ -310,6 +311,7 @@ services:
       MYSQL_USER: root
       MYSQL_ROOT_PASSWORD: prisma
       MYSQL_DATABASE: prisma
+    command: --max-connections=256
     ports:
       - '3308:3306'
     networks:

libs/driver-adapters/executor/src/driver-adapters-manager/better-sqlite3.ts

@@ -34,8 +34,7 @@ export class BetterSQLite3Manager implements DriverAdaptersManager {
   }
 
   async connect() {
-    this.#adapter = await this.#factory.connect()
-    return this.#adapter
+    return (this.#adapter ??= await this.#factory.connect())
   }
 
   async teardown() {

libs/driver-adapters/executor/src/driver-adapters-manager/d1.ts

@@ -63,8 +63,7 @@ export class D1Manager implements DriverAdaptersManager {
   }
 
   async connect() {
-    this.#adapter = await this.#factory.connect()
-    return this.#adapter
+    return (this.#adapter ??= await this.#factory.connect())
   }
 
   async teardown() {

libs/driver-adapters/executor/src/driver-adapters-manager/libsql.ts

@@ -35,8 +35,7 @@ export class LibSQLManager implements DriverAdaptersManager {
   }
 
   async connect() {
-    this.#adapter = await this.#factory.connect()
-    return this.#adapter
+    return (this.#adapter ??= await this.#factory.connect())
   }
 
   async teardown() {

libs/driver-adapters/executor/src/driver-adapters-manager/mariadb.ts

@@ -32,8 +32,7 @@ export class MariaDbManager implements DriverAdaptersManager {
   }
 
   async connect() {
-    this.#adapter = await this.#factory.connect()
-    return this.#adapter
+    return (this.#adapter ??= await this.#factory.connect())
   }
 
   async teardown() {
@@ -56,6 +55,6 @@ function mariadbOptions(urlStr: string) {
     database,
     host,
     port: Number(port),
-    connectionLimit: 4,
+    connectionLimit: 2,
   }
 }

libs/driver-adapters/executor/src/driver-adapters-manager/mssql.ts

@@ -33,8 +33,7 @@ export class MssqlManager implements DriverAdaptersManager {
   }
 
   async connect() {
-    this.#adapter = await this.#factory.connect()
-    return this.#adapter
+    return (this.#adapter ??= await this.#factory.connect())
   }
 
   async teardown() {

libs/driver-adapters/executor/src/driver-adapters-manager/neon.ws.ts

@@ -46,9 +46,7 @@ export class NeonWsManager implements DriverAdaptersManager {
     neonConfig.useSecureWebSocket = false
     neonConfig.pipelineConnect = false
 
-    this.#adapter = await this.#factory.connect()
-
-    return this.#adapter
+    return (this.#adapter ??= await this.#factory.connect())
   }
 
   async teardown() {

libs/driver-adapters/executor/src/driver-adapters-manager/pg.ts

@@ -36,8 +36,7 @@ export class PgManager implements DriverAdaptersManager {
   }
 
   async connect() {
-    this.#adapter = await this.#factory.connect()
-    return this.#adapter
+    return (this.#adapter ??= await this.#factory.connect())
   }
 
   async teardown() {