Fix Column Marshal/Unmarchal JSON/YAML

k1LoW · Dec 27, 2020 · 6037ce3 · 6037ce3
1 parent 67e0875
commit 6037ce3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/schema/json.go b/schema/json.go
@@ -91,6 +91,7 @@ func (c Column) MarshalJSON() ([]byte, error) {
 			Type            string      `json:"type"`
 			Nullable        bool        `json:"nullable"`
 			Default         string      `json:"default"`
+			ExtraDef        string      `json:"extra_def,omitempty"`
 			Comment         string      `json:"comment"`
 			ParentRelations []*Relation `json:"-"`
 			ChildRelations  []*Relation `json:"-"`
@@ -100,6 +101,7 @@ func (c Column) MarshalJSON() ([]byte, error) {
 			Nullable:        c.Nullable,
 			Default:         c.Default.String,
 			Comment:         c.Comment,
+			ExtraDef:        c.ExtraDef,
 			ParentRelations: c.ParentRelations,
 			ChildRelations:  c.ChildRelations,
 		})
@@ -110,6 +112,7 @@ func (c Column) MarshalJSON() ([]byte, error) {
 		Nullable        bool        `json:"nullable"`
 		Default         *string     `json:"default"`
 		Comment         string      `json:"comment"`
+		ExtraDef        string      `json:"extra_def,omitempty"`
 		ParentRelations []*Relation `json:"-"`
 		ChildRelations  []*Relation `json:"-"`
 	}{
@@ -118,6 +121,7 @@ func (c Column) MarshalJSON() ([]byte, error) {
 		Nullable:        c.Nullable,
 		Default:         nil,
 		Comment:         c.Comment,
+		ExtraDef:        c.ExtraDef,
 		ParentRelations: c.ParentRelations,
 		ChildRelations:  c.ChildRelations,
 	})
@@ -159,6 +163,7 @@ func (c *Column) UnmarshalJSON(data []byte) error {
 		Nullable        bool        `json:"nullable"`
 		Default         *string     `json:"default"`
 		Comment         string      `json:"comment"`
+		ExtraDef        string      `json:"extra_def,omitempty"`
 		ParentRelations []*Relation `json:"-"`
 		ChildRelations  []*Relation `json:"-"`
 	}{}
@@ -176,6 +181,7 @@ func (c *Column) UnmarshalJSON(data []byte) error {
 		c.Default.Valid = false
 		c.Default.String = ""
 	}
+	c.ExtraDef = s.ExtraDef
 	c.Comment = s.Comment
 	return nil
 }

diff --git a/schema/yaml.go b/schema/yaml.go
@@ -10,6 +10,7 @@ func (c Column) MarshalYAML() ([]byte, error) {
 			Type            string      `yaml:"type"`
 			Nullable        bool        `yaml:"nullable"`
 			Default         string      `yaml:"default"`
+			ExtraDef        string      `json:"extraDef,omitempty"`
 			Comment         string      `yaml:"comment"`
 			ParentRelations []*Relation `yaml:"-"`
 			ChildRelations  []*Relation `yaml:"-"`
@@ -19,6 +20,7 @@ func (c Column) MarshalYAML() ([]byte, error) {
 			Nullable:        c.Nullable,
 			Default:         c.Default.String,
 			Comment:         c.Comment,
+			ExtraDef:        c.ExtraDef,
 			ParentRelations: c.ParentRelations,
 			ChildRelations:  c.ChildRelations,
 		})
@@ -28,6 +30,7 @@ func (c Column) MarshalYAML() ([]byte, error) {
 		Type            string      `yaml:"type"`
 		Nullable        bool        `yaml:"nullable"`
 		Default         *string     `yaml:"default"`
+		ExtraDef        string      `json:"extraDef,omitempty"`
 		Comment         string      `yaml:"comment"`
 		ParentRelations []*Relation `yaml:"-"`
 		ChildRelations  []*Relation `yaml:"-"`
@@ -36,6 +39,7 @@ func (c Column) MarshalYAML() ([]byte, error) {
 		Type:            c.Type,
 		Nullable:        c.Nullable,
 		Default:         nil,
+		ExtraDef:        c.ExtraDef,
 		Comment:         c.Comment,
 		ParentRelations: c.ParentRelations,
 		ChildRelations:  c.ChildRelations,
@@ -78,6 +82,7 @@ func (c *Column) UnmarshalYAML(data []byte) error {
 		Nullable        bool        `yaml:"nullable"`
 		Default         *string     `yaml:"default"`
 		Comment         string      `yaml:"comment"`
+		ExtraDef        string      `json:"extraDef,omitempty"`
 		ParentRelations []*Relation `yaml:"-"`
 		ChildRelations  []*Relation `yaml:"-"`
 	}{}
@@ -96,6 +101,7 @@ func (c *Column) UnmarshalYAML(data []byte) error {
 		c.Default.Valid = false
 		c.Default.String = ""
 	}
+	c.ExtraDef = s.ExtraDef
 	c.Comment = s.Comment
 	return nil
 }