This commit is contained in:
Benjamin Toby
2025-07-09 20:30:45 +01:00
parent ccb5605b58
commit c37d105dee
264 changed files with 2389 additions and 3743 deletions
+1 -3
View File
@@ -26,15 +26,13 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne
* @returns {Promise<object|null>}
*/
(() => __awaiter(void 0, void 0, void 0, function* () {
var _a;
const CONNECTION = yield (0, grab_dsql_connection_1.default)();
try {
const result = yield CONNECTION.query("SELECT id,first_name,last_name FROM users LIMIT 3");
const [result] = yield CONNECTION.query("SELECT id,first_name,last_name FROM users LIMIT 3");
console.log("Connection Query Success =>", result);
}
catch (error) {
console.log("Connection query ERROR =>", error.message);
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Checking DB`, error);
}
finally {
yield (CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end());
@@ -13,26 +13,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = checkDbRecordCreateDbSchema;
const varDatabaseDbHandler_1 = __importDefault(require("../utils/varDatabaseDbHandler"));
const numberfy_1 = __importDefault(require("../../utils/numberfy"));
const addDbEntry_1 = __importDefault(require("../../functions/backend/db/addDbEntry"));
const updateDbEntry_1 = __importDefault(require("../../functions/backend/db/updateDbEntry"));
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
/**
* # Create database from Schema Function
* @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
*/
function checkDbRecordCreateDbSchema(_a) {
return __awaiter(this, arguments, void 0, function* ({ userId, dbSchema, isMain, }) {
var _b, _c;
var _b;
if (isMain)
return undefined;
try {
const { dbFullName, dbName, dbSlug, dbDescription, dbImage, childDatabase, childDatabaseDbId, id, } = dbSchema;
let recordedDbEntryArray = userId
? yield (0, varDatabaseDbHandler_1.default)({
queryString: `SELECT * FROM datasquirel.user_databases WHERE db_full_name = ?`,
queryValuesArray: [dbFullName || "NULL"],
})
? (yield (0, dbHandler_1.default)({
query: `SELECT * FROM datasquirel.user_databases WHERE db_full_name = ?`,
values: [dbFullName || "NULL"],
}))
: undefined;
let recordedDbEntry = recordedDbEntryArray === null || recordedDbEntryArray === void 0 ? void 0 : recordedDbEntryArray[0];
const newDbEntryObj = {
@@ -53,10 +53,10 @@ function checkDbRecordCreateDbSchema(_a) {
forceLocal: true,
});
if ((_b = newDbEntry.payload) === null || _b === void 0 ? void 0 : _b.insertId) {
recordedDbEntryArray = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SELECT * FROM datasquirel.user_databases WHERE db_full_name = ?`,
queryValuesArray: [dbFullName || "NULL"],
});
recordedDbEntryArray = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM datasquirel.user_databases WHERE db_full_name = ?`,
values: [dbFullName || "NULL"],
}));
recordedDbEntry = recordedDbEntryArray === null || recordedDbEntryArray === void 0 ? void 0 : recordedDbEntryArray[0];
}
}
@@ -72,7 +72,7 @@ function checkDbRecordCreateDbSchema(_a) {
return recordedDbEntry;
}
catch (error) {
(_c = global.ERROR_CALLBACK) === null || _c === void 0 ? void 0 : _c.call(global, `Error Checking DB Record on Creating Schema`, error);
console.log("Error =\u003e", error.message);
return undefined;
}
});
@@ -13,17 +13,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = checkTableRecordCreateDbSchema;
const varDatabaseDbHandler_1 = __importDefault(require("../utils/varDatabaseDbHandler"));
const sql_generator_1 = __importDefault(require("../../functions/dsql/sql/sql-generator"));
const numberfy_1 = __importDefault(require("../../utils/numberfy"));
const addDbEntry_1 = __importDefault(require("../../functions/backend/db/addDbEntry"));
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
/**
* # Create database from Schema Function
* @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
*/
function checkTableRecordCreateDbSchema(_a) {
return __awaiter(this, arguments, void 0, function* ({ userId, tableSchema, dbSchema, dbRecord, dbFullName, }) {
var _b, _c;
var _b;
if (!tableSchema)
return undefined;
try {
@@ -45,10 +45,10 @@ function checkTableRecordCreateDbSchema(_a) {
dbFullName: "datasquirel",
});
let recordedTableEntryArray = userId
? yield (0, varDatabaseDbHandler_1.default)({
queryString: (queryObj === null || queryObj === void 0 ? void 0 : queryObj.string) || "",
queryValuesArray: queryObj === null || queryObj === void 0 ? void 0 : queryObj.values,
})
? (yield (0, dbHandler_1.default)({
query: (queryObj === null || queryObj === void 0 ? void 0 : queryObj.string) || "",
values: queryObj === null || queryObj === void 0 ? void 0 : queryObj.values,
}))
: undefined;
let recordedTableEntry = recordedTableEntryArray === null || recordedTableEntryArray === void 0 ? void 0 : recordedTableEntryArray[0];
if (!(recordedTableEntry === null || recordedTableEntry === void 0 ? void 0 : recordedTableEntry.id) && userId) {
@@ -75,17 +75,17 @@ function checkTableRecordCreateDbSchema(_a) {
forceLocal: true,
});
if ((_b = newTableRecordEntry.payload) === null || _b === void 0 ? void 0 : _b.insertId) {
recordedTableEntryArray = yield (0, varDatabaseDbHandler_1.default)({
queryString: (queryObj === null || queryObj === void 0 ? void 0 : queryObj.string) || "",
queryValuesArray: queryObj === null || queryObj === void 0 ? void 0 : queryObj.values,
});
recordedTableEntryArray = (yield (0, dbHandler_1.default)({
query: (queryObj === null || queryObj === void 0 ? void 0 : queryObj.string) || "",
values: queryObj === null || queryObj === void 0 ? void 0 : queryObj.values,
}));
recordedTableEntry = recordedTableEntryArray === null || recordedTableEntryArray === void 0 ? void 0 : recordedTableEntryArray[0];
}
}
return recordedTableEntry;
}
catch (error) {
(_c = global.ERROR_CALLBACK) === null || _c === void 0 ? void 0 : _c.call(global, `Error Checking Table Record on Creating Schema`, error);
console.log("Error =\u003e", error.message);
return undefined;
}
});
@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = handleIndexescreateDbFromSchema;
const varDatabaseDbHandler_1 = __importDefault(require("../utils/varDatabaseDbHandler"));
const grab_dsql_schema_index_comment_1 = __importDefault(require("../utils/grab-dsql-schema-index-comment"));
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
/**
* Handle DATASQUIREL Table Indexes
* ===================================================
@@ -23,9 +23,9 @@ const grab_dsql_schema_index_comment_1 = __importDefault(require("../utils/grab-
*/
function handleIndexescreateDbFromSchema(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbFullName, tableName, indexes, }) {
const allExistingIndexes = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SHOW INDEXES FROM \`${dbFullName}\`.\`${tableName}\``,
});
const allExistingIndexes = (yield (0, dbHandler_1.default)({
query: `SHOW INDEXES FROM \`${dbFullName}\`.\`${tableName}\``,
}));
for (let g = 0; g < indexes.length; g++) {
const { indexType, indexName, indexTableFields, alias } = indexes[g];
if (!(alias === null || alias === void 0 ? void 0 : alias.match(/./)))
@@ -44,11 +44,11 @@ function handleIndexescreateDbFromSchema(_a) {
* doesn't exist in MYSQL db
*/
const queryString = `CREATE${indexType == "full_text" ? " FULLTEXT" : ""} INDEX \`${alias}\` ON \`${dbFullName}\`.\`${tableName}\`(${indexTableFields === null || indexTableFields === void 0 ? void 0 : indexTableFields.map((nm) => nm.value).map((nm) => `\`${nm}\``).join(",")}) COMMENT '${(0, grab_dsql_schema_index_comment_1.default)()} ${indexName}'`;
const addIndex = yield (0, varDatabaseDbHandler_1.default)({ queryString });
const addIndex = yield (0, dbHandler_1.default)({ query: queryString });
}
}
const allExistingIndexesAfterUpdate = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SHOW INDEXES FROM \`${dbFullName}\`.\`${tableName}\``,
});
const allExistingIndexesAfterUpdate = (yield (0, dbHandler_1.default)({
query: `SHOW INDEXES FROM \`${dbFullName}\`.\`${tableName}\``,
}));
});
}
+31 -51
View File
@@ -46,8 +46,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = createDbFromSchema;
const noDatabaseDbHandler_1 = __importDefault(require("../utils/noDatabaseDbHandler"));
const varDatabaseDbHandler_1 = __importDefault(require("../utils/varDatabaseDbHandler"));
const createTable_1 = __importDefault(require("../utils/createTable"));
const updateTable_1 = __importDefault(require("../utils/updateTable"));
const grab_dir_names_1 = __importDefault(require("../../utils/backend/names/grab-dir-names"));
@@ -88,59 +86,41 @@ function createDbFromSchema(_a) {
continue;
}
console.log(`Handling database => ${dbFullName}`);
const dbCheck = yield (0, noDatabaseDbHandler_1.default)(`SELECT SCHEMA_NAME AS dbFullName FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '${dbFullName}'`);
const dbCheck = yield (0, dbHandler_1.default)({
query: `SELECT SCHEMA_NAME AS dbFullName FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '${dbFullName}'`,
});
if (!((_b = dbCheck === null || dbCheck === void 0 ? void 0 : dbCheck[0]) === null || _b === void 0 ? void 0 : _b.dbFullName)) {
const newDatabase = yield (0, noDatabaseDbHandler_1.default)(`CREATE DATABASE IF NOT EXISTS \`${dbFullName}\` CHARACTER SET utf8mb4 COLLATE utf8mb4_bin`);
const newDatabase = yield (0, dbHandler_1.default)({
query: `CREATE DATABASE IF NOT EXISTS \`${dbFullName}\` CHARACTER SET utf8mb4 COLLATE utf8mb4_bin`,
});
}
const allTables = yield (0, noDatabaseDbHandler_1.default)(`SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='${dbFullName}'`);
const allTables = (yield (0, dbHandler_1.default)({
query: `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='${dbFullName}'`,
}));
let recordedDbEntry = yield (0, check_db_record_1.default)({
dbSchema: database,
userId,
isMain,
});
for (let tb = 0; tb < allTables.length; tb++) {
const { TABLE_NAME } = allTables[tb];
const targetTableSchema = tables.find((_table) => _table.tableName === TABLE_NAME);
/**
* @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 (!targetTableSchema) {
console.log(`Dropping Table ${TABLE_NAME} from ${dbFullName}`);
yield (0, varDatabaseDbHandler_1.default)({
queryString: `DROP TABLE \`${dbFullName}\`.\`${TABLE_NAME}\``,
});
const deleteTableEntry = yield (0, dbHandler_1.default)({
query: `DELETE FROM datasquirel.user_database_tables WHERE user_id = ? AND db_slug = ? AND table_slug = ?`,
values: [userId, dbSlug, TABLE_NAME],
});
// const oldTable = tables.find(
// (_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 (oldTable) {
// console.log("Renaming Table");
// await varDatabaseDbHandler({
// queryString: `RENAME TABLE \`${dbFullName}\`.\`${oldTable.tableNameOld}\` TO \`${oldTable.tableName}\``,
// });
// } else {
// console.log(
// `Dropping Table ${TABLE_NAME} from ${dbFullName}`
// );
// await varDatabaseDbHandler({
// queryString: `DROP TABLE \`${dbFullName}\`.\`${TABLE_NAME}\``,
// });
// const deleteTableEntry = await dbHandler({
// query: `DELETE FROM datasquirel.user_database_tables WHERE user_id = ? AND db_slug = ? AND table_slug = ?`,
// values: [userId, dbSlug, TABLE_NAME],
// });
// }
if (allTables === null || allTables === void 0 ? void 0 : allTables.length) {
for (let tb = 0; tb < allTables.length; tb++) {
const { TABLE_NAME } = allTables[tb];
const targetTableSchema = tables.find((_table) => _table.tableName === TABLE_NAME);
/**
* @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 (!targetTableSchema) {
console.log(`Dropping Table ${TABLE_NAME} from ${dbFullName}`);
yield (0, dbHandler_1.default)({
query: `DROP TABLE \`${dbFullName}\`.\`${TABLE_NAME}\``,
});
const deleteTableEntry = yield (0, dbHandler_1.default)({
query: `DELETE FROM datasquirel.user_database_tables WHERE user_id = ? AND db_slug = ? AND table_slug = ?`,
values: [userId, dbSlug, TABLE_NAME],
});
}
}
}
/**
@@ -156,8 +136,8 @@ function createDbFromSchema(_a) {
* @description Check if table exists
* @type {any}
*/
const tableCheck = yield (0, varDatabaseDbHandler_1.default)({
queryString: `
const tableCheck = yield (0, dbHandler_1.default)({
query: `
SELECT EXISTS (
SELECT
TABLE_NAME
@@ -167,7 +147,7 @@ function createDbFromSchema(_a) {
TABLE_SCHEMA = ? AND
TABLE_NAME = ?
) AS tableExists`,
queryValuesArray: [dbFullName, table.tableName],
values: [dbFullName, table.tableName],
});
if (tableCheck && ((_c = tableCheck[0]) === null || _c === void 0 ? void 0 : _c.tableExists) > 0) {
/**
+9 -20
View File
@@ -13,33 +13,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
require("dotenv").config({ path: "./../.env" });
const varDatabaseDbHandler_1 = __importDefault(require("../functions/backend/varDatabaseDbHandler"));
/** ****************************************************************************** */
/** ****************************************************************************** */
/** ****************************************************************************** */
/** ****************************************************************************** */
/** ****************************************************************************** */
/** ****************************************************************************** */
/**
* Grab Schema
*
* @description Grab Schema
*/
(0, varDatabaseDbHandler_1.default)({
queryString: `SELECT user_database_tables.*,user_databases.db_full_name FROM user_database_tables JOIN user_databases ON user_database_tables.db_id=user_databases.id`,
const dbHandler_1 = __importDefault(require("../functions/backend/dbHandler"));
(0, dbHandler_1.default)({
query: `SELECT user_database_tables.*,user_databases.db_full_name FROM user_database_tables JOIN user_databases ON user_database_tables.db_id=user_databases.id`,
database: "datasquirel",
}).then((tables) => __awaiter(void 0, void 0, void 0, function* () {
for (let i = 0; i < tables.length; i++) {
const table = tables[i];
const { id, user_id, db_id, db_full_name, table_name, table_slug, table_description, } = table;
const tableInfo = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='${db_full_name}' AND TABLE_NAME='${table_slug}'`,
const tableInfo = yield (0, dbHandler_1.default)({
query: `SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='${db_full_name}' AND TABLE_NAME='${table_slug}'`,
});
const updateDbCharset = yield (0, varDatabaseDbHandler_1.default)({
queryString: `ALTER DATABASE ${db_full_name} CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin;`,
const updateDbCharset = yield (0, dbHandler_1.default)({
query: `ALTER DATABASE ${db_full_name} CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin;`,
});
const updateEncoding = yield (0, varDatabaseDbHandler_1.default)({
queryString: `ALTER TABLE \`${db_full_name}\`.\`${table_slug}\` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_bin`,
const updateEncoding = yield (0, dbHandler_1.default)({
query: `ALTER TABLE \`${db_full_name}\`.\`${table_slug}\` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_bin`,
});
}
process.exit();
-1
View File
@@ -1 +0,0 @@
export {};
-51
View File
@@ -1,51 +0,0 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
require("dotenv").config({ path: "./../.env" });
const app_names_1 = require("../dict/app-names");
const serverError_1 = __importDefault(require("../functions/backend/serverError"));
const noDatabaseDbHandler_1 = __importDefault(require("./utils/noDatabaseDbHandler"));
/**
* # Create Database From Schema
*/
function grantFullPrivileges(_a) {
return __awaiter(this, arguments, void 0, function* ({ userId }) {
/**
* Grab Schema
*
* @description Grab Schema
*/
try {
const defaultMariadbUserHost = process.env.DSQL_DB_HOST || "127.0.0.1";
const allDatabases = yield (0, noDatabaseDbHandler_1.default)(`SHOW DATABASES`);
const datasquirelUserDatabases = allDatabases.filter((database) => database.Database.match(new RegExp(`^${app_names_1.AppNames["DsqlDbPrefix"]}`)));
for (let i = 0; i < datasquirelUserDatabases.length; i++) {
const datasquirelUserDatabase = datasquirelUserDatabases[i];
const { Database } = datasquirelUserDatabase;
}
const flushPriviledged = yield (0, noDatabaseDbHandler_1.default)(`FLUSH PRIVILEGES`);
}
catch (error) {
(0, serverError_1.default)({
component: "shell/grantDbPriviledges/main-catch-error",
message: error.message,
user: { id: userId },
});
}
process.exit();
});
}
const userArg = process.argv[process.argv.indexOf("--user")];
const externalUser = process.argv[process.argv.indexOf("--user") + 1];
grantFullPrivileges({ userId: userArg ? externalUser : null });
@@ -1,16 +0,0 @@
export interface GrantType {
database: string;
table: string;
privileges: string[];
}
type Param = {
username?: string;
host?: string;
grants?: GrantType[];
userId: string;
};
/**
* # Handle Grants for Users
*/
export default function handleGrants({ username, host, grants, userId, }: Param): Promise<boolean>;
export {};
-74
View File
@@ -1,74 +0,0 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = handleGrants;
const noDatabaseDbHandler_1 = __importDefault(require("../utils/noDatabaseDbHandler"));
/**
* # Handle Grants for Users
*/
function handleGrants(_a) {
return __awaiter(this, arguments, void 0, function* ({ username, host, grants, userId, }) {
var _b;
let success = false;
console.log(`Handling Grants for User =>`, username, host);
if (!username) {
console.log(`No username provided.`);
return success;
}
if (!host) {
console.log(`No Host provided. \x1b[35m\`--host\`\x1b[0m flag is required`);
return success;
}
if (!grants) {
console.log(`No grants Array provided.`);
return success;
}
try {
const existingUser = yield (0, noDatabaseDbHandler_1.default)(`SELECT * FROM mysql.user WHERE User = '${username}' AND Host = '${host}'`);
const isUserExisting = Boolean((_b = existingUser === null || existingUser === void 0 ? void 0 : existingUser[0]) === null || _b === void 0 ? void 0 : _b.User);
if (isUserExisting) {
const userGrants = yield (0, noDatabaseDbHandler_1.default)(`SHOW GRANTS FOR '${username}'@'${host}'`);
for (let i = 0; i < userGrants.length; i++) {
const grantObject = userGrants[i];
const grant = grantObject === null || grantObject === void 0 ? void 0 : grantObject[Object.keys(grantObject)[0]];
if (grant === null || grant === void 0 ? void 0 : grant.match(/GRANT .* PRIVILEGES ON .* TO/)) {
const revokeGrantText = grant
.replace(/GRANT/, "REVOKE")
.replace(/ TO /, " FROM ");
const revokePrivilege = yield (0, noDatabaseDbHandler_1.default)(revokeGrantText);
}
}
const grantsArray = grants;
for (let i = 0; i < grantsArray.length; i++) {
const grantObject = grantsArray[i];
const { database, table, privileges } = grantObject;
const tableText = table == "*" ? "*" : `\`${table}\``;
const databaseText = database == "*"
? `\`${process.env.DSQL_USER_DB_PREFIX}${userId}_%\``
: `\`${database}\``;
const privilegesText = privileges.includes("ALL")
? "ALL PRIVILEGES"
: privileges.join(", ");
const grantText = `GRANT ${privilegesText} ON ${databaseText}.${tableText} TO '${username}'@'${host}'`;
const grantPriviledge = yield (0, noDatabaseDbHandler_1.default)(grantText);
}
}
success = true;
}
catch ( /** @type {any} */error) {
console.log(`Error in adding SQL user =>`, error.message);
}
return success;
});
}
@@ -1 +0,0 @@
export {};
@@ -1,72 +0,0 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
require("dotenv").config({ path: "../../.env" });
const generate_password_1 = __importDefault(require("generate-password"));
const noDatabaseDbHandler_1 = __importDefault(require("../utils/noDatabaseDbHandler"));
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
const encrypt_1 = __importDefault(require("../../functions/dsql/encrypt"));
const grab_sql_key_name_1 = __importDefault(require("../../utils/grab-sql-key-name"));
/**
* # Reset SQL Passwords
*/
function resetSQLCredentialsPasswords() {
return __awaiter(this, void 0, void 0, function* () {
var _a;
const users = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM users`,
}));
if (!users) {
process.exit();
}
for (let i = 0; i < users.length; i++) {
const user = users[i];
if (!user)
continue;
try {
const maridbUsers = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM mysql.user WHERE User = '${(0, grab_sql_key_name_1.default)({ type: "user", userId: user.id })}'`,
}));
for (let j = 0; j < maridbUsers.length; j++) {
const { User, Host } = maridbUsers[j];
const password = generate_password_1.default.generate({
length: 16,
numbers: true,
symbols: true,
uppercase: true,
exclude: "*#.'`\"",
});
const encryptedPassword = (0, encrypt_1.default)({
data: password,
encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD,
encryptionSalt: process.env.DSQL_ENCRYPTION_SALT,
});
yield (0, noDatabaseDbHandler_1.default)(`SET PASSWORD FOR '${User}'@'${Host}' = PASSWORD('${password}')`);
if (user.mariadb_user == User && user.mariadb_host == Host) {
const updateUser = yield (0, dbHandler_1.default)({
query: `UPDATE users SET mariadb_pass = ? WHERE id = ?`,
values: [encryptedPassword, user.id],
});
}
console.log(`User ${user.id}: ${user.first_name} ${user.last_name} Password Updated successfully added.`);
}
}
catch (error) {
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Resetting MariaDB User Password`, error);
}
}
process.exit();
});
}
resetSQLCredentialsPasswords();
@@ -17,7 +17,7 @@ require("dotenv").config({ path: "../../../.env" });
const fs_1 = __importDefault(require("fs"));
const child_process_1 = require("child_process");
const ejson_1 = __importDefault(require("../../../utils/ejson"));
const DB_HANDLER_1 = __importDefault(require("../../../utils/backend/global-db/DB_HANDLER"));
const dbHandler_1 = __importDefault(require("../../../functions/backend/dbHandler"));
const addDbEntry_1 = __importDefault(require("../../../functions/backend/db/addDbEntry"));
const addMariadbUser_1 = __importDefault(require("../../../functions/backend/addMariadbUser"));
const updateDbEntry_1 = __importDefault(require("../../../functions/backend/db/updateDbEntry"));
@@ -29,7 +29,7 @@ const tmpDir = process.argv[process.argv.length - 1];
*/
function createUser() {
return __awaiter(this, void 0, void 0, function* () {
var _a, _b;
var _a;
/**
* Validate Form
*
@@ -67,7 +67,9 @@ function createUser() {
encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD || "",
password: password,
});
let existingUser = yield (0, DB_HANDLER_1.default)(`SELECT * FROM users WHERE email='${email}'`);
let existingUser = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM users WHERE email='${email}'`,
}));
if (existingUser === null || existingUser === void 0 ? void 0 : existingUser[0]) {
console.log("User Exists");
return false;
@@ -128,7 +130,7 @@ function createUser() {
return true;
}
catch (error) {
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Creating User`, error);
console.log("Error =\u003e", error.message);
return false;
}
});
@@ -24,7 +24,6 @@ const tmpDir = process.argv[process.argv.length - 1];
*/
function createUser() {
return __awaiter(this, void 0, void 0, function* () {
var _a;
/**
* Validate Form
*
@@ -66,7 +65,7 @@ function createUser() {
return true;
}
catch (error) {
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating User`, error);
console.log("Error =\u003e", error.message);
return false;
}
});
+14 -7
View File
@@ -14,8 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
const fs_1 = __importDefault(require("fs"));
require("dotenv").config({ path: "./../.env" });
const varDatabaseDbHandler_1 = __importDefault(require("../functions/backend/varDatabaseDbHandler"));
const DB_HANDLER_1 = __importDefault(require("../utils/backend/global-db/DB_HANDLER"));
const dbHandler_1 = __importDefault(require("../functions/backend/dbHandler"));
const userId = process.argv.indexOf("--userId") >= 0
? process.argv[process.argv.indexOf("--userId") + 1]
: null;
@@ -30,7 +29,9 @@ function recoverMainJsonFromDb() {
console.log("No user Id provided");
return;
}
const databases = yield (0, DB_HANDLER_1.default)(`SELECT * FROM user_databases WHERE user_id='${userId}'`);
const databases = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM user_databases WHERE user_id='${userId}'`,
}));
const dbWrite = [];
for (let i = 0; i < databases.length; i++) {
const { id, db_name, db_slug, db_full_name, db_image, db_description } = databases[i];
@@ -42,7 +43,9 @@ function recoverMainJsonFromDb() {
dbImage: db_image,
tables: [],
};
const tables = yield (0, DB_HANDLER_1.default)(`SELECT * FROM user_database_tables WHERE user_id='${userId}' AND db_id='${id}'`);
const tables = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM user_database_tables WHERE user_id='${userId}' AND db_id='${id}'`,
}));
for (let j = 0; j < tables.length; j++) {
const { table_name, table_slug, table_description } = tables[j];
const tableObject = {
@@ -51,10 +54,14 @@ function recoverMainJsonFromDb() {
fields: [],
indexes: [],
};
const tableFields = yield (0, varDatabaseDbHandler_1.default)({
const tableFields = (yield (0, dbHandler_1.default)({
database: db_full_name,
queryString: `SHOW COLUMNS FROM ${db_full_name}.${table_slug}`,
});
query: `SHOW COLUMNS FROM ${db_full_name}.${table_slug}`,
}));
if (!tableFields) {
console.log("No table fields found");
continue;
}
for (let k = 0; k < tableFields.length; k++) {
const { Field, Type, Null, Default, Key } = tableFields[k];
const fieldObject = {
+4 -4
View File
@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
require("dotenv").config({ path: "./../.env" });
const generate_password_1 = __importDefault(require("generate-password"));
const noDatabaseDbHandler_1 = __importDefault(require("./utils/noDatabaseDbHandler"));
const dbHandler_1 = __importDefault(require("../functions/backend/dbHandler"));
const encrypt_1 = __importDefault(require("../functions/dsql/encrypt"));
const grab_sql_key_name_1 = __importDefault(require("../utils/grab-sql-key-name"));
@@ -23,7 +22,6 @@ const grab_sql_key_name_1 = __importDefault(require("../utils/grab-sql-key-name"
*/
function resetSQLCredentialsPasswords() {
return __awaiter(this, void 0, void 0, function* () {
var _a;
const users = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM users`,
}));
@@ -45,7 +43,9 @@ function resetSQLCredentialsPasswords() {
exclude: "*#.'`\"",
});
const encryptedPassword = (0, encrypt_1.default)({ data: password });
yield (0, noDatabaseDbHandler_1.default)(`SET PASSWORD FOR '${username}'@'${defaultMariadbUserHost}' = PASSWORD('${password}')`);
yield (0, dbHandler_1.default)({
query: `SET PASSWORD FOR '${username}'@'${defaultMariadbUserHost}' = PASSWORD('${password}')`,
});
const updateUser = yield (0, dbHandler_1.default)({
query: `UPDATE users SET mariadb_pass = ? WHERE id = ?`,
values: [encryptedPassword, user.id],
@@ -53,7 +53,7 @@ function resetSQLCredentialsPasswords() {
console.log(`User ${user.id}: ${user.first_name} ${user.last_name} Password Updated successfully added.`);
}
catch (error) {
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating MariaDB User`, error);
console.log("Error =\u003e", error.message);
}
}
process.exit();
-1
View File
@@ -1 +0,0 @@
export {};
-71
View File
@@ -1,71 +0,0 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
require("dotenv").config({ path: "./../.env" });
const generate_password_1 = __importDefault(require("generate-password"));
const noDatabaseDbHandler_1 = __importDefault(require("./utils/noDatabaseDbHandler"));
const dbHandler_1 = __importDefault(require("../functions/backend/dbHandler"));
const encrypt_1 = __importDefault(require("../functions/dsql/encrypt"));
const grab_sql_key_name_1 = __importDefault(require("../utils/grab-sql-key-name"));
/** ****************************************************************************** */
/** ****************************************************************************** */
/** ****************************************************************************** */
/** ****************************************************************************** */
/** ****************************************************************************** */
/** ****************************************************************************** */
/**
* # Set SQL Credentials
*/
function setSQLCredentials() {
return __awaiter(this, void 0, void 0, function* () {
var _a;
const users = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM users`,
}));
if (!users) {
process.exit();
}
for (let i = 0; i < users.length; i++) {
const user = users[i];
if (!user)
continue;
if (user.mariadb_user && user.mariadb_pass) {
continue;
}
try {
const username = (0, grab_sql_key_name_1.default)({ type: "user", userId: user.id });
const password = generate_password_1.default.generate({
length: 16,
numbers: true,
symbols: true,
uppercase: true,
exclude: "*#.'`\"",
});
const encryptedPassword = (0, encrypt_1.default)({ data: password });
yield (0, noDatabaseDbHandler_1.default)(`CREATE USER IF NOT EXISTS '${username}'@'127.0.0.1' IDENTIFIED BY '${password}'`);
yield (0, noDatabaseDbHandler_1.default)(`GRANT ALL PRIVILEGES ON \`datasquirel\\_user\\_${user.id}\\_%\`.* TO '${username}'@'127.0.0.1'`);
yield (0, noDatabaseDbHandler_1.default)(`FLUSH PRIVILEGES`);
const updateUser = yield (0, dbHandler_1.default)({
query: `UPDATE users SET mariadb_user = ?, mariadb_host = '127.0.0.1' mariadb_pass = ? WHERE id = ?`,
values: [username, encryptedPassword, user.id],
});
console.log(`User ${user.id}: ${user.first_name} ${user.last_name} SQL credentials successfully added.`);
}
catch (error) {
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Setting SQL credentials`, error);
}
}
});
}
setSQLCredentials();
+2 -3
View File
@@ -26,7 +26,6 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne
* @returns {Promise<object|null>}
*/
(() => __awaiter(void 0, void 0, void 0, function* () {
var _a;
const CONNECTION = yield (0, grab_dsql_connection_1.default)({ noDb: true });
/**
* Switch Database
@@ -34,12 +33,12 @@ const grab_dsql_connection_1 = __importDefault(require("../utils/grab-dsql-conne
* @description If a database is provided, switch to it
*/
try {
const result = yield CONNECTION.query("SHOW DATABASES");
const [result] = yield CONNECTION.query("SHOW DATABASES");
const parsedResults = JSON.parse(JSON.stringify(result));
console.log("parsedResults =>", parsedResults);
}
catch (error) {
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Testing External Server`, error);
console.log("Error =\u003e", error.message);
}
finally {
yield (CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end());
-4
View File
@@ -1,4 +0,0 @@
/**
* # Test SQL Escape
*/
export default function testSQLEscape(): Promise<void>;
-71
View File
@@ -1,71 +0,0 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = testSQLEscape;
require("dotenv").config({ path: "./../.env" });
const generate_password_1 = __importDefault(require("generate-password"));
const noDatabaseDbHandler_1 = __importDefault(require("./utils/noDatabaseDbHandler"));
const dbHandler_1 = __importDefault(require("../functions/backend/dbHandler"));
const encrypt_1 = __importDefault(require("../functions/dsql/encrypt"));
const grab_sql_key_name_1 = __importDefault(require("../utils/grab-sql-key-name"));
/**
* # Test SQL Escape
*/
function testSQLEscape() {
return __awaiter(this, void 0, void 0, function* () {
var _a;
const users = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM users`,
}));
if (!users) {
process.exit();
}
for (let i = 0; i < users.length; i++) {
const user = users[i];
if (!user)
continue;
const defaultMariadbUserHost = process.env.DSQL_DB_HOST || "127.0.0.1";
try {
const username = (0, grab_sql_key_name_1.default)({ type: "user", userId: user.id });
const password = generate_password_1.default.generate({
length: 16,
numbers: true,
symbols: true,
uppercase: true,
exclude: "*#.'`\"",
});
const encryptedPassword = (0, encrypt_1.default)({ data: password });
yield (0, noDatabaseDbHandler_1.default)(`DROP USER '${username}'@'${defaultMariadbUserHost}'`);
yield (0, noDatabaseDbHandler_1.default)(`CREATE USER IF NOT EXISTS '${username}'@'${defaultMariadbUserHost}' IDENTIFIED BY '${password}'`);
yield (0, noDatabaseDbHandler_1.default)(`GRANT ALL PRIVILEGES ON \`datasquirel\\_user\\_${user.id}\\_%\`.* TO '${username}'@'${defaultMariadbUserHost}'`);
yield (0, noDatabaseDbHandler_1.default)(`FLUSH PRIVILEGES`);
const updateUser = yield (0, dbHandler_1.default)({
query: `UPDATE users SET mariadb_user = ?, mariadb_host = ? mariadb_pass = ? WHERE id = ?`,
values: [
username,
defaultMariadbUserHost,
encryptedPassword,
user.id,
],
});
console.log(`User ${user.id}: ${user.first_name} ${user.last_name} SQL credentials successfully added.`);
}
catch (error) {
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Testing SQL Escape`, error);
}
}
process.exit();
});
}
testSQLEscape();
+9 -8
View File
@@ -12,12 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const DB_HANDLER_1 = __importDefault(require("../utils/backend/global-db/DB_HANDLER"));
const dbHandler_1 = __importDefault(require("../functions/backend/dbHandler"));
const fs_1 = __importDefault(require("fs"));
require("dotenv").config({ path: "./../.env" });
function updateChildrenTablesOnDb() {
return __awaiter(this, void 0, void 0, function* () {
var _a;
/**
* Grab Schema
*
@@ -39,18 +38,20 @@ function updateChildrenTablesOnDb() {
const originTableName = table.childTableName;
const originDbName = table.childTableDbFullName;
const WHERE_CLAUSE = `WHERE user_id='${userId}' AND db_slug='${db.dbSlug}' AND table_slug='${table.tableName}'`;
const existingTableInDb = yield (0, DB_HANDLER_1.default)(`SELECT * FROM user_database_tables ${WHERE_CLAUSE}`);
if (existingTableInDb && existingTableInDb[0]) {
const updateChildrenTablesInfo = yield (0, DB_HANDLER_1.default)(`UPDATE user_database_tables SET child_table='1',child_table_parent_database='${originDbName}',child_table_parent_table='${originTableName}' WHERE id='${existingTableInDb[0].id}'`);
const existingTableInDb = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM user_database_tables ${WHERE_CLAUSE}`,
}));
if (existingTableInDb === null || existingTableInDb === void 0 ? void 0 : existingTableInDb[0]) {
const updateChildrenTablesInfo = yield (0, dbHandler_1.default)({
query: `UPDATE user_database_tables SET child_table='1',child_table_parent_database='${originDbName}',child_table_parent_table='${originTableName}' WHERE id='${existingTableInDb[0].id}'`,
});
}
}
}
}
}
}
catch (error) {
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating Children Tables on DB`, error);
}
catch (error) { }
process.exit();
});
}
+9 -9
View File
@@ -13,27 +13,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
require("dotenv").config({ path: "./../.env" });
const varDatabaseDbHandler_1 = __importDefault(require("../functions/backend/varDatabaseDbHandler"));
const dbHandler_1 = __importDefault(require("../functions/backend/dbHandler"));
/**
* Grab Schema
*
* @description Grab Schema
*/
(0, varDatabaseDbHandler_1.default)({
queryString: `SELECT user_database_tables.*,user_databases.db_full_name FROM user_database_tables JOIN user_databases ON user_database_tables.db_id=user_databases.id`,
(0, dbHandler_1.default)({
query: `SELECT user_database_tables.*,user_databases.db_full_name FROM user_database_tables JOIN user_databases ON user_database_tables.db_id=user_databases.id`,
database: "datasquirel",
}).then((tables) => __awaiter(void 0, void 0, void 0, function* () {
for (let i = 0; i < tables.length; i++) {
const table = tables[i];
const { id, user_id, db_id, db_full_name, table_name, table_slug, table_description, } = table;
const tableInfo = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='${db_full_name}' AND TABLE_NAME='${table_slug}'`,
const tableInfo = yield (0, dbHandler_1.default)({
query: `SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='${db_full_name}' AND TABLE_NAME='${table_slug}'`,
});
const updateCreationDateTimestamp = yield (0, varDatabaseDbHandler_1.default)({
queryString: `ALTER TABLE \`${db_full_name}\`.\`${table_slug}\` MODIFY COLUMN date_created_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP`,
const updateCreationDateTimestamp = yield (0, dbHandler_1.default)({
query: `ALTER TABLE \`${db_full_name}\`.\`${table_slug}\` MODIFY COLUMN date_created_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP`,
});
const updateDateTimestamp = yield (0, varDatabaseDbHandler_1.default)({
queryString: `ALTER TABLE \`${db_full_name}\`.\`${table_slug}\` MODIFY COLUMN date_updated_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP`,
const updateDateTimestamp = yield (0, dbHandler_1.default)({
query: `ALTER TABLE \`${db_full_name}\`.\`${table_slug}\` MODIFY COLUMN date_updated_timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP`,
});
console.log("Date Updated Column updated");
}
+9 -10
View File
@@ -14,8 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
require("dotenv").config({ path: "./../.env" });
const serverError_1 = __importDefault(require("../functions/backend/serverError"));
const varDatabaseDbHandler_1 = __importDefault(require("./utils/varDatabaseDbHandler"));
const DB_HANDLER_1 = __importDefault(require("../utils/backend/global-db/DB_HANDLER"));
const dbHandler_1 = __importDefault(require("../functions/backend/dbHandler"));
/** ****************************************************************************** */
/** ****************************************************************************** */
/** ****************************************************************************** */
@@ -27,18 +26,19 @@ const DB_HANDLER_1 = __importDefault(require("../utils/backend/global-db/DB_HAND
*
* @description Grab Schema
*/
(0, varDatabaseDbHandler_1.default)({
queryString: `SELECT DISTINCT db_id FROM datasquirel.user_database_tables`,
(0, dbHandler_1.default)({
query: `SELECT DISTINCT db_id FROM datasquirel.user_database_tables`,
}).then((tables) => __awaiter(void 0, void 0, void 0, function* () {
// console.log(tables);
// process.exit();
var _a;
for (let i = 0; i < tables.length; i++) {
const table = tables[i];
try {
const { db_id } = table;
const dbSlug = yield (0, DB_HANDLER_1.default)(`SELECT db_slug FROM user_databases WHERE id='${db_id}'`);
const updateTableSlug = yield (0, DB_HANDLER_1.default)(`UPDATE user_database_tables SET db_slug='${dbSlug[0].db_slug}' WHERE db_id='${db_id}'`);
const dbSlug = (yield (0, dbHandler_1.default)({
query: `SELECT db_slug FROM user_databases WHERE id='${db_id}'`,
}));
const updateTableSlug = yield (0, dbHandler_1.default)({
query: `UPDATE user_database_tables SET db_slug='${dbSlug[0].db_slug}' WHERE db_id='${db_id}'`,
});
}
catch (error) {
(0, serverError_1.default)({
@@ -46,7 +46,6 @@ const DB_HANDLER_1 = __importDefault(require("../utils/backend/global-db/DB_HAND
message: error.message,
user: {},
});
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating DB Slugs For Table Records`, error);
}
}
process.exit();
+6 -7
View File
@@ -27,13 +27,12 @@ const grab_sql_key_name_1 = __importDefault(require("../utils/grab-sql-key-name"
* @returns {Promise<object|null>}
*/
(() => __awaiter(void 0, void 0, void 0, function* () {
var _a, _b;
var _a;
const CONNECTION = yield (0, grab_dsql_connection_1.default)();
try {
const result = yield CONNECTION.query("SELECT user,host,ssl_type FROM mysql.user");
const parsedResults = JSON.parse(JSON.stringify(result));
for (let i = 0; i < parsedResults.length; i++) {
const user = parsedResults[i];
const [result] = yield CONNECTION.query("SELECT user,host,ssl_type FROM mysql.user");
for (let i = 0; i < result.length; i++) {
const user = result[i];
if (user.User !== process.env.DSQL_DB_READ_ONLY_USERNAME ||
user.User !== process.env.DSQL_DB_FULL_ACCESS_USERNAME ||
!((_a = user.User) === null || _a === void 0 ? void 0 : _a.match(new RegExp((0, grab_sql_key_name_1.default)({ type: "user" }))))) {
@@ -43,12 +42,12 @@ const grab_sql_key_name_1 = __importDefault(require("../utils/grab-sql-key-name"
if (ssl_type === "ANY") {
continue;
}
const addUserSSL = yield CONNECTION.query(`ALTER USER '${User}'@'${Host}'`);
const [addUserSSL] = yield CONNECTION.query(`ALTER USER '${User}'@'${Host}'`);
console.log(`addUserSSL => ${User}@${Host}`, addUserSSL);
}
}
catch (error) {
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Updating SSL Users`, error);
console.log("Error =\u003e", error.message);
}
finally {
yield (CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end());
@@ -13,12 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = default_1;
const varDatabaseDbHandler_1 = __importDefault(require("./varDatabaseDbHandler"));
const numberfy_1 = __importDefault(require("../../utils/numberfy"));
const updateDbEntry_1 = __importDefault(require("../../functions/backend/db/updateDbEntry"));
const addDbEntry_1 = __importDefault(require("../../functions/backend/db/addDbEntry"));
const slug_to_normal_text_1 = __importDefault(require("../../utils/slug-to-normal-text"));
const lodash_1 = __importDefault(require("lodash"));
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
/**
* # Handle Table Record Update and Insert
*/
@@ -59,13 +59,13 @@ function default_1(_a) {
: 0,
active_data: newTableSchema.updateData ? 1 : 0,
};
const existingTable = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SELECT * FROM ${targetDatabase}.${targetTableName} WHERE db_id = ? AND table_slug = ?`,
queryValuesArray: [
const existingTable = (yield (0, dbHandler_1.default)({
query: `SELECT * FROM ${targetDatabase}.${targetTableName} WHERE db_id = ? AND table_slug = ?`,
values: [
String(recordedDbEntry.id),
String(newTableSchema.tableName),
],
});
}));
const table = existingTable === null || existingTable === void 0 ? void 0 : existingTable[0];
if (table === null || table === void 0 ? void 0 : table.id) {
tableId = table.id;
+3 -3
View File
@@ -13,11 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = createTable;
const varDatabaseDbHandler_1 = __importDefault(require("./varDatabaseDbHandler"));
const generateColumnDescription_1 = __importDefault(require("./generateColumnDescription"));
const supplementTable_1 = __importDefault(require("./supplementTable"));
const handle_table_foreign_key_1 = __importDefault(require("./handle-table-foreign-key"));
const create_table_handle_table_record_1 = __importDefault(require("./create-table-handle-table-record"));
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
/**
* # Create Table Functions
*/
@@ -50,8 +50,8 @@ function createTable(_a) {
}
createTableQueryArray.push(`) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;`);
const createTableQuery = createTableQueryArray.join("\n");
const newTable = yield (0, varDatabaseDbHandler_1.default)({
queryString: createTableQuery,
const newTable = yield (0, dbHandler_1.default)({
query: createTableQuery,
});
for (let i = 0; i < finalTable.length; i++) {
const column = finalTable[i];
+6 -6
View File
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = dropAllForeignKeys;
const grab_sql_key_name_1 = __importDefault(require("../../utils/grab-sql-key-name"));
const varDatabaseDbHandler_1 = __importDefault(require("./varDatabaseDbHandler"));
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
/**
* # Drop All Foreign Keys
*/
@@ -33,13 +33,13 @@ function dropAllForeignKeys(_a) {
// `,
// });
// }
const foreignKeys = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SHOW INDEXES FROM \`${dbFullName}\`.\`${tableName}\` WHERE Key_name LIKE '${(0, grab_sql_key_name_1.default)({ type: "foreign_key" })}%'`,
});
const foreignKeys = (yield (0, dbHandler_1.default)({
query: `SHOW INDEXES FROM \`${dbFullName}\`.\`${tableName}\` WHERE Key_name LIKE '${(0, grab_sql_key_name_1.default)({ type: "foreign_key" })}%'`,
}));
for (const fk of foreignKeys) {
if (fk.Key_name.match(new RegExp((0, grab_sql_key_name_1.default)({ type: "foreign_key" })))) {
yield (0, varDatabaseDbHandler_1.default)({
queryString: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP INDEX \`${fk.Key_name}\`
yield (0, dbHandler_1.default)({
query: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP INDEX \`${fk.Key_name}\`
`,
});
}
@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = handleTableForeignKey;
const varDatabaseDbHandler_1 = __importDefault(require("./varDatabaseDbHandler"));
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
/**
* # Update table function
*/
@@ -31,9 +31,9 @@ function handleTableForeignKey(_a) {
// cascadeDelete ? " ON DELETE CASCADE" : ""
// }${cascadeUpdate ? " ON UPDATE CASCADE" : ""}`;
// let finalQueryString = `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` ${foreinKeyText}`;
const addForeignKey = yield (0, varDatabaseDbHandler_1.default)({
queryString: finalQueryString,
});
const addForeignKey = (yield (0, dbHandler_1.default)({
query: finalQueryString,
}));
if (!(addForeignKey === null || addForeignKey === void 0 ? void 0 : addForeignKey.serverStatus)) {
errorLogs === null || errorLogs === void 0 ? void 0 : errorLogs.push(addForeignKey);
}
@@ -1 +0,0 @@
export default function noDatabaseDbHandler(queryString: string): Promise<any>;
-34
View File
@@ -1,34 +0,0 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = noDatabaseDbHandler;
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
function noDatabaseDbHandler(queryString) {
return __awaiter(this, void 0, void 0, function* () {
var _a;
let results;
try {
results = yield (0, dbHandler_1.default)({ query: queryString });
}
catch (error) {
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `No DB Handler Error`, error);
}
if (results) {
return results;
}
else {
return null;
}
});
}
+43 -41
View File
@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = updateTable;
const varDatabaseDbHandler_1 = __importDefault(require("./varDatabaseDbHandler"));
const generateColumnDescription_1 = __importDefault(require("./generateColumnDescription"));
const handle_table_foreign_key_1 = __importDefault(require("./handle-table-foreign-key"));
const drop_all_foreign_keys_1 = __importDefault(require("./drop-all-foreign-keys"));
@@ -23,6 +22,7 @@ const handle_indexes_1 = __importDefault(require("../createDbFromSchema/handle-i
const lodash_1 = __importDefault(require("lodash"));
const grab_required_database_schemas_1 = require("../createDbFromSchema/grab-required-database-schemas");
const normalize_text_1 = __importDefault(require("../../utils/normalize-text"));
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
/**
* # Update table function
*/
@@ -75,24 +75,26 @@ function updateTable(_a) {
* @description Iterate through each table index(if available)
* and perform operations
*/
const allExistingIndexes = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SHOW INDEXES FROM \`${dbFullName}\`.\`${tableName}\` WHERE Index_comment LIKE '%schema_index%'`,
});
for (let f = 0; f < allExistingIndexes.length; f++) {
const { Key_name } = allExistingIndexes[f];
try {
const existingKeyInSchema = tableIndexes === null || tableIndexes === void 0 ? void 0 : tableIndexes.find((indexObject) => indexObject.alias === Key_name);
if (!existingKeyInSchema)
throw new Error(`This Index(${Key_name}) Has been Deleted!`);
}
catch (error) {
/**
* @description Drop Index: This happens when the MYSQL index is not
* present in the datasquirel DB schema
*/
yield (0, varDatabaseDbHandler_1.default)({
queryString: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP INDEX \`${Key_name}\``,
});
const allExistingIndexes = (yield (0, dbHandler_1.default)({
query: `SHOW INDEXES FROM \`${dbFullName}\`.\`${tableName}\` WHERE Index_comment LIKE '%schema_index%'`,
}));
if (allExistingIndexes) {
for (let f = 0; f < allExistingIndexes.length; f++) {
const { Key_name } = allExistingIndexes[f];
try {
const existingKeyInSchema = tableIndexes === null || tableIndexes === void 0 ? void 0 : tableIndexes.find((indexObject) => indexObject.alias === Key_name);
if (!existingKeyInSchema)
throw new Error(`This Index(${Key_name}) Has been Deleted!`);
}
catch (error) {
/**
* @description Drop Index: This happens when the MYSQL index is not
* present in the datasquirel DB schema
*/
yield (0, dbHandler_1.default)({
query: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP INDEX \`${Key_name}\``,
});
}
}
}
/**
@@ -114,9 +116,9 @@ function updateTable(_a) {
* @description Iterate through each datasquirel schema
* table index(if available), and perform operations
*/
const allForeignKeys = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE CONSTRAINT_SCHEMA = '${dbFullName}' AND TABLE_NAME='${tableName}' AND CONSTRAINT_TYPE='FOREIGN KEY'`,
});
const allForeignKeys = (yield (0, dbHandler_1.default)({
query: `SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE CONSTRAINT_SCHEMA = '${dbFullName}' AND TABLE_NAME='${tableName}' AND CONSTRAINT_TYPE='FOREIGN KEY'`,
}));
if (allForeignKeys) {
for (let c = 0; c < allForeignKeys.length; c++) {
const { CONSTRAINT_NAME } = allForeignKeys[c];
@@ -129,8 +131,8 @@ function updateTable(_a) {
* @description Drop all foreign Keys to avoid MYSQL errors when adding/updating
* Foreign keys
*/
const dropForeignKey = yield (0, varDatabaseDbHandler_1.default)({
queryString: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP FOREIGN KEY \`${CONSTRAINT_NAME}\``,
yield (0, dbHandler_1.default)({
query: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP FOREIGN KEY \`${CONSTRAINT_NAME}\``,
});
}
}
@@ -140,16 +142,16 @@ function updateTable(_a) {
* @description Find all existing unique field constraints
* and remove them
*/
const allUniqueConstraints = yield (0, varDatabaseDbHandler_1.default)({
queryString: (0, normalize_text_1.default)(`SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS \
const allUniqueConstraints = (yield (0, dbHandler_1.default)({
query: (0, normalize_text_1.default)(`SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS \
WHERE CONSTRAINT_SCHEMA = '${dbFullName}' AND TABLE_NAME='${tableName}' AND \
CONSTRAINT_TYPE='UNIQUE'`),
});
}));
if (allUniqueConstraints) {
for (let c = 0; c < allUniqueConstraints.length; c++) {
const { CONSTRAINT_NAME } = allUniqueConstraints[c];
const dropUniqueConstraint = yield (0, varDatabaseDbHandler_1.default)({
queryString: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP INDEX \`${CONSTRAINT_NAME}\``,
yield (0, dbHandler_1.default)({
query: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP INDEX \`${CONSTRAINT_NAME}\``,
});
}
}
@@ -158,9 +160,9 @@ function updateTable(_a) {
* ===================================================
* @description Now handle all fields/columns
*/
let allExistingColumns = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SHOW COLUMNS FROM \`${dbFullName}\`.\`${tableName}\``,
});
let allExistingColumns = (yield (0, dbHandler_1.default)({
query: `SHOW COLUMNS FROM \`${dbFullName}\`.\`${tableName}\``,
}));
/**
* @type {string[]}
* @description Updated column names Array
@@ -184,8 +186,8 @@ function updateTable(_a) {
*/
if (existingEntry.updatedField && existingEntry.fieldName) {
updatedColumnsArray.push(existingEntry.fieldName);
const renameColumn = yield (0, varDatabaseDbHandler_1.default)({
queryString: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` RENAME COLUMN \`${existingEntry.originName}\` TO \`${existingEntry.fieldName}\``,
yield (0, dbHandler_1.default)({
query: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` RENAME COLUMN \`${existingEntry.originName}\` TO \`${existingEntry.fieldName}\``,
});
console.log(`Column Renamed from "${existingEntry.originName}" to "${existingEntry.fieldName}"`);
/**
@@ -212,9 +214,9 @@ function updateTable(_a) {
userId,
});
}
allExistingColumns = yield (0, varDatabaseDbHandler_1.default)({
queryString: `SHOW COLUMNS FROM \`${dbFullName}\`.\`${tableName}\``,
});
allExistingColumns = (yield (0, dbHandler_1.default)({
query: `SHOW COLUMNS FROM \`${dbFullName}\`.\`${tableName}\``,
}));
}
catch (error) {
console.log("Update table error =>", error.message);
@@ -226,8 +228,8 @@ function updateTable(_a) {
////////////////////////////////////////
}
else {
yield (0, varDatabaseDbHandler_1.default)({
queryString: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP COLUMN \`${Field}\``,
yield (0, dbHandler_1.default)({
query: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP COLUMN \`${Field}\``,
});
}
}
@@ -298,8 +300,8 @@ function updateTable(_a) {
* Alter directives like "ADD COLUMN" or "MODIFY COLUMN"
*/
if (updateTableQueryArray.length > 1) {
const updateTable = yield (0, varDatabaseDbHandler_1.default)({
queryString: updateTableQuery,
const updateTable = yield (0, dbHandler_1.default)({
query: updateTableQuery,
});
/**
* # Handle Foreign Keys
@@ -1,9 +0,0 @@
type Param = {
queryString: string;
queryValuesArray?: string[];
};
/**
* # DB handler for specific database
*/
export default function varDatabaseDbHandler({ queryString, queryValuesArray, }: Param): Promise<any>;
export {};
-62
View File
@@ -1,62 +0,0 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = varDatabaseDbHandler;
const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
/**
* # DB handler for specific database
*/
function varDatabaseDbHandler(_a) {
return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, }) {
/**
* Declare variables
*
* @description Declare "results" variable
*/
let results;
/**
* Fetch from db
*
* @description Fetch data from db if no cache
*/
try {
if (queryString &&
queryValuesArray &&
Array.isArray(queryValuesArray) &&
queryValuesArray[0]) {
results = yield (0, dbHandler_1.default)({
query: queryString,
values: queryValuesArray,
});
}
else {
results = yield (0, dbHandler_1.default)({
query: queryString,
});
}
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////
}
catch ( /** @type {any} */error) {
console.log("Shell Vardb Error =>", error.message);
}
/**
* Return results
*
* @description Return results add to cache if "req" param is passed
*/
return results;
});
}