Skip to content

fix: panic on empty no-op query (Issue #228) #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vmvarela merged 2 commits into from
Sep 12, 2026
Merged

fix: panic on empty no-op query (Issue #228) #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8944c3f
fix: panic on empty no-op query (Issue #228)
vmvarela Sep 12, 2026
c27fb83
shrink: collapse null guard to one line
vmvarela Sep 12, 2026
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
6 changes: 3 additions & 3 deletions src/format.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@ pub const OutputWriter = struct {
/// XML: writes the XML declaration and opening root element
/// CSV/TSV: writes an optional header row (when opts.header = true)
///
/// Pre: stmt is a valid prepared statement; col_count = sqlite3_column_count(stmt)
/// Pre: stmt is a valid prepared statement or null when query compiled to no statement (e.g. ";"); col_count = 0 in that case
pub fn begin(
self: *OutputWriter,
allocator: std.mem.Allocator,
stmt: *c.sqlite3_stmt,
stmt: ?*c.sqlite3_stmt,
col_count: c_int,
writer: *std.Io.Writer,
) !void {
Expand All @@ -166,7 +166,7 @@ pub const OutputWriter = struct {
},
.csv, .tsv => {
if (self.opts.header and col_count > 0)
try csvPrintHeaderRow(stmt, col_count, writer, self.csvDelimiter());
try csvPrintHeaderRow(stmt.?, col_count, writer, self.csvDelimiter());
},
.markdown => unreachable, // handled before OutputWriter in execQuery
}
Expand Down
15 changes: 10 additions & 5 deletions src/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,15 @@ fn writeWithChecksum(
fn writeStreaming(
out_writer: *format.OutputWriter,
allocator: std.mem.Allocator,
stmt: *c.sqlite3_stmt,
stmt: ?*c.sqlite3_stmt,
col_count: c_int,
writer: *std.Io.Writer,
) !void {
try out_writer.begin(allocator, stmt, col_count, writer);
while (c.sqlite3_step(stmt) == c.SQLITE_ROW) {
try out_writer.writeRow(stmt, writer);
if (stmt) |s| {
while (c.sqlite3_step(s) == c.SQLITE_ROW) {
try out_writer.writeRow(s, writer);
}
}
try out_writer.end(writer);
}
Expand Down Expand Up @@ -258,7 +260,10 @@ pub fn execQuery(
return error.PrepareQueryFailed;
defer _ = c.sqlite3_finalize(stmt);

const col_count = c.sqlite3_column_count(stmt);
// ponytail: prepare ";" succeeds with NULL stmt — empty result, no panic
if (stmt == null and (use_table or output_format == .markdown)) return;

const col_count: c_int = if (stmt) |s| c.sqlite3_column_count(s) else 0;

// Table mode: buffer all rows and print a formatted table
if (use_table) {
Expand All @@ -282,7 +287,7 @@ pub fn execQuery(
});
defer out_writer.deinit(allocator);

try writeWithChecksum(allocator, writer, stderr_writer, checksum, .{ &out_writer, allocator, stmt.?, col_count }, writeStreaming);
try writeWithChecksum(allocator, writer, stderr_writer, checksum, .{ &out_writer, allocator, stmt, col_count }, writeStreaming);
}

/// loadInput(allocator, io, db, table_name, input_format, reader, parsed, stderr_writer) → usize
Expand Down
Loading