test: improve cursor_streaming_large_test assertions and reduce duplication

ocean · ocean · commit ca2eebd7d768 · 2026-01-09T17:25:51.000+11:00
- Tighten batch count assertion to exactly 11 (10 full batches + 1 final empty batch)
- Replace 4 nearly identical fetch_all_* functions with single generic helper
- Keep semantic aliases for backwards compatibility
- All tests pass
diff --git a/test/cursor_streaming_large_test.exs b/test/cursor_streaming_large_test.exs
@@ -231,8 +231,8 @@ defmodule EctoLibSql.CursorStreamingLargeTest do
       # Fetch multiple batches
       batch_count = count_batches(state, cursor, query, max_rows: 100)
 
-      # Should have multiple batches of 100 rows plus remainder
-      assert batch_count >= 9, "Should have at least 9 batches for 1000 rows with batch size 100"
+      # Should have exactly 11 batches: 10 with 100 rows each, plus 1 final batch with 0 rows
+      assert batch_count == 11, "Should have exactly 11 batches for 1000 rows with batch size 100"
     end
 
     test "cursor with aggregation query", %{state: state} do
@@ -369,24 +369,32 @@ defmodule EctoLibSql.CursorStreamingLargeTest do
     end
   end
 
-  defp fetch_all_binary_rows(state, cursor, query, opts) do
+  # Generic helper to collect all rows from a cursor by repeatedly fetching batches
+  defp fetch_all_cursor_rows(state, cursor, query, opts) do
     case EctoLibSql.handle_fetch(query, cursor, opts, state) do
       {:cont, result, next_state} ->
-        result.rows ++ fetch_all_binary_rows(next_state, cursor, query, opts)
+        result.rows ++ fetch_all_cursor_rows(next_state, cursor, query, opts)
 
       {:halt, result, _state} ->
         result.rows
     end
   end
 
+  # Aliases for backwards compatibility and semantic clarity
+  defp fetch_all_binary_rows(state, cursor, query, opts) do
+    fetch_all_cursor_rows(state, cursor, query, opts)
+  end
+
   defp fetch_all_computed_rows(state, cursor, query, opts) do
-    case EctoLibSql.handle_fetch(query, cursor, opts, state) do
-      {:cont, result, next_state} ->
-        result.rows ++ fetch_all_computed_rows(next_state, cursor, query, opts)
+    fetch_all_cursor_rows(state, cursor, query, opts)
+  end
 
-      {:halt, result, _state} ->
-        result.rows
-    end
+  defp fetch_all_group_rows(state, cursor, query, opts) do
+    fetch_all_cursor_rows(state, cursor, query, opts)
+  end
+
+  defp fetch_all_distinct_rows(state, cursor, query, opts) do
+    fetch_all_cursor_rows(state, cursor, query, opts)
   end
 
   defp count_batches(state, cursor, query, opts) do
@@ -398,24 +406,4 @@ defmodule EctoLibSql.CursorStreamingLargeTest do
         1
     end
   end
-
-  defp fetch_all_group_rows(state, cursor, query, opts) do
-    case EctoLibSql.handle_fetch(query, cursor, opts, state) do
-      {:cont, result, next_state} ->
-        result.rows ++ fetch_all_group_rows(next_state, cursor, query, opts)
-
-      {:halt, result, _state} ->
-        result.rows
-    end
-  end
-
-  defp fetch_all_distinct_rows(state, cursor, query, opts) do
-    case EctoLibSql.handle_fetch(query, cursor, opts, state) do
-      {:cont, result, next_state} ->
-        result.rows ++ fetch_all_distinct_rows(next_state, cursor, query, opts)
-
-      {:halt, result, _state} ->
-        result.rows
-    end
-  end
 end
