Merge pull request #643 from k1LoW/viewpoint-support-schema

Support wildcard in `viewpoints[].tables:`
k1LoW · Jan 17, 2025 · 77e97f5 · 77e97f5
2 parents a0a4f93 + a6b2295
commit 77e97f5
Show file tree

Hide file tree

Showing 39 changed files with 682 additions and 17 deletions.
diff --git a/config/config.go b/config/config.go
@@ -512,16 +512,17 @@ func (c *Config) ModifySchema(s *schema.Schema) error {
 		// Add viewpoints to table
 
 		for _, t := range v.Tables {
-			println(v.Name, t)
-			table, err := s.FindTableByName(t)
+			ts, err := s.MatchTablesByName(t)
 			if err != nil {
 				return err
 			}
-			table.Viewpoints = append(table.Viewpoints, &schema.TableViewpoint{
-				Index: vi,
-				Name:  v.Name,
-				Desc:  v.Desc,
-			})
+			for _, tt := range ts {
+				tt.Viewpoints = append(tt.Viewpoints, &schema.TableViewpoint{
+					Index: vi,
+					Name:  v.Name,
+					Desc:  v.Desc,
+				})
+			}
 		}
 	}
 

diff --git a/drivers/postgres/postgres.go b/drivers/postgres/postgres.go
@@ -404,7 +404,8 @@ const queryFunctions95 = `SELECT
 FROM pg_proc AS p
 LEFT JOIN pg_namespace AS n ON p.pronamespace = n.oid
 LEFT JOIN pg_type AS t ON t.oid = p.prorettype
-WHERE n.nspname NOT IN ('pg_catalog', 'information_schema')`
+WHERE n.nspname NOT IN ('pg_catalog', 'information_schema')
+ORDER BY p.oid;`
 
 const queryFunctions = `SELECT
   n.nspname AS schema_name,
@@ -415,7 +416,8 @@ const queryFunctions = `SELECT
 FROM pg_proc AS p
 LEFT JOIN pg_namespace AS n ON p.pronamespace = n.oid
 LEFT JOIN pg_type AS t ON t.oid = p.prorettype
-WHERE n.nspname NOT IN ('pg_catalog', 'information_schema')`
+WHERE n.nspname NOT IN ('pg_catalog', 'information_schema')
+ORDER BY p.oid;`
 
 const queryStoredProcedureSupported = `SELECT column_name
 FROM information_schema.columns

diff --git a/sample/adjust/README.md b/sample/adjust/README.md
@@ -4,6 +4,13 @@
 
 Sample PostgreSQL database document.
 
+## Viewpoints
+
+| Name                            | Description               |
+| ------------------------------- | ------------------------- |
+| [post](viewpoint-0.md)          | for post                  |
+| [administrator](viewpoint-1.md) | administrator schema only |
+
 ## Tables
 
 | Name                                                      | Columns | Comment                                    | Type              |

diff --git a/sample/adjust/administrator.blogs.md b/sample/adjust/administrator.blogs.md
@@ -15,6 +15,12 @@ admin blogs
 | created     | timestamp without time zone |                                                 | false    |          |                                 |         |
 | updated     | timestamp without time zone |                                                 | true     |          |                                 |         |
 
+## Viewpoints
+
+| Name                            | Definition                |
+| ------------------------------- | ------------------------- |
+| [administrator](viewpoint-1.md) | administrator schema only |
+
 ## Constraints
 
 | Name             | Type        | Definition                                                   |

