Browse Source

fix(test): Removed sqlite_exec test api and sqlite query are run in the playwright level

pull/4278/head
Muhammed Mustafa 2 years ago
parent
commit
78bea20645
  1. 18
      packages/nocodb/src/lib/meta/api/testApis.ts
  2. 20
      scripts/playwright/setup/db.ts

18
packages/nocodb/src/lib/meta/api/testApis.ts

@ -1,5 +1,3 @@
import Noco from '../../Noco';
import { Request, Router } from 'express';
import { TestResetService } from '../../services/test/TestResetService';
@ -13,24 +11,8 @@ export async function reset(req: Request<any, any>, res) {
res.json(await service.process());
}
export async function sqliteExec(req: Request<any, any>, res) {
const metaKnex = Noco.ncMeta.knex;
try {
const result = await metaKnex.raw(req.body.sql);
res.json({
body: result,
});
} catch (e) {
console.error('sqliteExec', e);
res.status(500).json({
error: e,
});
}
}
const router = Router();
router.post('/api/v1/meta/test/reset', reset);
router.post('/api/v1/meta/test/sqlite_exec', sqliteExec);
export default router;

20
scripts/playwright/setup/db.ts

@ -1,6 +1,8 @@
import { NcContext } from '.';
const mysql = require('mysql2');
import axios from 'axios';
import { PromisedDatabase } from 'promised-sqlite3';
const sqliteDb = new PromisedDatabase();
const isMysql = (context: NcContext) => context.dbType === 'mysql';
@ -8,8 +10,6 @@ const isSqlite = (context: NcContext) => context.dbType === 'sqlite';
const isPg = (context: NcContext) => context.dbType === 'pg';
const mysql = require('mysql2');
const mysqlExec = async query => {
// creates a new mysql connection using credentials from cypress.json env's
const connection = mysql.createConnection({
@ -34,14 +34,12 @@ const mysqlExec = async query => {
};
async function sqliteExec(query) {
try {
await axios.post('http://localhost:8080/api/v1/meta/test/sqlite_exec', {
sql: query,
});
} catch (e) {
console.error(e);
throw e;
}
const parallelIndex = process.env.TEST_PARALLEL_INDEX;
const rootProjectDir = __dirname.replace('/scripts/playwright/setup', '');
await sqliteDb.open(`${rootProjectDir}/packages/nocodb/test_sakila_${parallelIndex}.db`);
await sqliteDb.run(query);
await sqliteDb.close();
}
export { sqliteExec, mysqlExec, isMysql, isSqlite, isPg };

Loading…
Cancel
Save