titor/drawDB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update relationship naming convention(#331)

Browse Source
This commit is contained in:
1ilit 2025-01-20 17:54:04 +04:00
parent e6a36cd90b
commit 319f3f5cf3
7 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/EditorCanvas/Canvas.jsx
View File

@ -431,9 +431,9 @@ export default function Canvas() {
cardinality: Cardinality.ONE_TO_ONE, cardinality: Cardinality.ONE_TO_ONE,
updateConstraint: Constraint.NONE, updateConstraint: Constraint.NONE,
deleteConstraint: Constraint.NONE, deleteConstraint: Constraint.NONE,
name: `${tables[linkingLine.startTableId].name}_${ name: `fk_${tables[linkingLine.startTableId].name}_${
tables[linkingLine.startTableId].fields[linkingLine.startFieldId].name tables[linkingLine.startTableId].fields[linkingLine.startFieldId].name
}_fk`, }_${tables[hoveredTable.tableId].name}`,
id: relationships.length, id: relationships.length,
}; };
delete newRelationship.startX; delete newRelationship.startX;

6
src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx
View File

@ -61,9 +61,9 @@ export default function RelationshipInfo({ data }) {
idx === data.id idx === data.id
? { ? {
...e, ...e,
name: `${tables[e.startTableId].name}_${ name: `fk_${tables[e.endTableId].name}_${
tables[e.startTableId].fields[e.startFieldId].name tables[e.endTableId].fields[e.endFieldId].name
}_fk`, }_${tables[e.startTableId].name}`,
startTableId: e.endTableId, startTableId: e.endTableId,
startFieldId: e.endFieldId, startFieldId: e.endFieldId,
endTableId: e.startTableId, endTableId: e.startTableId,

9
src/utils/importSQL/mariadb.js
View File

@ -126,7 +126,8 @@ export function fromMariaDB(ast, diagramDb = DB.GENERIC) {
); );
if (startFieldId === -1) return; if (startFieldId === -1) return;
relationship.name = startTable + "_" + startField + "_fk"; relationship.name =
"fk_" + startTable + "_" + startField + "_" + endTable;
relationship.startTableId = startTableId; relationship.startTableId = startTableId;
relationship.endTableId = endTableId; relationship.endTableId = endTableId;
relationship.endFieldId = endFieldId; relationship.endFieldId = endFieldId;
@ -187,7 +188,8 @@ export function fromMariaDB(ast, diagramDb = DB.GENERIC) {
e.expr.forEach((expr) => { e.expr.forEach((expr) => {
if ( if (
expr.action === "add" && expr.action === "add" &&
expr.create_definitions.constraint_type.toLowerCase() === "foreign key" expr.create_definitions.constraint_type.toLowerCase() ===
"foreign key"
) { ) {
const relationship = {}; const relationship = {};
const startTable = e.table[0].table; const startTable = e.table[0].table;
@ -230,7 +232,8 @@ export function fromMariaDB(ast, diagramDb = DB.GENERIC) {
); );
if (startFieldId === -1) return; if (startFieldId === -1) return;
relationship.name = startTable + "_" + startField + "_fk"; relationship.name =
"fk_" + startTable + "_" + startField + "_" + endTable;
relationship.startTableId = startTableId; relationship.startTableId = startTableId;
relationship.startFieldId = startFieldId; relationship.startFieldId = startFieldId;
relationship.endTableId = endTableId; relationship.endTableId = endTableId;

6
src/utils/importSQL/mssql.js
View File

@ -138,7 +138,8 @@ export function fromMSSQL(ast, diagramDb = DB.GENERIC) {
); );
if (startFieldId === -1) return; if (startFieldId === -1) return;
relationship.name = startTable + "_" + startField + "_fk"; relationship.name =
"fk_" + startTable + "_" + startField + "_" + endTable;
relationship.startTableId = startTableId; relationship.startTableId = startTableId;
relationship.endTableId = endTableId; relationship.endTableId = endTableId;
relationship.endFieldId = endFieldId; relationship.endFieldId = endFieldId;
@ -243,7 +244,8 @@ export function fromMSSQL(ast, diagramDb = DB.GENERIC) {
); );
if (startFieldId === -1) return; if (startFieldId === -1) return;
relationship.name = startTable + "_" + startField + "_fk"; relationship.name =
"fk_" + startTable + "_" + startField + "_" + endTable;
relationship.startTableId = startTableId; relationship.startTableId = startTableId;
relationship.startFieldId = startFieldId; relationship.startFieldId = startFieldId;
relationship.endTableId = endTableId; relationship.endTableId = endTableId;

9
src/utils/importSQL/mysql.js
View File

@ -126,7 +126,8 @@ export function fromMySQL(ast, diagramDb = DB.GENERIC) {
); );
if (startFieldId === -1) return; if (startFieldId === -1) return;
relationship.name = startTable + "_" + startField + "_fk"; relationship.name =
"fk_" + startTable + "_" + startField + "_" + endTable;
relationship.startTableId = startTableId; relationship.startTableId = startTableId;
relationship.endTableId = endTableId; relationship.endTableId = endTableId;
relationship.endFieldId = endFieldId; relationship.endFieldId = endFieldId;
@ -187,7 +188,8 @@ export function fromMySQL(ast, diagramDb = DB.GENERIC) {
e.expr.forEach((expr) => { e.expr.forEach((expr) => {
if ( if (
expr.action === "add" && expr.action === "add" &&
expr.create_definitions.constraint_type.toLowerCase() === "foreign key" expr.create_definitions.constraint_type.toLowerCase() ===
"foreign key"
) { ) {
const relationship = {}; const relationship = {};
const startTable = e.table[0].table; const startTable = e.table[0].table;
@ -230,7 +232,8 @@ export function fromMySQL(ast, diagramDb = DB.GENERIC) {
); );
if (startFieldId === -1) return; if (startFieldId === -1) return;
relationship.name = startTable + "_" + startField + "_fk"; relationship.name =
"fk_" + startTable + "_" + startField + "_" + endTable;
relationship.startTableId = startTableId; relationship.startTableId = startTableId;
relationship.startFieldId = startFieldId; relationship.startFieldId = startFieldId;
relationship.endTableId = endTableId; relationship.endTableId = endTableId;

9
src/utils/importSQL/postgres.js
View File

@ -129,7 +129,8 @@ export function fromPostgres(ast, diagramDb = DB.GENERIC) {
); );
if (startFieldId === -1) return; if (startFieldId === -1) return;
relationship.name = startTable + "_" + startField + "_fk"; relationship.name =
"fk_" + startTable + "_" + startField + "_" + endTable;
relationship.startTableId = startTableId; relationship.startTableId = startTableId;
relationship.endTableId = endTableId; relationship.endTableId = endTableId;
relationship.endFieldId = endFieldId; relationship.endFieldId = endFieldId;
@ -199,7 +200,8 @@ export function fromPostgres(ast, diagramDb = DB.GENERIC) {
); );
if (startFieldId === -1) return; if (startFieldId === -1) return;
relationship.name = startTable + "_" + startField + "_fk"; relationship.name =
"fk_" + startTable + "_" + startField + "_" + endTable;
relationship.startTableId = startTableId; relationship.startTableId = startTableId;
relationship.startFieldId = startFieldId; relationship.startFieldId = startFieldId;
relationship.endTableId = endTableId; relationship.endTableId = endTableId;
@ -326,7 +328,8 @@ export function fromPostgres(ast, diagramDb = DB.GENERIC) {
); );
if (startFieldId === -1) return; if (startFieldId === -1) return;
relationship.name = startTable + "_" + startField + "_fk"; relationship.name =
"fk_" + startTable + "_" + startField + "_" + endTable;
relationship.startTableId = startTableId; relationship.startTableId = startTableId;
relationship.startFieldId = startFieldId; relationship.startFieldId = startFieldId;
relationship.endTableId = endTableId; relationship.endTableId = endTableId;

3
src/utils/importSQL/sqlite.js
View File

@ -62,7 +62,8 @@ export function fromSQLite(ast, diagramDb = DB.GENERIC) {
); );
if (startFieldId === -1) return; if (startFieldId === -1) return;
relationship.name = startTable.name + "_" + startFieldName + "_fk"; relationship.name =
"fk_" + startTable.name + "_" + startFieldName + "_" + endTableName;
relationship.startTableId = startTable.id; relationship.startTableId = startTable.id;
relationship.endTableId = endTableId; relationship.endTableId = endTableId;
relationship.endFieldId = endFieldId; relationship.endFieldId = endFieldId;