support enum and other custom types(?) for Snowflake AVRO

PeerDB-io · Oct 24, 2023 · 4ed74b7 · 4ed74b7
1 parent 7b566b0
commit 4ed74b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/flow/connectors/postgres/qrep_query_executor.go b/flow/connectors/postgres/qrep_query_executor.go
@@ -103,12 +103,12 @@ func (qe *QRepQueryExecutor) fieldDescriptionsToSchema(fds []pgconn.FieldDescrip
 		ctype := postgresOIDToQValueKind(fd.DataTypeOID)
 		if ctype == qvalue.QValueKindInvalid {
 			var err error
-			ctype = qvalue.QValueKind(qe.customTypeMap[fd.DataTypeOID])
 			if err != nil {
-				ctype = qvalue.QValueKindInvalid
 				typeName, ok := qe.customTypeMap[fd.DataTypeOID]
 				if ok {
 					ctype = customTypeToQKind(typeName)
+				} else {
+					ctype = qvalue.QValueKindString
 				}
 			}
 		}

diff --git a/flow/connectors/postgres/qvalue_convert.go b/flow/connectors/postgres/qvalue_convert.go
@@ -408,7 +408,7 @@ func customTypeToQKind(typeName string) qvalue.QValueKind {
 }
 
 func GeoValidate(hexWkb string) error {
-	log.Infof("Validating geometry shape %s", hexWkb)
+	log.Debugf("Validating geometry shape %s", hexWkb)
 	// Decode the WKB hex string into binary
 	wkb, hexErr := hex.DecodeString(hexWkb)
 	if hexErr != nil {

diff --git a/flow/model/qvalue/avro_converter.go b/flow/model/qvalue/avro_converter.go
@@ -1,7 +1,6 @@
 package qvalue
 
 import (
-	"errors"
 	"fmt"
 	"math/big"
 	"time"
@@ -123,7 +122,7 @@ func GetAvroSchemaFromQValueKind(kind QValueKind, nullable bool) (*QValueKindAvr
 			AvroLogicalSchema: "string",
 		}, nil
 	default:
-		return nil, errors.New("unsupported QValueKind type")
+		return nil, fmt.Errorf("unsupported QValueKind type: %s", kind)
 	}
 }