Updates
This commit is contained in:
@@ -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
@@ -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];
|
||||
|
||||
@@ -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>;
|
||||
@@ -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
@@ -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 {};
|
||||
@@ -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;
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user