summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vincent Rischmann2021-02-27 22:30:34 +0100
committerGravatar Vincent Rischmann2021-02-27 22:30:34 +0100
commitc494f2952c87b198551d6d3bc2081bbc216ced7d (patch)
tree9c8fc35d6e2658fa5812e31affaf0ddd1781395e
parentci: add a lint GitHub step (diff)
downloadzig-sqlite-c494f2952c87b198551d6d3bc2081bbc216ced7d.tar.gz
zig-sqlite-c494f2952c87b198551d6d3bc2081bbc216ced7d.tar.xz
zig-sqlite-c494f2952c87b198551d6d3bc2081bbc216ced7d.zip
simplify iterator usage in code and doc
-rw-r--r--README.md3
-rw-r--r--sqlite.zig15
2 files changed, 6 insertions, 12 deletions
diff --git a/README.md b/README.md
index 1551cc0..841adfe 100644
--- a/README.md
+++ b/README.md
@@ -279,8 +279,7 @@ var iter = try stmt.iterator(usize, .{
279 .age = 20, 279 .age = 20,
280}); 280});
281 281
282while (true) { 282while (try iter.next(.{})) |age| {
283 const age = (try iter.next(.{})) orelse break;
284 std.debug.print("age: {}\n", .{age}); 283 std.debug.print("age: {}\n", .{age});
285} 284}
286``` 285```
diff --git a/sqlite.zig b/sqlite.zig
index 7f9b837..d1ed96e 100644
--- a/sqlite.zig
+++ b/sqlite.zig
@@ -498,8 +498,7 @@ pub const QueryOptions = struct {
498/// defer stmt.deinit(); 498/// defer stmt.deinit();
499/// 499///
500/// var iter = try stmt.iterator(User, .{}); 500/// var iter = try stmt.iterator(User, .{});
501/// while (true) { 501/// while (try iter.next(.{})) |row| {
502/// const row: User = (try iter.next(.{})) orelse break;
503/// ... 502/// ...
504/// } 503/// }
505/// 504///
@@ -1066,8 +1065,7 @@ pub fn Statement(comptime opts: StatementOptions, comptime query: ParsedQuery) t
1066 /// Here is an example of how to use the iterator: 1065 /// Here is an example of how to use the iterator:
1067 /// 1066 ///
1068 /// var iter = try stmt.iterator(usize, .{}); 1067 /// var iter = try stmt.iterator(usize, .{});
1069 /// while (true) { 1068 /// while (try iter.next(.{})) |row| {
1070 /// const row = (try iter.next(.{})) orelse break;
1071 /// ... 1069 /// ...
1072 /// } 1070 /// }
1073 /// 1071 ///
@@ -1166,8 +1164,7 @@ pub fn Statement(comptime opts: StatementOptions, comptime query: ParsedQuery) t
1166 var iter = try self.iterator(Type, values); 1164 var iter = try self.iterator(Type, values);
1167 1165
1168 var rows = std.ArrayList(Type).init(allocator); 1166 var rows = std.ArrayList(Type).init(allocator);
1169 while (true) { 1167 while (try iter.nextAlloc(allocator, options)) |row| {
1170 const row = (try iter.nextAlloc(allocator, options)) orelse break;
1171 try rows.append(row); 1168 try rows.append(row);
1172 } 1169 }
1173 1170
@@ -1755,8 +1752,7 @@ test "sqlite: statement iterator" {
1755 var iter = try stmt2.iterator(RowType, .{}); 1752 var iter = try stmt2.iterator(RowType, .{});
1756 1753
1757 var rows = std.ArrayList(RowType).init(allocator); 1754 var rows = std.ArrayList(RowType).init(allocator);
1758 while (true) { 1755 while (try iter.next(.{})) |row| {
1759 const row = (try iter.next(.{})) orelse break;
1760 try rows.append(row); 1756 try rows.append(row);
1761 } 1757 }
1762 1758
@@ -1783,8 +1779,7 @@ test "sqlite: statement iterator" {
1783 var iter = try stmt2.iterator(RowType, .{}); 1779 var iter = try stmt2.iterator(RowType, .{});
1784 1780
1785 var rows = std.ArrayList(RowType).init(allocator); 1781 var rows = std.ArrayList(RowType).init(allocator);
1786 while (true) { 1782 while (try iter.nextAlloc(allocator, .{})) |row| {
1787 const row = (try iter.nextAlloc(allocator, .{})) orelse break;
1788 try rows.append(row); 1783 try rows.append(row);
1789 } 1784 }
1790 1785