-
Notifications
You must be signed in to change notification settings - Fork 170
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat:refer viewpoints from tables #532
Merged
k1LoW
merged 8 commits into
k1LoW:main
from
majimaccho:feat/refer-viewpoints-from-tables
Oct 27, 2023
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
4235f6d
feat:func SetViewpointsToTables
majimaccho af1e90b
viewpoints data of tables in md
majimaccho 208035d
update default template
majimaccho 8d26480
golden file
majimaccho adc687d
golangci-lint timeout 5m
majimaccho fec8d68
golden files
majimaccho 730b29d
fix: test
majimaccho 693d890
showOnlyFirstParagraph
majimaccho File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -129,6 +129,11 @@ func (m *Md) OutputViewpoint(wr io.Writer, i int, v *schema.Viewpoint) error { | |
|
||
// Output generate markdown files. | ||
func Output(s *schema.Schema, c *config.Config, force bool) (e error) { | ||
s, err := s.SetViewpointsToTables() | ||
if err != nil { | ||
return errors.WithStack(err) | ||
} | ||
|
||
docPath := c.DocPath | ||
|
||
fullPath, err := filepath.Abs(docPath) | ||
|
@@ -588,6 +593,24 @@ func (m *Md) makeTableTemplateData(t *schema.Table) map[string]interface{} { | |
columnsData = append(columnsData, data) | ||
} | ||
|
||
// Viewpoints | ||
viewpointsData := [][]string{ | ||
[]string{ | ||
m.config.MergedDict.Lookup("Name"), | ||
m.config.MergedDict.Lookup("Definition"), | ||
}, | ||
[]string{"----", "----------"}, | ||
} | ||
|
||
for _, v := range t.Viewpoints { | ||
data := []string{ | ||
fmt.Sprintf("[%s](viewpoint-%d.md)", v.Name, v.Index), | ||
v.Desc, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would like to change the contents of the display using There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @k1LoW |
||
} | ||
|
||
viewpointsData = append(viewpointsData, data) | ||
} | ||
|
||
// Constraints | ||
constraintsData := [][]string{ | ||
[]string{ | ||
|
@@ -698,6 +721,7 @@ func (m *Md) makeTableTemplateData(t *schema.Table) map[string]interface{} { | |
return map[string]interface{}{ | ||
"Table": t, | ||
"Columns": adjustTable(columnsData), | ||
"Viewpoints": adjustTable(viewpointsData), | ||
"Constraints": adjustTable(constraintsData), | ||
"Indexes": adjustTable(indexesData), | ||
"Triggers": adjustTable(triggersData), | ||
|
@@ -708,6 +732,7 @@ func (m *Md) makeTableTemplateData(t *schema.Table) map[string]interface{} { | |
return map[string]interface{}{ | ||
"Table": t, | ||
"Columns": columnsData, | ||
"Viewpoints": viewpointsData, | ||
"Constraints": constraintsData, | ||
"Indexes": indexesData, | ||
"Triggers": triggersData, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not quite sure if this is is appropriate to set viewpoints to table.
I could be better to be in config.Analyze but it can effect more files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's start with the minimum effect range.
I like refactoring 👍