luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #510 from alixander/update-sql-texts

Browse source 
update sql texts measure
This commit is contained in:
Alexander Wang 2022-12-23 08:31:52 -08:00 committed by GitHub
commit ce6d5d7775
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
d2graph/d2graph.go
View file

@ -1084,7 +1084,9 @@ func (g *Graph) Texts() []*d2target.MText {
} }
} else if obj.SQLTable != nil { } else if obj.SQLTable != nil {
for _, column := range obj.SQLTable.Columns { for _, column := range obj.SQLTable.Columns {
texts = appendTextDedup(texts, column.Text()) for _, t := range column.Texts() {
texts = appendTextDedup(texts, t)
}
} }
} }
} }

29
d2target/sqltable.go
View file

@ -1,11 +1,5 @@
package d2target package d2target
import (
"fmt"
"oss.terrastruct.com/d2/d2renderers/d2fonts"
)
const ( const (
NamePadding = 10 NamePadding = 10
TypePadding = 20 TypePadding = 20
@ -22,13 +16,22 @@ type SQLColumn struct {
Reference string `json:"reference"` Reference string `json:"reference"`
} }
func (c SQLColumn) Text() *MText { func (c SQLColumn) Texts() []*MText {
return &MText{ return []*MText{
Text: fmt.Sprintf("%s%s%s%s", c.Name.Label, c.Type.Label, c.Constraint, c.Reference), {
FontSize: d2fonts.FONT_SIZE_L, Text: c.Name.Label,
IsBold: false, FontSize: c.Name.FontSize,
IsItalic: false, IsBold: false,
Shape: "sql_table", IsItalic: false,
Shape: "sql_table",
},
{
Text: c.Type.Label,
FontSize: c.Type.FontSize,
IsBold: false,
IsItalic: false,
Shape: "sql_table",
},
} }
} }