diff --git a/sample/adjust/public.post_comment_stars.md b/sample/adjust/public.post_comment_stars.md
@@ -39,6 +39,12 @@ CREATE MATERIALIZED VIEW post_comment_stars AS (
 | [public.comment_stars](public.comment_stars.md) | 6       |                                            | BASE TABLE |
 | [public.users](public.users.md)                 | 6       | Users table                                | BASE TABLE |
 
+## Viewpoints
+
+| Name                   | Definition |
+| ---------------------- | ---------- |
+| [post](viewpoint-0.md) | for post   |
+
 ## Relations
 
 ![er](public.post_comment_stars.svg)

diff --git a/sample/adjust/public.post_comments.md b/sample/adjust/public.post_comments.md
@@ -45,6 +45,12 @@ CREATE VIEW post_comments AS (
 | [public.comments](public.comments.md) | 7       | Comments<br>Multi-line<br>table<br>comment | BASE TABLE |
 | [public.users](public.users.md)       | 6       | Users table                                | BASE TABLE |
 
+## Viewpoints
+
+| Name                   | Definition |
+| ---------------------- | ---------- |
+| [post](viewpoint-0.md) | for post   |
+
 ## Relations
 
 ![er](public.post_comments.svg)

diff --git a/sample/adjust/public.posts.md b/sample/adjust/public.posts.md
@@ -17,6 +17,12 @@ Posts table
 | created   | timestamp without time zone |                                   | false    |                                                                     |                                 |                      |
 | updated   | timestamp without time zone |                                   | true     |                                                                     |                                 |                      |
 
+## Viewpoints
+
+| Name                   | Definition |
+| ---------------------- | ---------- |
+| [post](viewpoint-0.md) | for post   |
+
 ## Constraints
 
 | Name                    | Type        | Definition                                                                                                                                                              | Comment        |

diff --git a/sample/adjust/schema.json b/sample/adjust/schema.json
diff --git a/sample/adjust/viewpoint-0.md b/sample/adjust/viewpoint-0.md
@@ -0,0 +1,21 @@
+# post
+
+## Description
+
+for post
+
+## Tables
+
+| Name                                                      | Columns | Comment                      | Type              |
+| --------------------------------------------------------- | ------- | ---------------------------- | ----------------- |
+| [public.posts](public.posts.md)                           | 8       | Posts table                  | BASE TABLE        |
+| [public.post_comments](public.post_comments.md)           | 7       | post and comments View table | VIEW              |
+| [public.post_comment_stars](public.post_comment_stars.md) | 5       |                              | MATERIALIZED VIEW |
+
+## Relations
+
+![er](viewpoint-0.svg)
+
+---
+
+> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/sample/adjust/viewpoint-0.svg b/sample/adjust/viewpoint-0.svg
diff --git a/sample/adjust/viewpoint-1.md b/sample/adjust/viewpoint-1.md
@@ -0,0 +1,19 @@
+# administrator
+
+## Description
+
+administrator schema only
+
+## Tables
+
+| Name                                          | Columns | Comment     | Type       |
+| --------------------------------------------- | ------- | ----------- | ---------- |
+| [administrator.blogs](administrator.blogs.md) | 6       | admin blogs | BASE TABLE |
+
+## Relations
+
+![er](viewpoint-1.svg)
+
+---
+
+> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/sample/adjust/viewpoint-1.svg b/sample/adjust/viewpoint-1.svg
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/mariadb/schema.json b/sample/mariadb/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/postgres/README.md b/sample/postgres/README.md
@@ -4,6 +4,13 @@
 
 Sample PostgreSQL database document.
 
+## Viewpoints
+
+| Name | Description |
+| ---- | ----------- |
+| [post](viewpoint-0.md) | for post |
+| [administrator](viewpoint-1.md) | administrator schema only |
+
 ## Tables
 
 | Name | Columns | Comment | Type |

diff --git a/sample/postgres/administrator.blogs.md b/sample/postgres/administrator.blogs.md
@@ -15,6 +15,12 @@ admin blogs
 | created | timestamp without time zone |  | false |  |  |  |
 | updated | timestamp without time zone |  | true |  |  |  |
 
+## Viewpoints
+
+| Name | Definition |
+| ---- | ---------- |
+| [administrator](viewpoint-1.md) | administrator schema only |
+
 ## Constraints
 
 | Name | Type | Definition |

diff --git a/sample/postgres/public.post_comment_stars.md b/sample/postgres/public.post_comment_stars.md
@@ -39,6 +39,12 @@ CREATE MATERIALIZED VIEW post_comment_stars AS (
 | [public.comment_stars](public.comment_stars.md) | 6 |  | BASE TABLE |
 | [public.users](public.users.md) | 6 | Users table | BASE TABLE |
 
+## Viewpoints
+
+| Name | Definition |
+| ---- | ---------- |
+| [post](viewpoint-0.md) | for post |
+
 ## Relations
 
 ![er](public.post_comment_stars.svg)

diff --git a/sample/postgres/public.post_comments.md b/sample/postgres/public.post_comments.md
@@ -45,6 +45,12 @@ CREATE VIEW post_comments AS (
 | [public.comments](public.comments.md) | 7 | Comments<br>Multi-line<br>table<br>comment | BASE TABLE |
 | [public.users](public.users.md) | 6 | Users table | BASE TABLE |
 
+## Viewpoints
+
+| Name | Definition |
+| ---- | ---------- |
+| [post](viewpoint-0.md) | for post |
+
 ## Relations
 
 ![er](public.post_comments.svg)

diff --git a/sample/postgres/public.posts.md b/sample/postgres/public.posts.md
@@ -17,6 +17,12 @@ Posts table
 | created | timestamp without time zone |  | false |  |  |  |
 | updated | timestamp without time zone |  | true |  |  |  |
 
+## Viewpoints
+
+| Name | Definition |
+| ---- | ---------- |
+| [post](viewpoint-0.md) | for post |
+
 ## Constraints
 
 | Name | Type | Definition | Comment |

diff --git a/sample/postgres/schema.json b/sample/postgres/schema.json