Merge pull request #538 from k1LoW/fix-cardinality

Fix handling cardinality
k1LoW · Nov 7, 2023 · f6f5b62 · f6f5b62
2 parents 4bcd621 + 94a6a55
commit f6f5b62
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 28 deletions.
diff --git a/config/config.go b/config/config.go
@@ -407,9 +407,6 @@ func (c *Config) ModifySchema(s *schema.Schema) error {
 	for _, l := range c.Labels {
 		s.Labels = s.Labels.Merge(l)
 	}
-	if err := detectCardinality(s); err != nil {
-		return err
-	}
 	if err := detectPKFK(s); err != nil {
 		return err
 	}
@@ -657,15 +654,24 @@ func (c *Config) detectShowColumnsForER(s *schema.Schema) error {
 
 func mergeAdditionalRelations(s *schema.Schema, relations []AdditionalRelation) error {
 	for _, r := range relations {
+		c, err := schema.ToCardinality(r.Cardinality)
+		if err != nil {
+			return errors.Wrap(err, "failed to add relation")
+		}
+		pc, err := schema.ToCardinality(r.ParentCardinality)
+		if err != nil {
+			return errors.Wrap(err, "failed to add relation")
+		}
 		relation := &schema.Relation{
-			Virtual: true,
+			Cardinality:       c,
+			ParentCardinality: pc,
+			Virtual:           true,
 		}
 		if r.Def != "" {
 			relation.Def = r.Def
 		} else {
 			relation.Def = "Additional Relation"
 		}
-		var err error
 		relation.Table, err = s.FindTableByName(r.Table)
 		if err != nil {
 			return errors.Wrap(err, "failed to add relation")
@@ -822,8 +828,9 @@ func matchLength(s []string, e string) (int, bool) {
 	return 0, false
 }
 
+// detectCardinality detects the cardinality of the relations
+// This function should be applied to the completed schema
 func detectCardinality(s *schema.Schema) error {
-	// This function should be applied to the completed schema
 	for _, r := range s.Relations {
 		// child
 		if r.Cardinality == schema.UnknownCardinality {

diff --git a/sample/adjust/schema.json b/sample/adjust/schema.json
diff --git a/sample/detect_relations/schema.json b/sample/detect_relations/schema.json
diff --git a/sample/detect_relations_singular/schema.json b/sample/detect_relations_singular/schema.json
diff --git a/sample/dict/schema.json b/sample/dict/schema.json
diff --git a/sample/exclude/schema.json b/sample/exclude/schema.json
diff --git a/sample/font/schema.json b/sample/font/schema.json
diff --git a/sample/hide/schema.json b/sample/hide/schema.json
diff --git a/sample/hide_not_related_column/schema.json b/sample/hide_not_related_column/schema.json
diff --git a/sample/mariadb/schema.json b/sample/mariadb/schema.json
diff --git a/sample/mermaid/README.md b/sample/mermaid/README.md
@@ -44,7 +44,7 @@ erDiagram
 "logs" }o--|| "users" : "logs->users"
 "logs" }o--o| "posts" : "Additional Relation"
 "logs" }o--o| "comments" : "Additional Relation"
-"logs" }o--o| "comment_stars" : "Additional Relation"
+"logs" ||--|| "comment_stars" : "Additional Relation"
 
 "CamelizeTable" {
   bigint id PK

diff --git a/sample/mermaid/comment_stars.md b/sample/mermaid/comment_stars.md
@@ -58,7 +58,7 @@ CREATE TABLE `comment_stars` (
 ```mermaid
 erDiagram
 
-"logs" }o--o| "comment_stars" : "Additional Relation"
+"logs" ||--|| "comment_stars" : "Additional Relation"
 "comment_stars" }o--|| "comments" : "FOREIGN KEY (comment_post_id, comment_user_id) REFERENCES comments (post_id, user_id)"
 "comment_stars" }o--|| "users" : "FOREIGN KEY (comment_user_id) REFERENCES users (id)"
 

diff --git a/sample/mermaid/logs.md b/sample/mermaid/logs.md
@@ -54,7 +54,7 @@ erDiagram
 "logs" }o--|| "users" : "logs->users"
 "logs" }o--o| "posts" : "Additional Relation"
 "logs" }o--o| "comments" : "Additional Relation"
-"logs" }o--o| "comment_stars" : "Additional Relation"
+"logs" ||--|| "comment_stars" : "Additional Relation"
 
 "logs" {
   bigint id PK

diff --git a/sample/mermaid/schema.json b/sample/mermaid/schema.json
diff --git a/sample/mssql/schema.json b/sample/mssql/schema.json
diff --git a/sample/mysql/schema.json b/sample/mysql/schema.json
diff --git a/sample/mysql56/schema.json b/sample/mysql56/schema.json
diff --git a/sample/number/schema.json b/sample/number/schema.json
diff --git a/sample/png/schema.json b/sample/png/schema.json
diff --git a/sample/postgres/schema.json b/sample/postgres/schema.json
diff --git a/sample/postgres95/schema.json b/sample/postgres95/schema.json
diff --git a/sample/sqlite/schema.json b/sample/sqlite/schema.json
diff --git a/sample/viewpoints/schema.json b/sample/viewpoints/schema.json
diff --git a/testdata/test_tbls.yml b/testdata/test_tbls.yml
@@ -43,6 +43,8 @@ relations:
     parentTable: comment_stars
     parentColumns:
       - id
+    cardinality: exactly one
+    parentCardinality: exactly one
 comments:
   -
     table: posts