only set srid if non-zero, better err msg in pg to pg

PeerDB-io · Mar 20, 2024 · f4a52f6 · f4a52f6
1 parent 30411d0
commit f4a52f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/flow/geo/geo.go b/flow/geo/geo.go
@@ -31,7 +31,10 @@ func GeoValidate(hexWkb string) (string, error) {
 	}
 
 	wkt := geometryObject.ToWKT()
-	wkt = fmt.Sprintf("SRID=%d;%s", geometryObject.SRID(), wkt)
+
+	if SRID := geometryObject.SRID(); SRID != 0 {
+		wkt = fmt.Sprintf("SRID=%d;%s", geometryObject.SRID(), wkt)
+	}
 	return wkt, nil
 }
 

diff --git a/flow/model/qrecord_batch.go b/flow/model/qrecord_batch.go
@@ -239,7 +239,7 @@ func (src *QRecordBatchCopyFromSource) Values() ([]interface{}, error) {
 
 			wkb, err := geo.GeoToWKB(v)
 			if err != nil {
-				src.err = errors.New("failed to convert Geospatial value to wkb")
+				src.err = fmt.Errorf("failed to convert Geospatial value to wkb: %v", err)
 				return nil, src.err
 			}