Append Dict to Config.Dict

Author: k1LoW

config/config.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 
 	"github.com/goccy/go-yaml"
+	"github.com/k1LoW/tbls/dict"
 	"github.com/k1LoW/tbls/schema"
 	"github.com/minio/minio/pkg/wildcard"
 	"github.com/pkg/errors"
@@ -38,6 +39,7 @@ type Config struct {
 	LintExclude []string             `yaml:"lintExclude"`
 	Relations   []AdditionalRelation `yaml:"relations"`
 	Comments    []AdditionalComment  `yaml:"comments"`
+	Dict        dict.Dict            `yaml:"dict"`
 }
 
 // Format is document format setting

config/config_test.go

@@ -20,26 +20,26 @@ func TestLoadDefault(t *testing.T) {
 	}
 	want := ""
 	if config.DSN != want {
-		t.Errorf("actual %v\nwant %v", config.DSN, want)
+		t.Errorf("got %v\nwant %v", config.DSN, want)
 	}
 	want2 := "dbdoc"
 	if config.DocPath != want2 {
-		t.Errorf("actual %v\nwant %v", config.DocPath, want2)
+		t.Errorf("got %v\nwant %v", config.DocPath, want2)
 	}
 	want3 := "png"
 	if config.ER.Format != want3 {
-		t.Errorf("actual %v\nwant %v", config.ER.Format, want3)
+		t.Errorf("got %v\nwant %v", config.ER.Format, want3)
 	}
 	want4 := 1
 	if *config.ER.Distance != want4 {
-		t.Errorf("actual %v\nwant %v", config.ER.Distance, want4)
+		t.Errorf("got %v\nwant %v", config.ER.Distance, want4)
 	}
 }
 
 func TestLoadConfigFile(t *testing.T) {
 	_ = os.Setenv("TBLS_TEST_PG_PASS", "pgpass")
 	_ = os.Setenv("TBLS_TEST_PG_DOC_PATH", "sample/pg")
-	configFilepath := filepath.Join(testdataDir(), "env_testdb_tbls.yml")
+	configFilepath := filepath.Join(testdataDir(), "config_test_tbls_2.yml")
 	config, err := NewConfig()
 	if err != nil {
 		t.Fatal(err)
@@ -48,19 +48,23 @@ func TestLoadConfigFile(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	expected := "pg://root:pgpass@localhost:55432/testdb?sslmode=disable"
-	if config.DSN != expected {
-		t.Errorf("actual %v\nwant %v", config.DSN, expected)
+
+	if want := "pg://root:pgpass@localhost:55432/testdb?sslmode=disable"; config.DSN != want {
+		t.Errorf("got %v\nwant %v", config.DSN, want)
+	}
+
+	if want := "sample/pg"; config.DocPath != want {
+		t.Errorf("got %v\nwant %v", config.DocPath, want)
 	}
-	expected2 := "sample/pg"
-	if config.DocPath != expected2 {
-		t.Errorf("actual %v\nwant %v", config.DocPath, expected2)
+
+	if want := "INDEX"; config.Dict.Lookup("Indexes") != want {
+		t.Errorf("got %v\nwant %v", config.Dict.Lookup("Indexes"), want)
 	}
 }
 
 var tests = []struct {
-	value    string
-	expected string
+	value string
+	want  string
 }{
 	{"${TBLS_ONE}/${TBLS_TWO}", "one/two"},
 	{"${TBLS_ONE}/${TBLS_TWO}/${TBLS_NONE}", "one/two/"},
@@ -72,12 +76,12 @@ func TestParseWithEnvirion(t *testing.T) {
 	_ = os.Setenv("TBLS_ONE", "one")
 	_ = os.Setenv("TBLS_TWO", "two")
 	for _, tt := range tests {
-		actual, err := parseWithEnviron(tt.value)
+		got, err := parseWithEnviron(tt.value)
 		if err != nil {
 			t.Fatal(err)
 		}
-		if actual != tt.expected {
-			t.Errorf("actual %v\nwant %v", actual, tt.expected)
+		if got != tt.want {
+			t.Errorf("got %v\nwant %v", got, tt.want)
 		}
 	}
 }
@@ -132,17 +136,17 @@ func TestMergeAditionalData(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	expected := 1
-	actual := len(s.Relations)
-	if actual != expected {
-		t.Errorf("actual %v\nwant %v", actual, expected)
+	want := 1
+	got := len(s.Relations)
+	if got != want {
+		t.Errorf("got %v\nwant %v", got, want)
 	}
 	posts, _ := s.FindTableByName("posts")
 	title, _ := posts.FindColumnByName("title")
-	expected2 := "post title"
-	actual2 := title.Comment
-	if actual2 != expected2 {
-		t.Errorf("actual %v\nwant %v", actual2, expected2)
+	want2 := "post title"
+	got2 := title.Comment
+	if got2 != want2 {
+		t.Errorf("got %v\nwant %v", got2, want2)
 	}
 }
 
@@ -227,10 +231,10 @@ func TestFilterTables(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	expected := 2
-	actual := len(s.Tables)
-	if actual != expected {
-		t.Errorf("actual %v\nwant %v", actual, expected)
+	want := 2
+	got := len(s.Tables)
+	if got != want {
+		t.Errorf("got %v\nwant %v", got, want)
 	}
 }
 
@@ -297,22 +301,22 @@ func TestModifySchema(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	expected := 1
-	actual := len(s.Relations)
-	if actual != expected {
-		t.Errorf("actual %v\nwant %v", actual, expected)
+	want := 1
+	got := len(s.Relations)
+	if got != want {
+		t.Errorf("got %v\nwant %v", got, want)
 	}
 	posts, _ := s.FindTableByName("posts")
 	title, _ := posts.FindColumnByName("title")
-	expected2 := "post title"
-	actual2 := title.Comment
-	if actual2 != expected2 {
-		t.Errorf("actual %v\nwant %v", actual2, expected2)
+	want2 := "post title"
+	got2 := title.Comment
+	if got2 != want2 {
+		t.Errorf("got %v\nwant %v", got2, want2)
 	}
-	expected3 := 2
-	actual3 := len(s.Tables)
-	if actual3 != expected3 {
-		t.Errorf("actual %v\nwant %v", actual, expected)
+	want3 := 2
+	got3 := len(s.Tables)
+	if got3 != want3 {
+		t.Errorf("got %v\nwant %v", got, want)
 	}
 }
 

dict/dict.go

@@ -1,6 +1,11 @@
 package dict
 
-import "sync"
+import (
+	"encoding/json"
+	"sync"
+
+	"github.com/goccy/go-yaml"
+)
 
 type Dict struct {
 	s sync.Map
@@ -50,3 +55,35 @@ func (d *Dict) Dump() map[string]string {
 	})
 	return dpd
 }
+
+func (d *Dict) MarchalJSON() ([]byte, error) {
+	return json.Marshal(d.Dump())
+}
+
+func (d *Dict) UnmarshalJSON(data []byte) error {
+	m := map[string]string{}
+	err := json.Unmarshal(data, &m)
+	if err != nil {
+		return err
+	}
+	for k, v := range m {
+		d.s.Store(k, v)
+	}
+	return nil
+}
+
+func (d *Dict) MarchalYAML() ([]byte, error) {
+	return yaml.Marshal(d.Dump())
+}
+
+func (d *Dict) UnmarshalYAML(data []byte) error {
+	m := map[string]string{}
+	err := yaml.Unmarshal(data, &m)
+	if err != nil {
+		return err
+	}
+	for k, v := range m {
+		d.s.Store(k, v)
+	}
+	return nil
+}

testdata/config_test.yml.golden

@@ -46,3 +46,4 @@ comments:
   columnComments:
     b: column comment required.
     b2: column comment required.
+dict: {}

testdata/env_testdb_tbls.yml renamed to testdata/config_test_tbls_2.yml

@@ -1,3 +1,6 @@
 ---
 dsn: pg://root:${TBLS_TEST_PG_PASS}@localhost:55432/testdb?sslmode=disable
 docPath: ${TBLS_TEST_PG_DOC_PATH}
+dict:
+  Indexes: INDEX
+  Constraints: FK, UNIQUE, etc