Merge pull request #6 from PDOK/PDOK-12317

Fatal error when null value in column
PDOK · May 19, 2021 · 9edf8eb · 9edf8eb
2 parents a454071 + 4d949a5
commit 9edf8eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/example/example.gpkg b/example/example.gpkg
diff --git a/sieve.go b/sieve.go
@@ -252,9 +252,6 @@ func readFeatures(h *gpkg.Handle, preSieve chan feature, t table) {
 		var c []interface{}
 
 		for i, colName := range cols {
-			if vals[i] == nil {
-				continue
-			}
 			switch colName {
 			case t.gcolumn:
 				wkbgeom, err := gpkg.DecodeGeometry(vals[i].([]byte))
@@ -263,7 +260,6 @@ func readFeatures(h *gpkg.Handle, preSieve chan feature, t table) {
 				}
 				f.geometry = wkbgeom.Geometry
 			default:
-				// Grab any non-nil, non-id, non-bounding box, & non-geometry column as a tag
 				switch v := vals[i].(type) {
 				case []uint8:
 					asBytes := make([]byte, len(v))
@@ -279,6 +275,8 @@ func readFeatures(h *gpkg.Handle, preSieve chan feature, t table) {
 					c = append(c, v)
 				case string:
 					c = append(c, v)
+				case nil:
+					c = append(c, v)
 				default:
 					log.Printf("unexpected type for sqlite column data: %v: %T", cols[i], v)
 				}