Fix bugs, improve schema gen
This commit is contained in:
Vendored
+6
-6
@@ -1,5 +1,4 @@
|
||||
import buildColumnDefinition from "./build-column-definition";
|
||||
import buildForeignKeyConstraint from "./build-foreign-key-constraint";
|
||||
import buildTableOptions from "./build-table-options";
|
||||
import MariaDBQuoteGen from "./mariadb-quote-gen";
|
||||
import runSchemaQuery from "./run-schema-query";
|
||||
@@ -8,16 +7,12 @@ export default async function createTable({ table, config, }) {
|
||||
console.log(`Creating table: ${table.tableName}`);
|
||||
}
|
||||
const columnDefinitions = [];
|
||||
const foreignKeys = [];
|
||||
const primaryKeys = [];
|
||||
for (const field of table.fields || []) {
|
||||
columnDefinitions.push(buildColumnDefinition(field));
|
||||
if (field.primaryKey && field.fieldName) {
|
||||
primaryKeys.push(field.fieldName);
|
||||
}
|
||||
if (field.foreignKey) {
|
||||
foreignKeys.push(buildForeignKeyConstraint(field, table.tableName));
|
||||
}
|
||||
}
|
||||
if (primaryKeys.length > 0) {
|
||||
const pkCols = primaryKeys.map((k) => MariaDBQuoteGen(k)).join(", ");
|
||||
@@ -36,6 +31,11 @@ export default async function createTable({ table, config, }) {
|
||||
columnDefinitions.push(`CONSTRAINT ${MariaDBQuoteGen(constraintName)} UNIQUE (${fields})`);
|
||||
}
|
||||
}
|
||||
const sql = `CREATE TABLE IF NOT EXISTS ${MariaDBQuoteGen(table.tableName)} (${[...columnDefinitions, ...foreignKeys].join(", ")})${buildTableOptions(table)}`;
|
||||
/**
|
||||
* Foreign keys are not declared inline. `handleDBSchemaTables` adds them
|
||||
* with `ensureForeignKeys` once every table exists, so forward references,
|
||||
* self references and FK cycles all work regardless of table order.
|
||||
*/
|
||||
const sql = `CREATE TABLE IF NOT EXISTS ${MariaDBQuoteGen(table.tableName)} (${columnDefinitions.join(", ")})${buildTableOptions(table)}`;
|
||||
await runSchemaQuery({ query: sql, config });
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user