Bring Query message up to latest thinking

2 files changed, 32 insertions, 20 deletions

diff --git a/src/conn/conn.zig b/src/conn/conn.zig
index db5084c..9d5a8e1 100644
--- a/src/conn/conn.zig
+++ b/src/conn/conn.zig
@@ -184,21 +184,34 @@ pub const MultiResultIterator = struct {
 
     // returns the next result iterator, or null if we've reached the end of the results
     pub fn next_result(self: *MultiResultIterator) !?*ResultIterator {
-        if (self.cri != null) {
-            try self.cri.?.skip_to_end();
-        }
+        _ = self;
+        // if (self.cri != null) {
+        //     try self.cri.?.skip_to_end();
+        // }
+        return error.NotImplemented;
     }
 
     fn receive_message(self: *MultiResultIterator) !BackendMessage {
-        var msg = try self.conn.receive_message();
-        switch (msg) {}
-        return msg;
+        _ = self;
+        // var msg = try self.conn.receive_message();
+        // switch (msg) {}
+        // return msg;
+        return error.NotImplemented;
     }
 };
 
-// pub fn exec(self: *Conn) {
-
-// }
+// Execute some SQL using postgres' simple query protocol
+pub fn exec(self: *Conn, query: []const u8) !ResultIterator {
+    const qr = proto.Query{
+        .query = query,
+    };
+    var writer = self.stream.writer();
+    try qr.write(self.allocator, writer);
+    // TODO multi result iterator since query could contain multiple queries
+    return ResultIterator{
+        .conn = self,
+    };
+}
 
 test "connect unix" {
     // must have a local postgres runnning
diff --git a/src/proto/query.zig b/src/proto/query.zig
index 9f238fc..075e1e0 100644
--- a/src/proto/query.zig
+++ b/src/proto/query.zig
@@ -9,31 +9,31 @@ pub const Tag: u8 = 'Q';
 
 const Query = @This();
 
-string: []const u8,
-owned: bool = false,
+buf: ?[]const u8 = null,
+query: []const u8,
 
-pub fn read(a: std.mem.Allocator, b: []const u8) !Query {
+pub fn read(_: std.mem.Allocator, buf: []const u8) !Query {
     return .{
-        .string = try a.dupe(u8, b[0..(b.len-1)]), // Drop the null terminator
-        .owned = true,
+        .buf = buf,
+        .query = buf[0..(buf.len-1)],
     };
 }
 
 pub fn write(self: Query, _: std.mem.Allocator, stream_writer: anytype) !void {
     try stream_writer.writeByte(Tag);
-    try stream_writer.writeIntBig(u32, @as(u32, @intCast(self.string.len+5)));
-    try stream_writer.writeAll(self.string);
+    try stream_writer.writeIntBig(u32, @as(u32, @intCast(self.query.len+5)));
+    try stream_writer.writeAll(self.query);
     try stream_writer.writeByte(0);
 }
 
 pub fn deinit(self: *Query, a: std.mem.Allocator) void {
-    if (self.owned) a.free(self.string);
+    if (self.buf != null) a.free(self.buf.?);
 }
 
 test "round trip" {
     const allocator = std.testing.allocator;
     var sm = Query{
-        .string = "Hello",
+        .query = "Hello",
     };
     defer sm.deinit(allocator);
 
@@ -47,9 +47,8 @@ test "round trip" {
     try std.testing.expectEqual(Tag, tag);
     const len = try reader.readIntBig(u32);
     const buf = try allocator.alloc(u8, len - 4);
-    defer allocator.free(buf);
     try reader.readNoEof(buf);
     var sm2 = try Query.read(allocator, buf);
     defer sm2.deinit(allocator);
-    try std.testing.expectEqualStrings("Hello", sm2.string);
+    try std.testing.expectEqualStrings("Hello", sm2.query);
 }