Unwrap wrapped values when computing hashes for keyless tables.

Author: nicktobey

sql/expression/matchagainst.go

@@ -288,7 +288,7 @@ func (expr *MatchAgainst) inNaturalLanguageMode(ctx *sql.Context, row sql.Row) (
 	}
 
 	accumulatedRelevancy := float32(0)
-	hash, err := fulltext.HashRow(row)
+	hash, err := fulltext.HashRow(ctx, row)
 	if err != nil {
 		return 0, err
 	}

sql/fulltext/fulltext.go

@@ -15,6 +15,7 @@
 package fulltext
 
 import (
+	"context"
 	"crypto/sha256"
 	"encoding/binary"
 	"encoding/hex"
@@ -95,14 +96,14 @@ const (
 )
 
 // HashRow returns a 64 character lowercase hexadecimal hash of the given row. This is intended for use with keyless tables.
-func HashRow(row sql.Row) (string, error) {
+func HashRow(ctx context.Context, row sql.Row) (string, error) {
 	h := sha256.New()
 	// Since we can't represent a NULL value in binary, we instead append the NULL results to the end, which will
 	// give us a unique representation for representing NULL values.
 	valIsNull := make([]bool, len(row))
 	for i, val := range row {
 		var err error
-		valIsNull[i], err = writeHashedValue(h, val)
+		valIsNull[i], err = writeHashedValue(ctx, h, val)
 		if err != nil {
 			return "", err
 		}
@@ -117,7 +118,11 @@ func HashRow(row sql.Row) (string, error) {
 }
 
 // writeHashedValue writes the given value into the hash.
-func writeHashedValue(h hash.Hash, val interface{}) (valIsNull bool, err error) {
+func writeHashedValue(ctx context.Context, h hash.Hash, val interface{}) (valIsNull bool, err error) {
+	val, err = sql.UnwrapAny(ctx, val)
+	if err != nil {
+		return false, err
+	}
 	switch val := val.(type) {
 	case int:
 		if err := binary.Write(h, binary.LittleEndian, int64(val)); err != nil {

sql/fulltext/fulltext_editor.go

@@ -256,7 +256,7 @@ func (editor TableEditor) StatementComplete(ctx *sql.Context) error {
 
 // Insert implements the interface sql.TableEditor.
 func (editor TableEditor) Insert(ctx *sql.Context, row sql.Row) error {
-	hash, err := HashRow(row)
+	hash, err := HashRow(ctx, row)
 	if err != nil {
 		return err
 	}
@@ -382,7 +382,7 @@ func (editor TableEditor) Update(ctx *sql.Context, old sql.Row, new sql.Row) err
 
 // Delete implements the interface sql.TableEditor.
 func (editor TableEditor) Delete(ctx *sql.Context, row sql.Row) error {
-	hash, err := HashRow(row)
+	hash, err := HashRow(ctx, row)
 	if err != nil {
 		return err
 	}