Pass full column definition instead of just typename

Author: eaglesemanation

internal/cmd/shim.go

@@ -60,16 +60,29 @@ func pluginWASM(p config.Plugin) *plugin.Codegen_WASM {
 	return nil
 }
 
-func identifierSlice(types []*ast.TypeName) []*plugin.Identifier {
-	ids := []*plugin.Identifier{}
-	for _, typ := range types {
-		ids = append(ids, &plugin.Identifier{
-			Catalog: typ.Catalog,
-			Schema:  typ.Schema,
-			Name:    typ.Name,
+func columnsSlice(columnDefs []*ast.ColumnDef) []*plugin.Column {
+	var columns []*plugin.Column
+	for _, c := range columnDefs {
+		l := -1
+		if c.Length != nil {
+			l = *c.Length
+		}
+		columns = append(columns, &plugin.Column{
+			Name: c.Colname,
+			Type: &plugin.Identifier{
+				Catalog: c.TypeName.Catalog,
+				Schema:  c.TypeName.Schema,
+				Name:    c.TypeName.Name,
+			},
+			Comment:   c.Comment,
+			NotNull:   c.IsNotNull,
+			Unsigned:  c.IsUnsigned,
+			IsArray:   c.IsArray,
+			ArrayDims: int32(c.ArrayDims),
+			Length:    int32(l),
 		})
 	}
-	return ids
+	return columns
 }
 
 func pluginCatalog(c *catalog.Catalog) *plugin.Catalog {
@@ -87,9 +100,9 @@ func pluginCatalog(c *catalog.Catalog) *plugin.Catalog {
 				})
 			case *catalog.CompositeType:
 				cts = append(cts, &plugin.CompositeType{
-					Name:         typ.Name,
-					Comment:      typ.Comment,
-					ColTypeNames: identifierSlice(typ.ColTypeNames),
+					Name:    typ.Name,
+					Comment: typ.Comment,
+					Columns: columnsSlice(typ.Columns),
 				})
 			}
 		}

internal/codegen/golang/postgresql_type.go

@@ -587,13 +587,20 @@ func postgresType(req *plugin.GenerateRequest, options *opts.Options, col *plugi
 
 			for _, ct := range schema.CompositeTypes {
 				if rel.Name == ct.Name && rel.Schema == schema.Name {
+					var ctName string
+					if schema.Name == req.Catalog.DefaultSchema {
+						ctName = StructName(ct.Name, options)
+					} else {
+						ctName = StructName(schema.Name+"_"+ct.Name, options)
+					}
+
 					if notNull {
-						return "string"
+						return ctName
 					}
 					if emitPointersForNull {
-						return "*string"
+						return "*" + ctName
 					}
-					return "sql.NullString"
+					return "Null" + ctName
 				}
 			}
 		}

internal/plugin/codegen.pb.go

@@ -28,9 +28,9 @@ func (e *Enum) isType() {
 }
 
 type CompositeType struct {
-	Name         string
-	ColTypeNames []*ast.TypeName
-	Comment      string
+	Name    string
+	Columns []*ast.ColumnDef
+	Comment string
 }
 
 func (ct *CompositeType) isType() {
@@ -102,11 +102,11 @@ func stringSlice(list *ast.List) []string {
 	return items
 }
 
-func columnTypeNamesSlice(list *ast.List) []*ast.TypeName {
-	items := []*ast.TypeName{}
+func columnDefsSlice(list *ast.List) []*ast.ColumnDef {
+	items := []*ast.ColumnDef{}
 	for _, item := range list.Items {
 		if n, ok := item.(*ast.ColumnDef); ok {
-			items = append(items, n.TypeName)
+			items = append(items, n)
 		}
 	}
 	return items
@@ -147,8 +147,8 @@ func (c *Catalog) createCompositeType(stmt *ast.CompositeTypeStmt) error {
 		return sqlerr.TypeExists(tbl.Name)
 	}
 	schema.Types = append(schema.Types, &CompositeType{
-		Name:         stmt.TypeName.Name,
-		ColTypeNames: columnTypeNamesSlice(stmt.ColDefList),
+		Name:    stmt.TypeName.Name,
+		Columns: columnDefsSlice(stmt.ColDefList),
 	})
 	return nil
 }
@@ -350,9 +350,9 @@ func (c *Catalog) renameType(stmt *ast.RenameTypeStmt) error {
 
 	case *CompositeType:
 		schema.Types[idx] = &CompositeType{
-			Name:         newName,
-			ColTypeNames: typ.ColTypeNames,
-			Comment:      typ.Comment,
+			Name:    newName,
+			Columns: typ.Columns,
+			Comment: typ.Comment,
 		}
 
 	case *Enum:
@@ -390,8 +390,8 @@ func (c *Catalog) updateTypeNames(typeUpdater func(t *ast.TypeName)) error {
 			if !ok {
 				continue
 			}
-			for _, fieldType := range composite.ColTypeNames {
-				typeUpdater(fieldType)
+			for _, fieldType := range composite.Columns {
+				typeUpdater(fieldType.TypeName)
 			}
 		}
 	}

internal/sql/catalog/types.go

@@ -61,7 +61,7 @@ message Schema {
 message CompositeType {
   string name = 1;
   string comment = 2;
-  repeated Identifier col_type_names = 3;
+  repeated Column columns = 3;
 }
 
 message Enum {