Merge pull request #188 from boostcampwm-2021/develop

v4.0.2 merge
boostcampwm-2021 · Nov 29, 2021 · 753ff97 · 753ff97
2 parents cf00dc6 + 4879bae
commit 753ff97
Show file tree

Hide file tree

Showing 48 changed files with 1,818 additions and 359 deletions.
diff --git a/back-end/api-server/build/swagger.yaml b/back-end/api-server/build/swagger.yaml
diff --git a/back-end/api-server/database/query.ts b/back-end/api-server/database/query.ts
@@ -19,9 +19,17 @@ export const insertIntoTable = (table, into, values) => {
   return connectionQuery(queryLine);
 };
 
-export const innerJoinTable = async (column, tableA, tableB, on = null, condition = null) => {
-  let queryLine = `SELECT ${column} FROM ${tableA} INNER JOIN ${tableB} ON ${on} `;
-  queryLine += condition ? `WHERE ${condition}` : ``;
+export const innerJoinTable = async (
+  column,
+  tableA,
+  tableB,
+  on = null,
+  condition = null,
+  limit = null
+) => {
+  let queryLine = `SELECT ${column} FROM ${tableA} INNER JOIN ${tableB} ON ${on}`;
+  queryLine += condition ? ` WHERE ${condition}` : ``;
+  queryLine += limit ? ` LIMIT ${limit}` : ``;
   return connectionQuery(queryLine);
 };