fix: mysql builder & timeout

Soontao · Sep 1, 2020 · a1794a9 · a1794a9
1 parent 056bc94
commit a1794a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -6,7 +6,7 @@ module.exports = {
   'testMatch': [
     '**/test/**/?(*.)+(spec|test).[jt]s?(x)'
   ],
-  'testTimeout': 120 * 1000,
+  'testTimeout': 10 * 60 * 1000, // 10 minutes
   'collectCoverageFrom': [
     'src/**/*',
     '!**/node_modules/**'

diff --git a/src/type/db_helper.ts b/src/type/db_helper.ts
@@ -55,6 +55,8 @@ const buildName = (...names: string[]): string => names.filter(Boolean).join('.'
 
 const buildNameWithQuote = (...names: string[]): string => names.filter(Boolean).map((name) => `"${name}"`).join('.');
 
+const buildNameWithBackQuote = (...names: string[]): string => names.filter(Boolean).map((name) => `\`${name}\``).join('.');
+
 export class BaseDBHelper implements DBHelper {
 
   getDatabaseType(): EDatabaseType {
@@ -108,11 +110,11 @@ export class MySqlDBHelper extends BaseDBHelper {
       colNameMapper = (v) => v;
     }
 
-    const fullTableName = buildName(`\`${schema}\``, `\`${tableName}\``);
+    const fullTableName = buildNameWithBackQuote(schema, tableName);
 
     const { sqlQuery, count, where, selectedFields } = transformQueryAst(
       query,
-      (col) => buildName(`\`${schema}\``, `\`${tableName}\``, `\`${colNameMapper(col)}\``)
+      (col) => buildNameWithBackQuote(schema, tableName, colNameMapper(col))
     );
 
     const sSelects = isEmpty(selectedFields) ? '*' : selectedFields.join(', ');