diff --git a/dist/package-shared/utils/db/conn-db-handler.js b/dist/package-shared/utils/db/conn-db-handler.js index 0b91f14..be6b918 100644 --- a/dist/package-shared/utils/db/conn-db-handler.js +++ b/dist/package-shared/utils/db/conn-db-handler.js @@ -31,15 +31,20 @@ values) { return __awaiter(this, void 0, void 0, function* () { try { if (typeof query == "string") { - const res = yield conn.query(query, values); + const res = yield conn.query(trimQuery(query), values); return JSON.parse(JSON.stringify(res)); } else if (typeof query == "object") { const resArray = []; for (let i = 0; i < query.length; i++) { - const queryObj = query[i]; - const queryObjRes = yield conn.query(queryObj.query, queryObj.values); - resArray.push(JSON.parse(JSON.stringify(queryObjRes))); + try { + const queryObj = query[i]; + const queryObjRes = yield conn.query(trimQuery(queryObj.query), queryObj.values); + resArray.push(JSON.parse(JSON.stringify(queryObjRes))); + } + catch (error) { + resArray.push(null); + } } return resArray; } @@ -55,3 +60,6 @@ values) { } }); } +function trimQuery(query) { + return query.replace(/\n/gm, "").replace(/ {2,}/g, "").trim(); +} diff --git a/package-shared/utils/db/conn-db-handler.ts b/package-shared/utils/db/conn-db-handler.ts index dead5ba..637df4a 100644 --- a/package-shared/utils/db/conn-db-handler.ts +++ b/package-shared/utils/db/conn-db-handler.ts @@ -28,18 +28,24 @@ export default async function connDbHandler( ): Promise> { try { if (typeof query == "string") { - const res = await conn.query(query, values); + const res = await conn.query(trimQuery(query), values); return JSON.parse(JSON.stringify(res)); } else if (typeof query == "object") { const resArray = []; + for (let i = 0; i < query.length; i++) { - const queryObj = query[i]; - const queryObjRes = await conn.query( - queryObj.query, - queryObj.values - ); - resArray.push(JSON.parse(JSON.stringify(queryObjRes))); + try { + const queryObj = query[i]; + const queryObjRes = await conn.query( + trimQuery(queryObj.query), + queryObj.values + ); + resArray.push(JSON.parse(JSON.stringify(queryObjRes))); + } catch (error) { + resArray.push(null); + } } + return resArray as any; } else { return null; @@ -50,3 +56,7 @@ export default async function connDbHandler( conn.end(); } } + +function trimQuery(query: string) { + return query.replace(/\n/gm, "").replace(/ {2,}/g, "").trim(); +} diff --git a/package.json b/package.json index 193259e..4778185 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "3.4.1", + "version": "3.4.2", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": { diff --git a/publish.sh b/publish.sh index 440d9d7..f995d6e 100755 --- a/publish.sh +++ b/publish.sh @@ -6,4 +6,8 @@ else msg="$1" fi -git add . && git commit -m "$msg" && git push && npm publish +tsc +git add . +git commit -m "$msg" +git push +npm publish