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

Upgrades

Browse Source
This commit is contained in:
Tben 2023-08-12 15:14:00 +01:00
parent 722f85cd4a
commit 320a271e10
4 changed files with 243 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

357
engine/engine/createDbFromSchema.js
View File

@ -30,219 +30,228 @@ const updateTable = require("./utils/updateTable");
* @param {import("../../types/database-schema.td").DSQL_DatabaseSchemaType[]} dbSchema - An array of database schema objects * @param {import("../../types/database-schema.td").DSQL_DatabaseSchemaType[]} dbSchema - An array of database schema objects
*/ */
async function createDbFromSchema(dbSchema) { async function createDbFromSchema(dbSchema) {
/** try {
* Grab Schema
*
* @description Grab Schema
*/
if (!dbSchema || !Array.isArray(dbSchema) || !dbSchema[0]) {
console.log("Invalid DB schema data");
return;
}
for (let i = 0; i < dbSchema.length; i++) {
/** @type {import("../../types/database-schema.td").DSQL_DatabaseSchemaType} */
const database = dbSchema[i];
const { dbFullName, tables } = database;
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////
/** @type {{ dbFullName: string }[] | null} */
const dbCheck = await noDatabaseDbHandler({ query: `SELECT SCHEMA_NAME AS dbFullName FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '${dbFullName}'` });
if (dbCheck && dbCheck[0]?.dbFullName) {
// Database Exists
} else {
const newDatabase = await noDatabaseDbHandler({ query: `CREATE DATABASE IF NOT EXISTS \`${dbFullName}\` CHARACTER SET utf8mb4 COLLATE utf8mb4_bin` });
}
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////
/** /**
* Select all tables * Grab Schema
* @type {{ TABLE_NAME: string }[] | null} *
* @description Select All tables in target database * @description Grab Schema
*/ */
const allTables = await noDatabaseDbHandler({ query: `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='${dbFullName}'` }); console.log("Starting createDbFromSchema ...");
let tableDropped; if (!dbSchema || !Array.isArray(dbSchema) || !dbSchema[0]) {
console.log("Invalid DB schema data");
if (!allTables) { return;
console.log("No Tables to Update");
continue;
} }
for (let tb = 0; tb < allTables.length; tb++) { for (let i = 0; i < dbSchema.length; i++) {
const { TABLE_NAME } = allTables[tb]; /** @type {import("../../types/database-schema.td").DSQL_DatabaseSchemaType} */
const database = dbSchema[i];
const { dbFullName, tables } = database;
/** console.log("Now constructing database =>", database?.dbFullName);
* @description Check if TABLE_NAME is part of the tables contained
* in the user schema JSON. If it's not, the table is either deleted
* or the table name has been recently changed
*/
if (!tables.filter((_table) => _table.tableName === TABLE_NAME)[0]) {
const oldTableFilteredArray = tables.filter((_table) => _table.tableNameOld && _table.tableNameOld === TABLE_NAME);
/**
* @description Check if this table has been recently renamed. Rename
* table id true. Drop table if false
*/
if (oldTableFilteredArray && oldTableFilteredArray[0]) {
console.log("Renaming Table");
await varDatabaseDbHandler({
queryString: `RENAME TABLE \`${oldTableFilteredArray[0].tableNameOld}\` TO \`${oldTableFilteredArray[0].tableName}\``,
database: dbFullName,
});
} else {
console.log(`Dropping Table from ${dbFullName}`);
// deepcode ignore reDOS: <NO user input>
await varDatabaseDbHandler({
queryString: `DROP TABLE \`${TABLE_NAME}\``,
database: dbFullName,
});
tableDropped = true;
}
}
}
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////
/**
* @description Iterate through each table and perform table actions
*/
for (let t = 0; t < tables.length; t++) {
const table = tables[t];
if (tableDropped) continue;
const { tableName, fields, indexes } = table;
/**
* @description Check if table exists
*/
const tableCheck = await varDatabaseDbHandler({
queryString: `
SELECT EXISTS (
SELECT
TABLE_NAME
FROM
information_schema.TABLES
WHERE
TABLE_SCHEMA = ? AND
TABLE_NAME = ?
) AS tableExists`,
queryValuesArray: [dbFullName, table.tableName],
database: dbFullName,
});
////////////////////////////////////////
////////////////////////////////////////
//////////////////////////////////////// ////////////////////////////////////////
if (tableCheck && tableCheck[0]?.tableExists > 0) { /** @type {{ dbFullName: string }[] | null} */
const dbCheck = await noDatabaseDbHandler({ query: `SELECT SCHEMA_NAME AS dbFullName FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '${dbFullName}'` });
console.log("DB CHeck =>", dbCheck);
if (dbCheck && dbCheck[0]?.dbFullName) {
// Database Exists
} else {
const newDatabase = await noDatabaseDbHandler({ query: `CREATE DATABASE IF NOT EXISTS \`${dbFullName}\` CHARACTER SET utf8mb4 COLLATE utf8mb4_bin` });
}
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////
/**
* Select all tables
* @type {{ TABLE_NAME: string }[] | null}
* @description Select All tables in target database
*/
const allTables = await noDatabaseDbHandler({ query: `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='${dbFullName}'` });
let tableDropped;
if (!allTables) {
console.log("No Tables to Update");
continue;
}
for (let tb = 0; tb < allTables.length; tb++) {
const { TABLE_NAME } = allTables[tb];
/** /**
* @description Update table if table exists * @description Check if TABLE_NAME is part of the tables contained
* in the user schema JSON. If it's not, the table is either deleted
* or the table name has been recently changed
*/ */
const updateExistingTable = await updateTable({ if (!tables.filter((_table) => _table.tableName === TABLE_NAME)[0]) {
dbFullName: dbFullName, const oldTableFilteredArray = tables.filter((_table) => _table.tableNameOld && _table.tableNameOld === TABLE_NAME);
tableName: tableName,
tableInfoArray: fields,
dbSchema,
tableIndexes: indexes,
tableIndex: t,
});
if (table.childrenTables && table.childrenTables[0]) { /**
for (let ch = 0; ch < table.childrenTables.length; ch++) { * @description Check if this table has been recently renamed. Rename
const childTable = table.childrenTables[ch]; * table id true. Drop table if false
*/
const updateExistingChildTable = await updateTable({ if (oldTableFilteredArray && oldTableFilteredArray[0]) {
dbFullName: childTable.dbNameFull, console.log("Renaming Table");
tableName: childTable.tableName, await varDatabaseDbHandler({
tableInfoArray: fields, queryString: `RENAME TABLE \`${oldTableFilteredArray[0].tableNameOld}\` TO \`${oldTableFilteredArray[0].tableName}\``,
dbSchema, database: dbFullName,
tableIndexes: indexes, });
clone: true, } else {
console.log(`Dropping Table from ${dbFullName}`);
// deepcode ignore reDOS: <NO user input>
await varDatabaseDbHandler({
queryString: `DROP TABLE \`${TABLE_NAME}\``,
database: dbFullName,
}); });
// console.log(updateExistingChildTable); tableDropped = true;
} }
} }
}
//////////////////////////////////////// ////////////////////////////////////////
} else { ////////////////////////////////////////
//////////////////////////////////////// ////////////////////////////////////////
/**
* @description Iterate through each table and perform table actions
*/
for (let t = 0; t < tables.length; t++) {
const table = tables[t];
if (tableDropped) continue;
const { tableName, fields, indexes } = table;
/** /**
* @description Create new Table if table doesnt exist * @description Check if table exists
*/ */
const createNewTable = await createTable({ const tableCheck = await varDatabaseDbHandler({
tableName: tableName, queryString: `
tableInfoArray: fields, SELECT EXISTS (
varDatabaseDbHandler, SELECT
dbFullName: dbFullName, TABLE_NAME
dbSchema, FROM
information_schema.TABLES
WHERE
TABLE_SCHEMA = ? AND
TABLE_NAME = ?
) AS tableExists`,
queryValuesArray: [dbFullName, table.tableName],
database: dbFullName,
}); });
if (indexes && indexes[0]) { ////////////////////////////////////////
if (tableCheck && tableCheck[0]?.tableExists > 0) {
/** /**
* Handle DATASQUIREL Table Indexes * @description Update table if table exists
* ===================================================
* @description Iterate through each datasquirel schema
* table index(if available), and perform operations
*/ */
if (indexes && indexes[0]) { const updateExistingTable = await updateTable({
for (let g = 0; g < indexes.length; g++) { dbFullName: dbFullName,
const { indexType, indexName, indexTableFields, alias } = indexes[g]; tableName: tableName,
tableInfoArray: fields,
dbSchema,
tableIndexes: indexes,
tableIndex: t,
});
if (!alias?.match(/./)) continue; if (table.childrenTables && table.childrenTables[0]) {
for (let ch = 0; ch < table.childrenTables.length; ch++) {
const childTable = table.childrenTables[ch];
/** const updateExistingChildTable = await updateTable({
* @type {DSQL_MYSQL_SHOW_INDEXES_Type[] | null} dbFullName: childTable.dbNameFull,
* @description All indexes from MYSQL db tableName: childTable.tableName,
*/ tableInfoArray: fields,
const allExistingIndexes = await varDatabaseDbHandler({ dbSchema,
queryString: `SHOW INDEXES FROM \`${tableName}\``, tableIndexes: indexes,
database: dbFullName, clone: true,
}); });
/** // console.log(updateExistingChildTable);
* @description Check for existing Index in MYSQL db }
*/ }
try {
const existingKeyInDb = allExistingIndexes ? allExistingIndexes.filter((indexObject) => indexObject.Key_name === alias) : null; ////////////////////////////////////////
if (!existingKeyInDb?.[0]) throw new Error("This Index Does not Exist"); } else {
} catch (error) { ////////////////////////////////////////
/**
* @description Create new Table if table doesnt exist
*/
const createNewTable = await createTable({
tableName: tableName,
tableInfoArray: fields,
varDatabaseDbHandler,
dbFullName: dbFullName,
dbSchema,
});
if (indexes && indexes[0]) {
/**
* Handle DATASQUIREL Table Indexes
* ===================================================
* @description Iterate through each datasquirel schema
* table index(if available), and perform operations
*/
if (indexes && indexes[0]) {
for (let g = 0; g < indexes.length; g++) {
const { indexType, indexName, indexTableFields, alias } = indexes[g];
if (!alias?.match(/./)) continue;
/** /**
* @description Create new index if determined that it * @type {any[] | null}
* doesn't exist in MYSQL db * @description All indexes from MYSQL db
*/ */
await varDatabaseDbHandler({ const allExistingIndexes = await varDatabaseDbHandler({
queryString: `CREATE${indexType.match(/fullText/i) ? " FULLTEXT" : ""} INDEX \`${alias}\` ON ${tableName}(${indexTableFields queryString: `SHOW INDEXES FROM \`${tableName}\``,
.map((nm) => nm.value)
.map((nm) => `\`${nm}\``)
.join(",")}) COMMENT 'schema_index'`,
database: dbFullName, database: dbFullName,
}); });
/**
* @description Check for existing Index in MYSQL db
*/
try {
const existingKeyInDb = allExistingIndexes ? allExistingIndexes.filter((indexObject) => indexObject.Key_name === alias) : null;
if (!existingKeyInDb?.[0]) throw new Error("This Index Does not Exist");
} catch (error) {
/**
* @description Create new index if determined that it
* doesn't exist in MYSQL db
*/
await varDatabaseDbHandler({
queryString: `CREATE${indexType.match(/fullText/i) ? " FULLTEXT" : ""} INDEX \`${alias}\` ON ${tableName}(${indexTableFields
.map((nm) => nm.value)
.map((nm) => `\`${nm}\``)
.join(",")}) COMMENT 'schema_index'`,
database: dbFullName,
});
}
} }
} }
} }
} }
////////////////////////////////////////
} }
////////////////////////////////////////
} }
}
//////////////////////////////////////// ////////////////////////////////////////
//////////////////////////////////////// ////////////////////////////////////////
//////////////////////////////////////// ////////////////////////////////////////
} catch (error) {
console.log("Error in createDbFromSchema => ", error.message);
}
} }
/** ****************************************************************************** */ /** ****************************************************************************** */

60
engine/engine/utils/dbHandler.js
View File

@ -15,6 +15,7 @@ const connection = mysql.createConnection({
password: process.env.DSQL_PASS, password: process.env.DSQL_PASS,
charset: "utf8mb4", charset: "utf8mb4",
port: process.env.DSQL_PORT?.match(/.../) ? parseInt(process.env.DSQL_PORT) : undefined, port: process.env.DSQL_PORT?.match(/.../) ? parseInt(process.env.DSQL_PORT) : undefined,
timeout: 5000,
}); });
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
@ -71,36 +72,35 @@ module.exports = async function dbHandler({ query, values, database }) {
*/ */
try { try {
results = await new Promise((resolve, reject) => { results = await new Promise((resolve, reject) => {
if (connection.state !== "disconnected") { if (values) {
if (values) { connection.query(query, values, (error, results, fields) => {
connection.query(query, values, (error, results, fields) => { if (error) {
if (error) { console.log("DB handler error:", error.message);
console.log("DB handler error:", error.message); resolve({
resolve({ error: error.message,
error: error.message, });
}); } else {
} else { resolve(JSON.parse(JSON.stringify(results)));
resolve(JSON.parse(JSON.stringify(results))); }
}
setTimeout(() => { // setTimeout(() => {
endConnection(connection); // endConnection(connection);
}, 500); // }, 500);
}); });
} else { } else {
connection.query(query, (error, results, fields) => { connection.query(query, (error, results, fields) => {
if (error) { if (error) {
console.log("DB handler error:", error.message); console.log("DB handler error:", error.message);
resolve({ resolve({
error: error.message, error: error.message,
}); });
} else { } else {
resolve(JSON.parse(JSON.stringify(results))); resolve(JSON.parse(JSON.stringify(results)));
} }
setTimeout(() => { // setTimeout(() => {
endConnection(connection); // endConnection(connection);
}, 500); // }, 500);
}); });
}
} }
}); });

59
engine/engine/utils/noDatabaseDbHandler.js
View File

@ -11,6 +11,7 @@ const connection = mysql.createConnection({
password: process.env.DSQL_PASS, password: process.env.DSQL_PASS,
charset: "utf8mb4", charset: "utf8mb4",
port: process.env.DSQL_PORT?.match(/.../) ? parseInt(process.env.DSQL_PORT) : undefined, port: process.env.DSQL_PORT?.match(/.../) ? parseInt(process.env.DSQL_PORT) : undefined,
timeout: 5000,
}); });
/** /**
@ -38,36 +39,34 @@ module.exports = async function noDatabaseDbHandler({ query, values }) {
try { try {
/** ********************* Run Query */ /** ********************* Run Query */
results = await new Promise((resolve, reject) => { results = await new Promise((resolve, reject) => {
if (connection.state !== "disconnected") { if (values) {
if (values) { connection.query(query, values, (error, results, fields) => {
connection.query(query, values, (error, results, fields) => { if (error) {
if (error) { console.log("NO-DB handler error:", error.message);
console.log("NO-DB handler error:", error.message); resolve({
resolve({ error: error.message,
error: error.message, });
}); } else {
} else { resolve(JSON.parse(JSON.stringify(results)));
resolve(JSON.parse(JSON.stringify(results))); }
} // setTimeout(() => {
setTimeout(() => { // endConnection(connection);
endConnection(connection); // }, 500);
}, 500); });
}); } else {
} else { connection.query(query, (error, results, fields) => {
connection.query(query, (error, results, fields) => { if (error) {
if (error) { console.log("NO-DB handler error:", error.message);
console.log("NO-DB handler error:", error.message); resolve({
resolve({ error: error.message,
error: error.message, });
}); } else {
} else { resolve(JSON.parse(JSON.stringify(results)));
resolve(JSON.parse(JSON.stringify(results))); }
} // setTimeout(() => {
setTimeout(() => { // endConnection(connection);
endConnection(connection); // }, 500);
}, 500); });
});
}
} }
}); });
//////////////////////////////////////// ////////////////////////////////////////

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "datasquirel", "name": "datasquirel",
"version": "1.5.1", "version": "1.5.2",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "index.js", "main": "index.js",
"bin": { "bin": {