Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,12 @@ fn writeStreaming(
) !void {
try out_writer.begin(allocator, stmt, col_count, writer);
if (stmt) |s| {
while (c.sqlite3_step(s) == c.SQLITE_ROW) {
var rc = c.sqlite3_step(s);
while (rc == c.SQLITE_ROW) {
try out_writer.writeRow(s, writer);
rc = c.sqlite3_step(s);
}
if (rc != c.SQLITE_DONE) return error.StepFailed;
}
try out_writer.end(writer);
}
Expand Down Expand Up @@ -510,7 +513,7 @@ fn run(
}

execQuery(allocator, db, query, stdout_writer, stderr_writer, parsed.header, parsed.output_format, parsed.xml_root, parsed.xml_row, parsed.sql_table, parsed.html_class, parsed.null_value, use_table, parsed.checksum) catch |err| switch (err) {
error.PrepareQueryFailed => {
error.PrepareQueryFailed, error.StepFailed => {
stdout_writer.flush() catch |flush_err| std.log.err("failed to flush output before fatal: {}", .{flush_err});
sqlite_mod.fatalSqlWithContext(allocator, db, main_table, std.mem.span(c.sqlite3_errmsg(db)), stderr_writer);
},
Expand Down
2 changes: 1 addition & 1 deletion src/modes/repl.zig
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ fn execReplQuery(
parsed.sql_table, parsed.html_class,
parsed.null_value, use_table, parsed.checksum,
) catch |err| switch (err) {
error.PrepareQueryFailed => {
error.PrepareQueryFailed, error.StepFailed => {
stdout_writer.flush() catch |err_flush| std.log.err("failed to flush stdout: {}", .{err_flush});
printSqlError(allocator, db, main_table, std.mem.span(c.sqlite3_errmsg(db)), stderr_writer);
},
Expand Down
Loading