fix: db_helper

Soontao · Sep 1, 2020 · 184ffd7 · 184ffd7
1 parent c43f7b3
commit 184ffd7
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/type/db_helper.ts b/src/type/db_helper.ts
@@ -67,16 +67,14 @@ export class BaseDBHelper implements DBHelper {
       colNameMapper = (v) => v;
     }
 
-    const fullTableName = buildNameWithQuote(`\`${schema}\``, `\`${tableName}\``);
+    const fullTableName = buildNameWithQuote(schema, tableName);
 
     const { sqlQuery, count, where, selectedFields } = transformQueryAst(
       query,
-      (col) => buildNameWithQuote(`\`${schema}\``, `\`${tableName}\``, colNameMapper(col))
+      (col) => buildNameWithQuote(schema, tableName, colNameMapper(col))
     );
 
-    const sSelects = isEmpty(selectedFields) ? '*' : selectedFields.map((f) => `\`${f}\``).join(', ');
-
-    const queryStatement = `SELECT ${sSelects} FROM ${fullTableName} ${sqlQuery};`;
+    const queryStatement = `SELECT ${isEmpty(selectedFields) ? '*' : selectedFields.join(', ')} FROM ${fullTableName} ${sqlQuery};`;
     let countStatement = undefined;
 
     if (count) {
@@ -110,14 +108,16 @@ export class MySqlDBHelper extends BaseDBHelper {
       colNameMapper = (v) => v;
     }
 
-    const fullTableName = buildName(schema, tableName);
+    const fullTableName = buildName(`\`${schema}\``, `\`${tableName}\``);
 
     const { sqlQuery, count, where, selectedFields } = transformQueryAst(
       query,
       (col) => buildName(schema, tableName, colNameMapper(col))
     );
 
-    const queryStatement = `select ${isEmpty(selectedFields) ? '*' : selectedFields.join(', ')} from ${fullTableName} ${sqlQuery};`;
+    const sSelects = isEmpty(selectedFields) ? '*' : selectedFields.map((f) => `\`${f}\``).join(', ');
+
+    const queryStatement = `select ${sSelects} from ${fullTableName} ${sqlQuery};`;
 
     let countStatement = undefined;