unwrap

Author: James Cor

sql/hash/hash.go

@@ -43,6 +43,11 @@ func HashOf(ctx *sql.Context, sch sql.Schema, row sql.Row) (uint64, error) {
 			}
 		}
 
+		v, err := sql.UnwrapAny(ctx, v)
+		if err != nil {
+			return 0, fmt.Errorf("error unwrapping value: %w", err)
+		}
+
 		// TODO: we may not always have the type information available, so we check schema length.
 		//   Then, defer to original behavior
 		if i >= len(sch) || v == nil {

sql/iters/rel_iters.go

@@ -644,7 +644,10 @@ func (ii *IntersectIter) Next(ctx *sql.Context) (sql.Row, error) {
 		ii.cache = make(map[uint64]int)
 		for {
 			res, err := ii.RIter.Next(ctx)
-			if err != nil && err != io.EOF {
+			if err != nil {
+				if err == io.EOF {
+					break
+				}
 				return nil, err
 			}
 
@@ -656,10 +659,6 @@ func (ii *IntersectIter) Next(ctx *sql.Context) (sql.Row, error) {
 				ii.cache[hash] = 0
 			}
 			ii.cache[hash]++
-
-			if err == io.EOF {
-				break
-			}
 		}
 		ii.cached = true
 	}