diff --git a/dist/package-shared/functions/dsql/generate-type-definitions.js b/dist/package-shared/functions/dsql/generate-type-definitions.js index d528825..cd3a108 100644 --- a/dist/package-shared/functions/dsql/generate-type-definitions.js +++ b/dist/package-shared/functions/dsql/generate-type-definitions.js @@ -27,14 +27,14 @@ function generateTypeDefinition({ paradigm, table, query, typeDefName, allValues }) .join(" | "); } - if ((_a = schemaType.dataType) === null || _a === void 0 ? void 0 : _a.match(/int/i)) { + if ((_a = schemaType.dataType) === null || _a === void 0 ? void 0 : _a.match(/int|double|decimal/i)) { return "number"; } if ((_b = schemaType.dataType) === null || _b === void 0 ? void 0 : _b.match(/text|varchar|timestamp/i)) { return "string"; } if ((_c = schemaType.dataType) === null || _c === void 0 ? void 0 : _c.match(/boolean/i)) { - return "boolean"; + return "0 | 1"; } return "string"; } diff --git a/dist/package-shared/shell/utils/create-table-handle-table-record.js b/dist/package-shared/shell/utils/create-table-handle-table-record.js index fdb5940..3b48cd4 100644 --- a/dist/package-shared/shell/utils/create-table-handle-table-record.js +++ b/dist/package-shared/shell/utils/create-table-handle-table-record.js @@ -89,8 +89,12 @@ function default_1(_a) { tableId = newTableEntryRes.postInsertReturn.insertId; } } - if (newTableSchema.tableNameOld) { - } + // if (newTableSchema.tableNameOld) { + // const renameTable = await dbHandler({ + // query: `RENAME TABLE \`${targetDatabase}\`.\`${newTableSchema.tableNameOld}\` TO \`${targetDatabase}\`.\`${newTableSchema.tableName}\``, + // noErrorLogs: true, + // }); + // } return tableId; } catch (error) { diff --git a/package-shared/functions/dsql/generate-type-definitions.ts b/package-shared/functions/dsql/generate-type-definitions.ts index 6f3fa83..9e46575 100644 --- a/package-shared/functions/dsql/generate-type-definitions.ts +++ b/package-shared/functions/dsql/generate-type-definitions.ts @@ -42,7 +42,8 @@ export default function generateTypeDefinition({ ) .join(" | "); } - if (schemaType.dataType?.match(/int/i)) { + + if (schemaType.dataType?.match(/int|double|decimal/i)) { return "number"; } @@ -51,7 +52,7 @@ export default function generateTypeDefinition({ } if (schemaType.dataType?.match(/boolean/i)) { - return "boolean"; + return "0 | 1"; } return "string"; diff --git a/package-shared/shell/createDbFromSchema/index.ts b/package-shared/shell/createDbFromSchema/index.ts index 1a7f740..53deef7 100644 --- a/package-shared/shell/createDbFromSchema/index.ts +++ b/package-shared/shell/createDbFromSchema/index.ts @@ -113,6 +113,7 @@ export default async function createDbFromSchema({ console.log( `Dropping Table ${TABLE_NAME} from ${dbFullName}` ); + await dbHandler({ query: `DROP TABLE \`${dbFullName}\`.\`${TABLE_NAME}\``, }); diff --git a/package-shared/shell/utils/create-table-handle-table-record.ts b/package-shared/shell/utils/create-table-handle-table-record.ts index c061d8f..a01eebf 100644 --- a/package-shared/shell/utils/create-table-handle-table-record.ts +++ b/package-shared/shell/utils/create-table-handle-table-record.ts @@ -102,8 +102,12 @@ export default async function ({ } } - if (newTableSchema.tableNameOld) { - } + // if (newTableSchema.tableNameOld) { + // const renameTable = await dbHandler({ + // query: `RENAME TABLE \`${targetDatabase}\`.\`${newTableSchema.tableNameOld}\` TO \`${targetDatabase}\`.\`${newTableSchema.tableName}\``, + // noErrorLogs: true, + // }); + // } return tableId; } catch (error) { diff --git a/package.json b/package.json index 9a527f8..d12c2ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.7.26", + "version": "5.7.27", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {