Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2025-01-12 18:47:28 +01:00
parent 186cc76ffb
commit 8f00f333aa
4 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dist/package-shared/utils/db/conn-db-handler.js vendored
View File

@ -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();
}

24
package-shared/utils/db/conn-db-handler.ts
View File

@ -28,18 +28,24 @@ export default async function connDbHandler<ReturnType = any>(
): Promise<Return<ReturnType>> {
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<ReturnType = any>(
conn.end();
}
}
function trimQuery(query: string) {
return query.replace(/\n/gm, "").replace(/ {2,}/g, "").trim();
}

2
package.json
View File

@ -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": {

6
publish.sh
View File

@ -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