Updates
This commit is contained in:
+19
-8
@@ -29,14 +29,25 @@ function dbSchemaToType(params) {
|
||||
});
|
||||
const defDbName = (_b = (datasquirelSchema.dbName ||
|
||||
((_a = datasquirelSchema.dbFullName) === null || _a === void 0 ? void 0 : _a.replace(new RegExp(`${app_names_1.AppNames["DsqlDbPrefix"]}\\d+_`), "")))) === null || _b === void 0 ? void 0 : _b.toUpperCase().replace(/ /g, "_");
|
||||
const defNames = [];
|
||||
const schemas = dbTablesSchemas
|
||||
.map((table) => (0, generate_type_definitions_1.default)({
|
||||
paradigm: "TypeScript",
|
||||
table,
|
||||
typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
|
||||
allValuesOptional: true,
|
||||
addExport: true,
|
||||
}))
|
||||
.map((table) => {
|
||||
var _a;
|
||||
const defObj = (0, generate_type_definitions_1.default)({
|
||||
paradigm: "TypeScript",
|
||||
table,
|
||||
typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
|
||||
allValuesOptional: true,
|
||||
addExport: true,
|
||||
});
|
||||
if ((_a = defObj.tdName) === null || _a === void 0 ? void 0 : _a.match(/./)) {
|
||||
defNames.push(defObj.tdName);
|
||||
}
|
||||
return defObj.typeDefinition;
|
||||
})
|
||||
.filter((schm) => typeof schm == "string");
|
||||
return [tableNames, ...schemas];
|
||||
const allTd = (defNames === null || defNames === void 0 ? void 0 : defNames[0])
|
||||
? `export type DSQL_${defDbName}_ALL_TYPEDEFS = ${defNames.join(` & `)}`
|
||||
: ``;
|
||||
return [tableNames, ...schemas, allTd];
|
||||
}
|
||||
|
||||
@@ -8,5 +8,8 @@ type Param = {
|
||||
addExport?: boolean;
|
||||
dbName?: string;
|
||||
};
|
||||
export default function generateTypeDefinition({ paradigm, table, query, typeDefName, allValuesOptional, addExport, dbName, }: Param): string | null;
|
||||
export default function generateTypeDefinition({ paradigm, table, query, typeDefName, allValuesOptional, addExport, dbName, }: Param): {
|
||||
typeDefinition: string | null;
|
||||
tdName: string;
|
||||
};
|
||||
export {};
|
||||
|
||||
@@ -7,8 +7,9 @@ exports.default = generateTypeDefinition;
|
||||
const default_fields_regexp_1 = __importDefault(require("./default-fields-regexp"));
|
||||
function generateTypeDefinition({ paradigm, table, query, typeDefName, allValuesOptional, addExport, dbName, }) {
|
||||
let typeDefinition = ``;
|
||||
let tdName = ``;
|
||||
try {
|
||||
const tdName = typeDefName
|
||||
tdName = typeDefName
|
||||
? typeDefName
|
||||
: dbName
|
||||
? `DSQL_${dbName}_${table.tableName}`.toUpperCase()
|
||||
@@ -67,5 +68,5 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues
|
||||
console.log(error.message);
|
||||
typeDefinition = null;
|
||||
}
|
||||
return typeDefinition;
|
||||
return { typeDefinition, tdName };
|
||||
}
|
||||
|
||||
+21
@@ -19,6 +19,7 @@ const handle_table_foreign_key_1 = __importDefault(require("./handle-table-forei
|
||||
const handle_dsql_schema_fields_1 = __importDefault(require("./handle-dsql-schema-fields"));
|
||||
const handle_mariadb_existing_columns_1 = __importDefault(require("./handle-mariadb-existing-columns"));
|
||||
const update_table_init_1 = __importDefault(require("./update-table-init"));
|
||||
const debug_log_1 = __importDefault(require("../../utils/logging/debug-log"));
|
||||
/**
|
||||
* # Update table function
|
||||
*/
|
||||
@@ -41,6 +42,10 @@ function updateTable(_a) {
|
||||
* @description Try to undate table, catch error if anything goes wrong
|
||||
*/
|
||||
try {
|
||||
(0, debug_log_1.default)({
|
||||
log: `Handling Existing Columns ...`,
|
||||
addTime: true,
|
||||
});
|
||||
const { allExistingColumns, upToDateTableFieldsArray } = yield (0, handle_mariadb_existing_columns_1.default)({
|
||||
dbFullName,
|
||||
dbSchema,
|
||||
@@ -54,6 +59,10 @@ function updateTable(_a) {
|
||||
* @description Iterate through each field object and
|
||||
* perform operations
|
||||
*/
|
||||
(0, debug_log_1.default)({
|
||||
log: `Handling Schema Fields ...`,
|
||||
addTime: true,
|
||||
});
|
||||
yield (0, handle_dsql_schema_fields_1.default)({
|
||||
dbFullName,
|
||||
tableName,
|
||||
@@ -66,6 +75,10 @@ function updateTable(_a) {
|
||||
* @description Iterate through each datasquirel schema
|
||||
* table index(if available), and perform operations
|
||||
*/
|
||||
(0, debug_log_1.default)({
|
||||
log: `Handling Table Foreign Keys ...`,
|
||||
addTime: true,
|
||||
});
|
||||
yield (0, handle_table_foreign_key_1.default)({
|
||||
dbFullName,
|
||||
fields: upToDateTableFieldsArray,
|
||||
@@ -78,6 +91,10 @@ function updateTable(_a) {
|
||||
* @description Iterate through each datasquirel schema
|
||||
* table index(if available), and perform operations
|
||||
*/
|
||||
(0, debug_log_1.default)({
|
||||
log: `Handling Table Indexes ...`,
|
||||
addTime: true,
|
||||
});
|
||||
if (tableIndexes === null || tableIndexes === void 0 ? void 0 : tableIndexes[0]) {
|
||||
(0, handle_indexes_1.default)({
|
||||
dbFullName,
|
||||
@@ -91,6 +108,10 @@ function updateTable(_a) {
|
||||
* @description Iterate through each datasquirel schema
|
||||
* table unique constraint(if available), and perform operations
|
||||
*/
|
||||
(0, debug_log_1.default)({
|
||||
log: `Handling Unique Constraints ...`,
|
||||
addTime: true,
|
||||
});
|
||||
if (tableUniqueConstraints === null || tableUniqueConstraints === void 0 ? void 0 : tableUniqueConstraints[0]) {
|
||||
(0, handle_unique_constraints_1.default)({
|
||||
dbFullName,
|
||||
|
||||
Reference in New Issue
Block a user