From b8da41dae25f3b4a4bc7d94d547edb37290cdf92 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Thu, 10 Aug 2023 01:06:59 +0800 Subject: [PATCH] fix(playwright): AsyncDatabase --- tests/playwright/setup/db.ts | 18 ++++++++++-------- tests/playwright/setup/sqliteExec.ts | 6 ++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/playwright/setup/db.ts b/tests/playwright/setup/db.ts index 9f9ad03765..2c25e8b75a 100644 --- a/tests/playwright/setup/db.ts +++ b/tests/playwright/setup/db.ts @@ -2,8 +2,7 @@ import { NcContext } from '.'; const mysql = require('mysql2'); const { Client } = require('pg'); -import { PromisedDatabase } from 'promised-sqlite3'; -const sqliteDb = new PromisedDatabase(); +import { AsyncDatabase } from 'promised-sqlite3'; const isMysql = (context: NcContext) => context.dbType === 'mysql'; @@ -53,12 +52,15 @@ const mysqlExec = async query => { }; async function sqliteExec(query) { - const parallelIndex = process.env.TEST_PARALLEL_INDEX; - const rootProjectDir = __dirname.replace('/tests/playwright/setup', ''); - await sqliteDb.open(`${rootProjectDir}/packages/nocodb/test_sakila_${parallelIndex}.db`); - - await sqliteDb.run(query); - await sqliteDb.close(); + try { + const parallelIndex = process.env.TEST_PARALLEL_INDEX; + const rootProjectDir = __dirname.replace('/tests/playwright/setup', ''); + const sqliteDb = await AsyncDatabase.open(`${rootProjectDir}/packages/nocodb/test_sakila_${parallelIndex}.db`); + await sqliteDb.run(query); + await sqliteDb.close(); + } catch (err) { + console.error(err); + } } export { sqliteExec, mysqlExec, isMysql, isSqlite, isPg, pgExec }; diff --git a/tests/playwright/setup/sqliteExec.ts b/tests/playwright/setup/sqliteExec.ts index d86fb24fbe..b29ddc7b41 100644 --- a/tests/playwright/setup/sqliteExec.ts +++ b/tests/playwright/setup/sqliteExec.ts @@ -1,10 +1,8 @@ -const { PromisedDatabase } = require('promised-sqlite3'); -const sqliteDb = new PromisedDatabase(); +import { AsyncDatabase } from 'promised-sqlite3'; async function sqliteExec(query) { const rootProjectDir = __dirname.replace('/scripts/playwright/setup', ''); - await sqliteDb.open(`${rootProjectDir}/packages/nocodb/test_noco.db`); - + const sqliteDb = await AsyncDatabase.open(`${rootProjectDir}/packages/nocodb/test_noco.db`); await sqliteDb.run(query); }