feat: add bytes support (#254)

infobloxopen · Nov 22, 2023 · d3024d4 · d3024d4
1 parent 76a99c1
commit d3024d4
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 74 deletions.
diff --git a/example/feature_demo/demo_types.pb.go b/example/feature_demo/demo_types.pb.go
diff --git a/example/feature_demo/demo_types.pb.gorm.go b/example/feature_demo/demo_types.pb.gorm.go
@@ -181,6 +181,7 @@ type TypeWithIDORM struct {
 	Id                uint32
 	IntPointId        *uint32
 	Ip                string          `gorm:"column:ip_addr"`
+	Metadata          []byte          `gorm:"type:bytea"`
 	MultiAccountTypes []*JoinTable    `gorm:"foreignKey:TypeWithIDID"`
 	Point             *IntPointORM    `gorm:"foreignKey:IntPointId;references:Id"`
 	SecretInt         int32           `gorm:"-"`
@@ -265,6 +266,7 @@ func (m *TypeWithID) ToORM(ctx context.Context) (TypeWithIDORM, error) {
 		t := m.DeletedAt.AsTime()
 		to.DeletedAt = &t
 	}
+	to.Metadata = m.Metadata
 	if posthook, ok := interface{}(m).(TypeWithIDWithAfterToORM); ok {
 		err = posthook.AfterToORM(ctx, &to)
 	}
@@ -334,6 +336,7 @@ func (m *TypeWithIDORM) ToPB(ctx context.Context) (TypeWithID, error) {
 	if m.DeletedAt != nil {
 		to.DeletedAt = timestamppb.New(*m.DeletedAt)
 	}
+	to.Metadata = m.Metadata
 	if posthook, ok := interface{}(m).(TypeWithIDWithAfterToPB); ok {
 		err = posthook.AfterToPB(ctx, &to)
 	}
@@ -1995,6 +1998,10 @@ func DefaultApplyFieldMaskTypeWithID(ctx context.Context, patchee *TypeWithID, p
 			patchee.DeletedAt = patcher.DeletedAt
 			continue
 		}
+		if f == prefix+"Metadata" {
+			patchee.Metadata = patcher.Metadata
+			continue
+		}
 	}
 	if err != nil {
 		return nil, err

diff --git a/example/feature_demo/demo_types.proto b/example/feature_demo/demo_types.proto
@@ -115,6 +115,7 @@ message TypeWithID {
   // Limited support for DB type 'time', implemented via strings (string -> DB && DB -> string)
   gorm.types.TimeOnly time_only = 14;
   google.protobuf.Timestamp deleted_at = 15;
+  bytes metadata = 16;
 }
 
 // MultiaccountTypeWithID demonstrates the generated multi-account support

diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -886,7 +886,6 @@ func (b *ORMBuilder) parseBasicFields(msg *protogen.Message, g *protogen.Generat
 		tag := gormOptions.Tag
 		fieldName := camelCase(string(fd.Name()))
 		fieldType := fd.Kind().String()
-
 		var typePackage string
 
 		if b.dbEngine == ENGINE_POSTGRES && b.IsAbleToMakePQArray(fieldType) && field.Desc.IsList() {
@@ -994,6 +993,9 @@ func (b *ORMBuilder) parseBasicFields(msg *protogen.Message, g *protogen.Generat
 		}
 
 		switch fieldType {
+		case "bytes":
+			fieldType = "[]byte"
+			gormOptions.Tag = tagWithType(tag, "bytea")
 		case "float":
 			fieldType = "float32"
 		case "double":