fix: driver.meta.dict allow empty

Author: k1LoW

schema/json.go

@@ -12,7 +12,7 @@ type SchemaJSON struct {
 	Relations  []*RelationJSON `json:"relations,omitempty"`
 	Functions  []*Function     `json:"functions,omitempty"`
 	Enums      []*Enum         `json:"enums,omitempty"`
-	Driver     *Driver         `json:"driver,omitempty"`
+	Driver     *DriverJSON     `json:"driver,omitempty"`
 	Labels     Labels          `json:"labels,omitempty"`
 	Viewpoints Viewpoints      `json:"viewpoints,omitempty"`
 }
@@ -54,6 +54,18 @@ type RelationJSON struct {
 	Virtual           bool     `json:"virtual,omitempty"`
 }
 
+type DriverJSON struct {
+	Name            string          `json:"name"`
+	DatabaseVersion string          `json:"database_version,omitempty" yaml:"databaseVersion,omitempty"`
+	Meta            *DriverMetaJSON `json:"meta,omitempty"`
+}
+
+type DriverMetaJSON struct {
+	CurrentSchema string            `json:"current_schema,omitempty" yaml:"currentSchema,omitempty"`
+	SearchPaths   []string          `json:"search_paths,omitempty" yaml:"searchPaths,omitempty"`
+	Dict          map[string]string `json:"dict,omitempty"`
+}
+
 // ToJSONObjct convert schema.Schema to JSON object
 func (s Schema) ToJSONObject() SchemaJSON {
 	var tables []*TableJSON
@@ -73,7 +85,7 @@ func (s Schema) ToJSONObject() SchemaJSON {
 		Relations:  relations,
 		Functions:  s.Functions,
 		Enums:      s.Enums,
-		Driver:     s.Driver,
+		Driver:     s.Driver.ToJSONObject(),
 		Labels:     s.Labels,
 		Viewpoints: s.Viewpoints,
 	}
@@ -140,6 +152,28 @@ func (r Relation) ToJSONObject() RelationJSON {
 	}
 }
 
+func (d *Driver) ToJSONObject() *DriverJSON {
+	if d == nil {
+		return nil
+	}
+	return &DriverJSON{
+		Name:            d.Name,
+		DatabaseVersion: d.DatabaseVersion,
+		Meta:            d.Meta.ToJSONObject(),
+	}
+}
+
+func (d *DriverMeta) ToJSONObject() *DriverMetaJSON {
+	if d == nil {
+		return nil
+	}
+	return &DriverMetaJSON{
+		CurrentSchema: d.CurrentSchema,
+		SearchPaths:   d.SearchPaths,
+		Dict:          d.Dict.Dump(),
+	}
+}
+
 // MarshalJSON return custom JSON byte
 func (s Schema) MarshalJSON() ([]byte, error) {
 	ss := s.ToJSONObject()

spec/tbls.schema.json_schema.json

@@ -84,11 +84,6 @@
         "table"
       ]
     },
-    "Dict": {
-      "properties": {},
-      "additionalProperties": false,
-      "type": "object"
-    },
     "Driver": {
       "properties": {
         "name": {
@@ -119,7 +114,10 @@
           "type": "array"
         },
         "dict": {
-          "$ref": "#/$defs/Dict"
+          "additionalProperties": {
+            "type": "string"
+          },
+          "type": "object"
         }
       },
       "additionalProperties": false,