Fix cursor batch

test/backup_test.go

@@ -30,6 +30,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	driver "github.com/arangodb/go-driver"
 )
 
@@ -800,7 +802,10 @@ func TestBackupRestoreWithViews(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Failed to create query: %s", describe(err))
 			}
-			defer cursor.Close()
+			defer func(cursor driver.Cursor) {
+				err := cursor.Close()
+				require.NoError(t, err)
+			}(cursor)
 
 			var numDocumentsInView int
 			_, err = cursor.ReadDocument(ctx, &numDocumentsInView)

v2/CHANGELOG.md

@@ -20,6 +20,7 @@
 - Admin Cluster API support
 - Set Licence API support
 - Transparent compression of requests and responses (ArangoDBConfiguration.Compression)
+- Fix Cursor batch
 
 
 ## [2.0.3](https://github.com/arangodb/go-driver/tree/v2.0.3) (2023-10-31)

v2/arangodb/cursor_impl.go

@@ -89,10 +89,10 @@ func (c *cursor) CloseWithContext(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	c.closed = true
 
 	switch code := resp.Code(); code {
 	case http.StatusAccepted:
-		c.closed = true
 		c.data = cursorData{}
 		return nil
 	default:
@@ -182,13 +182,16 @@ func (c *cursor) getNextBatch(ctx context.Context, retryBatchID string) error {
 		c.retryData.currentBatchID = c.data.NextBatchID
 	}
 
-	resp, err := connection.CallPost(ctx, c.db.connection(), url, &c.data, nil, c.db.modifiers...)
+	var data cursorData
+
+	resp, err := connection.CallPost(ctx, c.db.connection(), url, &data, nil, c.db.modifiers...)
 	if err != nil {
 		return err
 	}
 
 	switch code := resp.Code(); code {
 	case http.StatusOK:
+		c.data = data
 		return nil
 	default:
 		return shared.NewResponseStruct().AsArangoErrorWithCode(code)