Skip to content

Database diagrams editor that allows you to visualize and design your DB with a single query.

fix conflicts

Guy Ben-Aharon95901688765f
diff --git a/src/context/storage-context/storage-provider.tsx b/src/context/storage-context/storage-provider.tsx
index eab51135..29ad1ef4 100644
--- a/src/context/storage-context/storage-provider.tsx
+++ b/src/context/storage-context/storage-provider.tsx
@@ -66,33 +66,28 @@ export const StorageProvider: React.FC<React.PropsWithChildren> = ({
}: {
diagram: Diagram;
}) => {
- // Extract tables and relationships from the diagram
- const { tables, relationships } = diagram;
+ const promises = [];
+ promises.push(
+ db.diagrams.add({
+ id: diagram.id,
+ name: diagram.name,
+ databaseType: diagram.databaseType,
+ })
+ );
- // Save the diagram without the tables and relationships
- const diagramId = await db.diagrams.add({
- id: diagram.id,
- name: diagram.name,
- databaseType: diagram.databaseType,
- });
+ const tables = diagram.tables ?? [];
+ promises.push(
+ ...tables.map((table) => addTable({ diagramId: diagram.id, table }))
+ );
- // Save each table associated with this diagram
- if (tables && tables.length > 0) {
- await Promise.all(
- tables.map(async (table) => {
- await addTable({ diagramId, table });
- })
- );
- }
+ const relationships = diagram.relationships ?? [];
+ promises.push(
+ ...relationships.map((relationship) =>
+ addRelationship({ diagramId: diagram.id, relationship })
+ )
+ );
- // Save each relationship associated with this diagram
- if (relationships && relationships.length > 0) {
- await Promise.all(
- relationships.map(async (relationship) => {
- await addRelationship({ diagramId, relationship });
- })
- );
- }
+ await Promise.all(promises);
};
const listDiagrams: StorageContext['listDiagrams'] = async (): Promise<
@@ -191,7 +186,7 @@ export const StorageProvider: React.FC<React.PropsWithChildren> = ({
return await db.db_tables
.where('diagramId')
.equals(diagramId)
- .sortBy('name'); // Sort by the 'name' field
+ .sortBy('name');
};
const addRelationship: StorageContext['addRelationship'] = async ({
diff --git a/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx b/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx
index 25a1ffd2..8e1f4825 100644
--- a/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx
+++ b/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx
@@ -20,7 +20,10 @@ import { loadFromDatabaseMetadata } from '@/lib/domain/diagram';
import { useCreateDiagramDialog } from '@/hooks/use-create-diagram-dialog';
import { useNavigate } from 'react-router-dom';
import { useConfig } from '@/hooks/use-config';
-import { DatabaseMetadata } from '@/lib/import-script-types/database-metadata';
+import {
+ DatabaseMetadata,
+ loadDatabaseMetadata,
+} from '@/lib/data/import-metadata/metadata-types/database-metadata';
enum CreateDiagramDialogStep {
SELECT_DATABASE = 'SELECT_DATABASE',
@@ -56,13 +59,14 @@ export const CreateDiagramDialog: React.FC<CreateDiagramDialogProps> = ({
}, [listDiagrams, setDiagramNumber]);
const createNewDiagram = useCallback(async () => {
- console.log('scriptResult: ', scriptResult);
- const databaseMetadata: DatabaseMetadata = JSON.parse(scriptResult);
- const diagram = loadFromDatabaseMetadata(
+ const databaseMetadata: DatabaseMetadata =
+ loadDatabaseMetadata(scriptResult);
+
+ const diagram = loadFromDatabaseMetadata({
databaseType,
- databaseMetadata
- );
- console.log('diagram: ', diagram);
+ databaseMetadata,
+ diagramNumber,
+ });
await addDiagram({ diagram });
await updateConfig({ defaultDiagramId: diagram.id });
@@ -75,6 +79,7 @@ export const CreateDiagramDialog: React.FC<CreateDiagramDialogProps> = ({
navigate,
updateConfig,
scriptResult,
+ diagramNumber,
]);
const renderDatabaseOption = useCallback((type: DatabaseType) => {
diff --git a/src/lib/data/db-queries/postgres-query.ts b/src/lib/data/db-queries/postgres-query.ts
deleted file mode 100644
index d9b8e63f..00000000
--- a/src/lib/data/db-queries/postgres-query.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import { minimizeQuery } from './minimize-query';
-
-const rawPostgresQuery = '';
-// const rawPostgresQuery = `
-// WITH fk_info AS (
-// select array_to_string(array_agg(CONCAT('{"schema":"', schema_name, '"',
-// ',"table":"', table_name, '"',
-// ',"column":"', fk_column, '"',
-// ',"foreign_key_name":"', foreign_key_name, '"',
-// ',"reference_table":"', reference_table, '"',
-// ',"reference_column":"', reference_column, '"',
-// ',"fk_def":"', fk_def,
-// '"}')), ',') as fk_metadata
-// from (
-// SELECT
-// 'public' as schema_name,
-// conname AS foreign_key_name,
-// conrelid::regclass AS table_name,
-// (regexp_matches(pg_get_constraintdef(oid), 'FOREIGN KEY \((\w+)\) REFERENCES (\w+)\((\w+)\)', 'g'))[1] AS fk_column,
-// (regexp_matches(pg_get_constraintdef(oid), 'FOREIGN KEY \((\w+)\) REFERENCES (\w+)\((\w+)\)', 'g'))[2] AS reference_table,
-// (regexp_matches(pg_get_constraintdef(oid), 'FOREIGN KEY \((\w+)\) REFERENCES (\w+)\((\w+)\)', 'g'))[3] AS reference_column,
-// pg_get_constraintdef(oid) as fk_def
-// FROM
-// pg_constraint
-// WHERE
-// contype = 'f'
-// AND connamespace = 'public'::regnamespace) as x
-// ), pk_info AS (
-// SELECT array_to_string(array_agg(CONCAT('{"schema":"', schema_name, '"',
-// ',"table":"', pk_table, '"',
-// ',"column":"', pk_column, '"',
-// ',"pk_def":"', pk_def,
-// '"}')), ',') as pk_metadata
-// FROM (
-// SELECT
-// 'public' as schema_name,
-// conrelid::regclass::text AS pk_table,
-// unnest(string_to_array(substring(pg_get_constraintdef(oid) FROM '\((.*?)\)'), ',')) AS pk_column,
-// pg_get_constraintdef(oid) as pk_def
-// FROM
-// pg_constraint
-// WHERE
-// contype = 'p'
-// AND connamespace = 'public'::regnamespace
-// ) as y
-// ),
-// indexes_cols as (
-// select tnsp.nspname as schema_name,
-// trel.relname as table_name,
-// pg_relation_size(tnsp.nspname || '.' || '"' || irel.relname || '"') as index_size,
-// irel.relname as index_name,
-// am.amname as index_type,
-// a.attname as col_name,
-// (case when i.indisunique = true then 'true' else 'false' end) as is_unique,
-// irel.reltuples as cardinality,
-// 1 + Array_position(i.indkey, a.attnum) as column_position,
-// case o.OPTION & 1 when 1 then 'DESC' else 'ASC' end as direction,
-// CASE WHEN indpred IS NOT NULL THEN 'true' ELSE 'false' END as is_partial_index
-// from pg_index as i
-// join pg_class as trel on trel.oid = i.indrelid
-// join pg_namespace as tnsp on trel.relnamespace = tnsp.oid
-// join pg_class as irel on irel.oid = i.indexrelid
-// join pg_am as am on irel.relam = am.oid
-// cross join lateral unnest (i.indkey)
-// with ordinality as c (colnum, ordinality) left join lateral unnest (i.indoption)
-// with ordinality as o (option, ordinality)
-// on c.ordinality = o.ordinality join pg_attribute as a on trel.oid = a.attrelid and a.attnum = c.colnum
-// where tnsp.nspname not like 'pg_%'
-// group by tnsp.nspname, trel.relname, irel.relname, am.amname, i.indisunique, i.indexrelid, irel.reltuples, a.attname, array_position(i.indkey, a.attnum), o.OPTION, i.indpred
-// ),
-// cols as (
-// select array_to_string(array_agg(CONCAT('{"schema":"', cols.table_schema,
-// '","table":"', cols.table_name,
-// '","name":"', cols.column_name,
-// '","type":"', LOWER(replace(cols.data_type, '"', '')),
-// '","ordinal_position":"', cols.ordinal_position,
-// '","nullable":', case when (cols.IS_NULLABLE = 'YES') then 'true' else 'false' end,
-// ',"collation":"', coalesce(cols.COLLATION_NAME, ''), '"}')), ',') as cols_metadata
-// from information_schema.columns cols
-// where cols.table_schema not in ('information_schema', 'pg_catalog')
-// ), indexes_metadata as (
-// select array_to_string(array_agg(CONCAT('{"schema":"', schema_name,
-// '","table":"', table_name,
-// '","name":"', index_name,
-// '","column":"', replace(col_name :: text, '"', E'"'),
-// '","index_type":"', index_type,
-// '","cardinality":', cardinality,
-// ',"size":', index_size,
-// ',"unique":', is_unique,
-// ',"is_partial_index":', is_partial_index,
-// ',"direction":"', lower(direction),
-// '"}')), ',') as indexes_metadata
-// from indexes_cols x
-// ), tbls as (
-// select array_to_string(array_agg(CONCAT('{', '"schema":"', TABLE_SCHEMA, '",', '"table":"', TABLE_NAME, '",', '"rows":',
-// coalesce((select s.n_live_tup
-// from pg_stat_user_tables s
-// where tbls.TABLE_SCHEMA = s.schemaname and tbls.TABLE_NAME = s.relname),
-// 0), ', "type":"', TABLE_TYPE, '",', '"engine":"",', '"collation":""}')),
-// ',') as tbls_metadata
-// from information_schema.tables tbls
-// where tbls.TABLE_SCHEMA not in ('information_schema', 'pg_catalog')
-// ), config as (
-// select array_to_string(
-// array_agg(CONCAT('{"name":"', conf.name, '","value":"', replace(conf.setting, '"', E'"'), '"}')),
-// ',') as config_metadata
-// from pg_settings conf
-// ), views as
-// (
-// select array_to_string(array_agg(CONCAT('{"schema":"', views.schemaname, '","view_name":"', viewname, '"}')),
-// ',') as views_metadata
-// from pg_views views
-// where views.schemaname not in ('information_schema', 'pg_catalog')
-// )
-// select CONCAT('{ "fk_info": [', coalesce(fk_metadata, ''),
-// '], "pk_info": [', COALESCE(pk_metadata, ''),
-// '], "columns": [', coalesce(cols_metadata, ''),
-// '], "indexes": [', coalesce(indexes_metadata, ''),
-// '], "tables":[', coalesce(tbls_metadata, ''),
-// '], "views":[', coalesce(views_metadata, ''),
-// '], "server_name": "', '', '", "version": "', '',
-// '"}') as " "
-// from fk_info, pk_info, cols, indexes_metadata, tbls, config, views;
-// `;
-export const postgresQuery = minimizeQuery(rawPostgresQuery);
diff --git a/src/lib/import-script-types/column-info.ts b/src/lib/data/import-metadata/metadata-types/column-info.ts
similarity index 100%
rename from src/lib/import-script-types/column-info.ts
rename to src/lib/data/import-metadata/metadata-types/column-info.ts
diff --git a/src/lib/import-script-types/database-metadata.ts b/src/lib/data/import-metadata/metadata-types/database-metadata.ts
similarity index 100%
rename from src/lib/import-script-types/database-metadata.ts
rename to src/lib/data/import-metadata/metadata-types/database-metadata.ts
diff --git a/src/lib/import-script-types/foreign-key-info.ts b/src/lib/data/import-metadata/metadata-types/foreign-key-info.ts
similarity index 100%
rename from src/lib/import-script-types/foreign-key-info.ts
rename to src/lib/data/import-metadata/metadata-types/foreign-key-info.ts
diff --git a/src/lib/import-script-types/index-info.ts b/src/lib/data/import-metadata/metadata-types/index-info.ts
similarity index 100%
rename from src/lib/import-script-types/index-info.ts
rename to src/lib/data/import-metadata/metadata-types/index-info.ts
diff --git a/src/lib/import-script-types/primary-key-info.ts b/src/lib/data/import-metadata/metadata-types/primary-key-info.ts
similarity index 100%
rename from src/lib/import-script-types/primary-key-info.ts
rename to src/lib/data/import-metadata/metadata-types/primary-key-info.ts
diff --git a/src/lib/import-script-types/table-info.ts b/src/lib/data/import-metadata/metadata-types/table-info.ts
similarity index 100%
rename from src/lib/import-script-types/table-info.ts
rename to src/lib/data/import-metadata/metadata-types/table-info.ts
diff --git a/src/lib/import-script-types/view-info.ts b/src/lib/data/import-metadata/metadata-types/view-info.ts
similarity index 100%
rename from src/lib/import-script-types/view-info.ts
rename to src/lib/data/import-metadata/metadata-types/view-info.ts
diff --git a/src/lib/data/db-queries/minimize-query.ts b/src/lib/data/import-metadata/scripts/minimize-script.ts
similarity index 100%
rename from src/lib/data/db-queries/minimize-query.ts
rename to src/lib/data/import-metadata/scripts/minimize-script.ts
diff --git a/src/lib/data/import-metadata/scripts/postgres-script.ts b/src/lib/data/import-metadata/scripts/postgres-script.ts
new file mode 100644
index 00000000..664b4d3b
--- /dev/null
+++ b/src/lib/data/import-metadata/scripts/postgres-script.ts
@@ -0,0 +1,124 @@
+import { minimizeQuery } from './minimize-script';
+
+const rawPostgresQuery = `
+WITH fk_info AS (
+ select array_to_string(array_agg(CONCAT('{"schema":"', schema_name, '"',
+ ',"table":"', table_name, '"',
+ ',"column":"', fk_column, '"',
+ ',"foreign_key_name":"', foreign_key_name, '"',
+ ',"reference_table":"', reference_table, '"',
+ ',"reference_column":"', reference_column, '"',
+ ',"fk_def":"', fk_def,
+ '"}')), ',') as fk_metadata
+ from (
+ SELECT
+ 'public' as schema_name,
+ conname AS foreign_key_name,
+ conrelid::regclass AS table_name,
+ (regexp_matches(pg_get_constraintdef(oid), 'FOREIGN KEY \\((\\w+)\\) REFERENCES (\\w+)\\((\\w+)\\)', 'g'))[1] AS fk_column,
+ (regexp_matches(pg_get_constraintdef(oid), 'FOREIGN KEY \\((\\w+)\\) REFERENCES (\\w+)\\((\\w+)\\)', 'g'))[2] AS reference_table,
+ (regexp_matches(pg_get_constraintdef(oid), 'FOREIGN KEY \\((\\w+)\\) REFERENCES (\\w+)\\((\\w+)\\)', 'g'))[3] AS reference_column,
+ pg_get_constraintdef(oid) as fk_def
+ FROM
+ pg_constraint
+ WHERE
+ contype = 'f'
+ AND connamespace = 'public'::regnamespace) as x
+), pk_info AS (
+ SELECT array_to_string(array_agg(CONCAT('{"schema":"', schema_name, '"',
+ ',"table":"', pk_table, '"',
+ ',"column":"', pk_column, '"',
+ ',"pk_def":"', pk_def,
+ '"}')), ',') as pk_metadata
+ FROM (
+ SELECT
+ 'public' as schema_name,
+ conrelid::regclass::text AS pk_table,
+ unnest(string_to_array(substring(pg_get_constraintdef(oid) FROM '\\((.*?)\\)'), ',')) AS pk_column,
+ pg_get_constraintdef(oid) as pk_def
+ FROM
+ pg_constraint
+ WHERE
+ contype = 'p'
+ AND connamespace = 'public'::regnamespace
+ ) as y
+),
+indexes_cols as (
+ select tnsp.nspname as schema_name,
+ trel.relname as table_name,
+ pg_relation_size(tnsp.nspname || '.' || '"' || irel.relname || '"') as index_size,
+ irel.relname as index_name,
+ am.amname as index_type,
+ a.attname as col_name,
+ (case when i.indisunique = true then 'true' else 'false' end) as is_unique,
+ irel.reltuples as cardinality,
+ 1 + Array_position(i.indkey, a.attnum) as column_position,
+ case o.OPTION & 1 when 1 then 'DESC' else 'ASC' end as direction,
+ CASE WHEN indpred IS NOT NULL THEN 'true' ELSE 'false' END as is_partial_index
+ from pg_index as i
+ join pg_class as trel on trel.oid = i.indrelid
+ join pg_namespace as tnsp on trel.relnamespace = tnsp.oid
+ join pg_class as irel on irel.oid = i.indexrelid
+ join pg_am as am on irel.relam = am.oid
+ cross join lateral unnest (i.indkey)
+ with ordinality as c (colnum, ordinality) left join lateral unnest (i.indoption)
+ with ordinality as o (option, ordinality)
+ on c.ordinality = o.ordinality join pg_attribute as a on trel.oid = a.attrelid and a.attnum = c.colnum
+ where tnsp.nspname not like 'pg_%'
+ group by tnsp.nspname, trel.relname, irel.relname, am.amname, i.indisunique, i.indexrelid, irel.reltuples, a.attname, array_position(i.indkey, a.attnum), o.OPTION, i.indpred
+),
+cols as (
+ select array_to_string(array_agg(CONCAT('{"schema":"', cols.table_schema,
+ '","table":"', cols.table_name,
+ '","name":"', cols.column_name,
+ '","type":"', LOWER(replace(cols.data_type, '"', '')),
+ '","ordinal_position":"', cols.ordinal_position,
+ '","nullable":', case when (cols.IS_NULLABLE = 'YES') then 'true' else 'false' end,
+ ',"collation":"', coalesce(cols.COLLATION_NAME, ''), '"}')), ',') as cols_metadata
+ from information_schema.columns cols
+ where cols.table_schema not in ('information_schema', 'pg_catalog')
+), indexes_metadata as (
+ select array_to_string(array_agg(CONCAT('{"schema":"', schema_name,
+ '","table":"', table_name,
+ '","name":"', index_name,
+ '","column":"', replace(col_name :: text, '"', E'"'),
+ '","index_type":"', index_type,
+ '","cardinality":', cardinality,
+ ',"size":', index_size,
+ ',"unique":', is_unique,
+ ',"is_partial_index":', is_partial_index,
+ ',"direction":"', lower(direction),
+ '"}')), ',') as indexes_metadata
+ from indexes_cols x
+), tbls as (
+ select array_to_string(array_agg(CONCAT('{', '"schema":"', TABLE_SCHEMA, '",', '"table":"', TABLE_NAME, '",', '"rows":',
+ coalesce((select s.n_live_tup
+ from pg_stat_user_tables s
+ where tbls.TABLE_SCHEMA = s.schemaname and tbls.TABLE_NAME = s.relname),
+ 0), ', "type":"', TABLE_TYPE, '",', '"engine":"",', '"collation":""}')),
+ ',') as tbls_metadata
+ from information_schema.tables tbls
+ where tbls.TABLE_SCHEMA not in ('information_schema', 'pg_catalog')
+), config as (
+ select array_to_string(
+ array_agg(CONCAT('{"name":"', conf.name, '","value":"', replace(conf.setting, '"', E'"'), '"}')),
+ ',') as config_metadata
+ from pg_settings conf
+), views as
+(
+ select array_to_string(array_agg(CONCAT('{"schema":"', views.schemaname, '","view_name":"', viewname, '"}')),
+ ',') as views_metadata
+ from pg_views views
+ where views.schemaname not in ('information_schema', 'pg_catalog')
+)
+select CONCAT('{ "fk_info": [', coalesce(fk_metadata, ''),
+ '], "pk_info": [', COALESCE(pk_metadata, ''),
+ '], "columns": [', coalesce(cols_metadata, ''),
+ '], "indexes": [', coalesce(indexes_metadata, ''),
+ '], "tables":[', coalesce(tbls_metadata, ''),
+ '], "views":[', coalesce(views_metadata, ''),
+ '], "server_name": "', '', '", "version": "', '',
+ '"}') as " "
+from fk_info, pk_info, cols, indexes_metadata, tbls, config, views;
+`;
+export const postgresQuery = minimizeQuery(rawPostgresQuery);
diff --git a/src/lib/domain/db-relationship.ts b/src/lib/domain/db-relationship.ts
index 4464e578..a9643056 100644
--- a/src/lib/domain/db-relationship.ts
+++ b/src/lib/domain/db-relationship.ts
@@ -1,4 +1,4 @@
-import { ForeignKeyInfo } from '../import-script-types/foreign-key-info';
+import { ForeignKeyInfo } from '../data/import-metadata/metadata-types/foreign-key-info';
import { DBTable } from './db-table';
import { generateId } from '@/lib/utils';
@@ -15,11 +15,14 @@ export interface DBRelationship {
export type RelationshipType = 'one_to_one' | 'one_to_many' | 'many_to_one';
-export const createRelationships = (
- fkInfo: ForeignKeyInfo[],
- tables: DBTable[]
-): DBRelationship[] => {
- return fkInfo
+export const createRelationshipsFromMetadata = ({
+ foreignKeys,
+ tables,
+}: {
+ foreignKeys: ForeignKeyInfo[];
+ tables: DBTable[];
+}): DBRelationship[] => {
+ return foreignKeys
.map((fk: ForeignKeyInfo) => {
const sourceTable = tables.find((table) => table.name === fk.table);
const targetTable = tables.find(
diff --git a/src/lib/domain/db-table.ts b/src/lib/domain/db-table.ts
index 9a1f0d1c..e6a11cac 100644
--- a/src/lib/domain/db-table.ts
+++ b/src/lib/domain/db-table.ts
@@ -1,11 +1,11 @@
import { DBIndex } from './db-index';
-import { DBField } from './db-field';
-import { TableInfo } from '../import-script-types/table-info';
-import { ColumnInfo } from '../import-script-types/column-info';
-import { IndexInfo } from '../import-script-types/index-info';
+import { DBField, FieldType } from './db-field';
+import { TableInfo } from '../data/import-metadata/metadata-types/table-info';
+import { ColumnInfo } from '../data/import-metadata/metadata-types/column-info';
+import { IndexInfo } from '../data/import-metadata/metadata-types/index-info';
import { generateId, randomHSLA } from '@/lib/utils';
import { DBRelationship } from './db-relationship';
-import { PrimaryKeyInfo } from '../import-script-types/primary-key-info';
+import { PrimaryKeyInfo } from '../data/import-metadata/metadata-types/primary-key-info';
export interface DBTable {
id: string;
@@ -18,12 +18,17 @@ export interface DBTable {
createdAt: number;
}
-export const createTables = (
- tableInfos: TableInfo[],
- columns: ColumnInfo[],
- indexes: IndexInfo[],
- primaryKeys: PrimaryKeyInfo[]
-): DBTable[] => {
+export const createTablesFromMetadata = ({
+ tableInfos,
+ columns,
+ indexes,
+ primaryKeys,
+}: {
+ tableInfos: TableInfo[];
+ columns: ColumnInfo[];
+ indexes: IndexInfo[];
+ primaryKeys: PrimaryKeyInfo[];
+}): DBTable[] => {
return tableInfos.map((tableInfo: TableInfo) => {
// Filter, make unique, and sort columns based on ordinal_position
const uniqueColumns = new Map<string, ColumnInfo>();
@@ -49,27 +54,33 @@ export const createTables = (
(idx) => idx.table === tableInfo.table
);
- const fields: DBField[] = sortedColumns.map((col: ColumnInfo) => ({
- id: generateId(),
- name: col.name,
- type: col.type as any,
- primaryKey: tablePrimaryKeys.some((pk) => pk.column === col.name),
- unique: tableIndexes.some(
- (idx) => idx.column === col.name && idx.unique
- ),
- nullable: col.nullable,
- createdAt: Date.now(),
- }));
+ const fields: DBField[] = sortedColumns.map(
+ (col: ColumnInfo): DBField => ({
+ id: generateId(),
+ name: col.name,
+ type: col.type as FieldType,
+ primaryKey: tablePrimaryKeys.some(
+ (pk) => pk.column === col.name
+ ),
+ unique: tableIndexes.some(
+ (idx) => idx.column === col.name && idx.unique
+ ),
+ nullable: col.nullable,
+ createdAt: Date.now(),
+ })
+ );
- const dbIndexes: DBIndex[] = tableIndexes.map((idx: IndexInfo) => ({
- id: generateId(),
- name: idx.name,
- unique: idx.unique,
- fieldIds: fields
- .filter((field) => field.name === idx.column)
- .map((field) => field.id),
- createdAt: Date.now(),
- }));
+ const dbIndexes: DBIndex[] = tableIndexes.map(
+ (idx: IndexInfo): DBIndex => ({
+ id: generateId(),
+ name: idx.name,
+ unique: idx.unique,
+ fieldIds: fields
+ .filter((field) => field.name === idx.column)
+ .map((field) => field.id),
+ createdAt: Date.now(),
+ })
+ );
// Initial random positions; these will be adjusted later
return {
@@ -85,10 +96,13 @@ export const createTables = (
});
};
-export const adjustTablePositions = (
- tables: DBTable[],
- relationships: DBRelationship[]
-): DBTable[] => {
+export const adjustTablePositions = ({
+ relationships,
+ tables,
+}: {
+ tables: DBTable[];
+ relationships: DBRelationship[];
+}): DBTable[] => {
const tableWidth = 200;
const tableHeight = 300; // Approximate height of each table, adjust as needed
const gapX = 55;
diff --git a/src/lib/domain/diagram.ts b/src/lib/domain/diagram.ts
index b8e21395..735629d5 100644
--- a/src/lib/domain/diagram.ts
+++ b/src/lib/domain/diagram.ts
@@ -1,7 +1,14 @@
-import { DatabaseMetadata } from '../import-script-types/database-metadata';
+import { DatabaseMetadata } from '../data/import-metadata/metadata-types/database-metadata';
import { DatabaseType } from './database-type';
-import { DBRelationship, createRelationships } from './db-relationship';
-import { DBTable, adjustTablePositions, createTables } from './db-table';
+import {
+ DBRelationship,
+ createRelationshipsFromMetadata,
+} from './db-relationship';
+import {
+ DBTable,
+ adjustTablePositions,
+ createTablesFromMetadata,
+} from './db-table';
import { generateId } from '@/lib/utils';
export interface Diagram {
id: string;
@@ -11,26 +18,39 @@ export interface Diagram {
relationships?: DBRelationship[];
}
-export const loadFromDatabaseMetadata = (
- databaseType: DatabaseType,
- dm: DatabaseMetadata
-): Diagram => {
+export const loadFromDatabaseMetadata = ({
+ databaseType,
+ databaseMetadata,
+ diagramNumber,
+}: {
+ databaseType: DatabaseType;
+ databaseMetadata: DatabaseMetadata;
+ diagramNumber: number;
+}): Diagram => {
const {
- fk_info: foreignKeys,
- pk_info: PrimaryKeyInfo,
tables: tableInfos,
+ pk_info: primaryKeys,
columns,
indexes,
- } = dm;
+ fk_info: foreignKeys,
+ } = databaseMetadata;
// First pass: Create tables without final positions
- const tables = createTables(tableInfos, columns, indexes, PrimaryKeyInfo);
+ const tables = createTablesFromMetadata({
+ tableInfos,
+ columns,
+ indexes,
+ primaryKeys,
+ });
// First pass: Create relationships
- const relationships = createRelationships(foreignKeys, tables);
+ const relationships = createRelationshipsFromMetadata({
+ foreignKeys,
+ tables,
+ });
// Second pass: Adjust table positions based on relationships
- const adjustedTables = adjustTablePositions(tables, relationships);
+ const adjustedTables = adjustTablePositions({ tables, relationships });
const sortedTables = adjustedTables.sort((a, b) =>
a.name.localeCompare(b.name)
@@ -38,8 +58,8 @@ export const loadFromDatabaseMetadata = (
return {
id: generateId(),
- name: dm.server_name || 'Unnamed Diagram',
- databaseType: databaseType || DatabaseType.GENERIC,
+ name: databaseMetadata.server_name || `Diagram ${diagramNumber}`,
+ databaseType: databaseType ?? DatabaseType.GENERIC,
tables: sortedTables,
relationships,
};