From 594ee1353ebb6ec46d8a2652270b5f1f8c9f4410 Mon Sep 17 00:00:00 2001
From: Vincent Rischmann
Date: Fri, 1 Jan 2021 22:54:09 +0100
Subject: add a test that binds a string literal

---
 sqlite.zig | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'sqlite.zig')

diff --git a/sqlite.zig b/sqlite.zig
index 2f7db93..1489a0f 100644
--- a/sqlite.zig
+++ b/sqlite.zig
@@ -1289,6 +1289,26 @@ test "sqlite: insert bool and bind bool" {
     testing.expect(b.?);
 }
 
+test "sqlite: bind string literal" {
+    var db: Db = undefined;
+    try db.init(initOptions());
+    try addTestData(&db);
+
+    try db.exec("INSERT INTO article(id, data) VALUES(?, ?)", .{
+        @as(usize, 10),
+        "foobar",
+    });
+
+    const query = "SELECT id FROM article WHERE data = ?";
+
+    var stmt = try db.prepare(query);
+    defer stmt.deinit();
+
+    const b = try stmt.one(usize, .{}, .{"foobar"});
+    testing.expect(b != null);
+    testing.expectEqual(@as(usize, 10), b.?);
+}
+
 test "sqlite: statement reset" {
     var db: Db = undefined;
     try db.init(initOptions());
-- 
cgit v1.2.3


From a3aac9fb383e6d3d1f2ad81122443fa444123e26 Mon Sep 17 00:00:00 2001
From: Vincent Rischmann
Date: Sat, 2 Jan 2021 00:35:59 +0100
Subject: allow binding a pointer

---
 sqlite.zig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sqlite.zig')

diff --git a/sqlite.zig b/sqlite.zig
index 1489a0f..f40dd09 100644
--- a/sqlite.zig
+++ b/sqlite.zig
@@ -732,6 +732,7 @@ pub fn Statement(comptime opts: StatementOptions, comptime query: ParsedQuery) t
                     .Float, .ComptimeFloat => _ = c.sqlite3_bind_double(self.stmt, column, field),
                     .Bool => _ = c.sqlite3_bind_int64(self.stmt, column, @boolToInt(field)),
                     .Pointer => |ptr| switch (ptr.size) {
+                        .One => self.bindField(ptr.child, field_name, i, field.*),
                         else => @compileError("cannot bind field " ++ field_name ++ " of type " ++ @typeName(FieldType)),
                     },
                     .Array => |arr| {
-- 
cgit v1.2.3


From 23d05ac87f2a90e63dea406f0dd7f33895bb0b64 Mon Sep 17 00:00:00 2001
From: Vincent Rischmann
Date: Sat, 2 Jan 2021 00:40:58 +0100
Subject: stop special casing []const u8 and []u8, do it in the .Pointer switch
 arm

---
 sqlite.zig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'sqlite.zig')

diff --git a/sqlite.zig b/sqlite.zig
index f40dd09..3335309 100644
--- a/sqlite.zig
+++ b/sqlite.zig
@@ -722,9 +722,6 @@ pub fn Statement(comptime opts: StatementOptions, comptime query: ParsedQuery) t
             const column = i + 1;
 
             switch (FieldType) {
-                []const u8, []u8 => {
-                    _ = c.sqlite3_bind_text(self.stmt, column, field.ptr, @intCast(c_int, field.len), null);
-                },
                 Text => _ = c.sqlite3_bind_text(self.stmt, column, field.data.ptr, @intCast(c_int, field.data.len), null),
                 Blob => _ = c.sqlite3_bind_blob(self.stmt, column, field.data.ptr, @intCast(c_int, field.data.len), null),
                 else => switch (field_type_info) {
@@ -733,6 +730,12 @@ pub fn Statement(comptime opts: StatementOptions, comptime query: ParsedQuery) t
                     .Bool => _ = c.sqlite3_bind_int64(self.stmt, column, @boolToInt(field)),
                     .Pointer => |ptr| switch (ptr.size) {
                         .One => self.bindField(ptr.child, field_name, i, field.*),
+                        .Slice => switch (ptr.child) {
+                            u8 => {
+                                _ = c.sqlite3_bind_text(self.stmt, column, field.ptr, @intCast(c_int, field.len), null);
+                            },
+                            else => @compileError("cannot bind field " ++ field_name ++ " of type " ++ @typeName(FieldType)),
+                        },
                         else => @compileError("cannot bind field " ++ field_name ++ " of type " ++ @typeName(FieldType)),
                     },
                     .Array => |arr| {
-- 
cgit v1.2.3