go-vise

commit 1c71081a3b57888ed70d65e517d33363862e1d05
parent e5b5bc34a2be888029024ffa9f8e31e9f0164a49
Author: lash <dev@holbrook.no>
Date:   Thu,  2 Jan 2025 18:46:14 +0000

Fix failing tests for gdbm dump

Diffstat:
M
db/gdbm/dump.go
 | 
7
++++---
M
db/postgres/dump_test.go
 | 
2
+-

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/db/gdbm/dump.go b/db/gdbm/dump.go
@@ -22,8 +22,8 @@ func(gdb *gdbmDb) Dump(ctx context.Context, key []byte) (*db.Dumper, error) {
 			gdb.it = nil
 			return nil, err
 		}
-		logg.TraceCtxf(ctx, "dump trace", "k", k)
-		if !bytes.HasPrefix(k[1:], key) {
+		logg.TraceCtxf(ctx, "dump trace", "k", k, "key", key)
+		if !bytes.HasPrefix(k, key) {
 			continue
 		}
 		gdb.SetPrefix(k[0])
@@ -50,7 +50,8 @@ func(gdb *gdbmDb) dumpFunc(ctx context.Context) ([]byte, []byte) {
 			gdb.it = nil
 			return nil, nil
 		}
-		if bytes.HasPrefix(k[1:], gdb.itBase) {
+		//if bytes.HasPrefix(k[1:], gdb.itBase) {
+		if bytes.HasPrefix(k, gdb.itBase) {
 			match = true
 			break
 		}
diff --git a/db/postgres/dump_test.go b/db/postgres/dump_test.go
@@ -65,7 +65,7 @@ func TestDumpPg(t *testing.T) {
 	//rows = rows.AddRow([]byte("xyzzy"), []byte("clyde"))
 
 	mock.ExpectBegin()
-	mock.ExpectQuery("SELECT key, value FROM vvise.kv_vise").WithArgs(k, k[0]).WillReturnRows(rows)
+	mock.ExpectQuery("SELECT key, value FROM vvise.kv_vise").WithArgs(append([]byte{db.DATATYPE_USERDATA}, k...)).WillReturnRows(rows)
 	mock.ExpectCommit()
 
 	o, err := store.Dump(ctx, []byte("foo"))