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

updates

Browse Source
This commit is contained in:
Tben 2023-07-08 08:19:31 +01:00
parent c23a4d65bd
commit f51096bec4
3 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/db/addDb.js
View File

@ -87,7 +87,7 @@ async function addDb({ dbFullName, tableName, data, tableSchema, duplicateColumn
const dataKey = dataKeys[i];
let value = data[dataKey];
const targetFieldSchemaArray = tableSchema ? tableSchema?.fields.filter((field) => field.fieldName === dataKey) : null;
const targetFieldSchemaArray = tableSchema ? tableSchema?.fields?.filter((field) => field.fieldName === dataKey) : null;
const targetFieldSchema = targetFieldSchemaArray && targetFieldSchemaArray[0] ? targetFieldSchemaArray[0] : null;
if (!value) continue;
@ -109,6 +109,7 @@ async function addDb({ dbFullName, tableName, data, tableSchema, duplicateColumn
insertValuesArray.push(value);
} catch (error) {
console.log("DSQL: Error in parsing data keys =>", error.message);
continue;
}
}
@ -145,6 +146,8 @@ async function addDb({ dbFullName, tableName, data, tableSchema, duplicateColumn
tableSchema,
});
console.log(newInsert);
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////

42
engine/utils/parseDbResults.js
View File

@ -22,6 +22,13 @@ module.exports = async function parseDbResults({ unparsedResults, tableSchema, e
*/
let parsedResults = [];
/**
* Check if query values array is an array
*/
if (!unparsedResults || !Array.isArray(unparsedResults) || !unparsedResults[0]) {
return unparsedResults;
}
try {
/**
* Declare variables
@ -34,23 +41,28 @@ module.exports = async function parseDbResults({ unparsedResults, tableSchema, e
let resultFieldNames = Object.keys(result);
for (let i = 0; i < resultFieldNames.length; i++) {
const resultFieldName = resultFieldNames[i];
let resultFieldSchema = tableSchema.fields[i];
try {
const resultFieldName = resultFieldNames[i];
let resultFieldSchema = tableSchema?.fields[i];
if (resultFieldName?.match(defaultFieldsRegexp)) {
continue;
}
let value = result[resultFieldName];
if (typeof value !== "number" && !value) {
continue;
}
if (resultFieldSchema?.encrypted) {
if (value?.match(/./)) {
result[resultFieldName] = decrypt({ encryptedString: value, encryptionKey, encryptionSalt });
if (resultFieldName?.match(defaultFieldsRegexp)) {
continue;
}
let value = result[resultFieldName];
if (typeof value !== "number" && !value) {
continue;
}
if (resultFieldSchema?.encrypted) {
if (value?.match(/./)) {
result[resultFieldName] = decrypt({ encryptedString: value, encryptionKey, encryptionSalt });
}
}
} catch (error) {
console.log("ERROR in parseDbResults Function =>", error.message);
continue;
}
}

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "datasquirel",
"version": "1.1.77",
"version": "1.1.78",
"description": "Cloud-based SQL data management tool",
"main": "index.js",
"scripts": {