From f6f24a557e6adc238935328333600f71eca6e0af Mon Sep 17 00:00:00 2001
From: jaina heartles <me@heartles.xyz>
Date: Wed, 27 Jul 2022 20:13:25 -0700
Subject: [PATCH] Fix compile errors on latest zig

---
 src/http/server.zig | 2 +-
 src/main/db.zig     | 4 ++--
 src/sql/lib.zig     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/http/server.zig b/src/http/server.zig
index c204658..c9095ef 100644
--- a/src/http/server.zig
+++ b/src/http/server.zig
@@ -64,5 +64,5 @@ fn handleError(writer: anytype, err: anyerror) !void {
         else => return err,
     };
 
-    try writer.print("HTTP/1.1 {} {s}\r\n\r\n", .{ @enumToInt(status), status.phrase() });
+    try writer.print("HTTP/1.1 {} {?s}\r\n\r\n", .{ @enumToInt(status), status.phrase() });
 }
diff --git a/src/main/db.zig b/src/main/db.zig
index 493bcd4..068c116 100644
--- a/src/main/db.zig
+++ b/src/main/db.zig
@@ -46,8 +46,8 @@ const Query = struct {
         comptime {
             const order_expr = if (self.order_by == null) "" else comptimePrint(" ORDER BY {s}", .{join(self.order_by.?, ", ")});
             const group_expr = if (self.group_by == null) "" else comptimePrint(" GROUP BY {s}", .{join(self.group_by.?, ", ")});
-            const limit_expr = if (self.limit == null) "" else comptimePrint(" LIMIT {}", .{self.limit});
-            const offset_expr = if (self.offset == null) "" else comptimePrint(" OFFSET {}", .{self.offset});
+            const limit_expr = if (self.limit == null) "" else comptimePrint(" LIMIT {?}", .{self.limit});
+            const offset_expr = if (self.offset == null) "" else comptimePrint(" OFFSET {?}", .{self.offset});
             return comptimePrint(
                 "SELECT {s} FROM {s} WHERE {s}{s}{s}{s}{s};",
                 .{ join(self.select, ", "), self.from, self.where, order_expr, group_expr, limit_expr, offset_expr },
diff --git a/src/sql/lib.zig b/src/sql/lib.zig
index 5a928d5..fca434c 100644
--- a/src/sql/lib.zig
+++ b/src/sql/lib.zig
@@ -146,7 +146,7 @@ pub const PreparedStmt = struct {
 
             else => |err| blk: {
                 std.log.debug("sql error {}: {s}", .{ err, c.sqlite3_errmsg(self.db) });
-                std.log.debug("Failed on SQL:\n==========\n{s}\n==========", .{self.getGeneratingSql()});
+                std.log.debug("Failed on SQL:\n==========\n{?s}\n==========", .{self.getGeneratingSql()});
                 break :blk error.UnknownError;
             },
         };