Expose prepared statements

.github/workflows/build-dependencies.yaml

@@ -30,7 +30,7 @@ jobs:
       - name: Generate bindings
         if: |
           steps.cache-rust-bindings.outputs.cache-hit != 'true'
-        run: ./generate-bindings.sh
+        run: ./generate-bindings.sh --remote https://github.com/tvandinther/libsql --commit add-missing-statement-functions
         shell: bash
 
       - name: Upload bindings

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "nefrob.vscode-just-syntax",
+        "ms-dotnettools.csharp",
+        "rust-lang.rust-analyzer"
+    ]
+}

Demo/Program.cs

@@ -7,20 +7,20 @@
 
 
 // Execute SQL statements directly
-var rs = await dbClient.Execute("CREATE TABLE IF NOT EXISTS `users` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT NOT NULL, `height` REAL, `data` BLOB)");
+var rs = await dbClient.Query("CREATE TABLE IF NOT EXISTS `users` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT NOT NULL, `height` REAL, `data` BLOB)");
 
 
 // Read the results by using the IResultSet interface
-var rs1 = await dbClient.Execute("INSERT INTO `users` (`name`, `height`, `data`) VALUES ('John Doe', 182.6, X'a4c7b8e21d3f50a6b9d2e8f7c1349a0b5c6d7e218349b6d012c71e8f9a093fed'), ('Jane Doe', 0.5, X'00')");
+var rs1 = await dbClient.Query("INSERT INTO `users` (`name`, `height`, `data`) VALUES ('John Doe', 182.6, X'a4c7b8e21d3f50a6b9d2e8f7c1349a0b5c6d7e218349b6d012c71e8f9a093fed'), ('Jane Doe', 0.5, X'00')");
 Console.WriteLine($"Inserted {rs1.RowsAffected} rows");
 Console.WriteLine($"Last inserted id: {rs1.LastInsertRowId}");
-var rs2 = await dbClient.Execute("SELECT `id`, `name`, `height`, `data` FROM `users`");
+var rs2 = await dbClient.Query("SELECT `id`, `name`, `height`, `data` FROM `users`");
 PrintTable(rs2);
 
 
 // Using positional arguments
 var searchString = "hn";
-var rs3 = await dbClient.Execute("SELECT `id`, `name`, `height`, `data` FROM `users` WHERE `name` LIKE concat('%', ?, '%')", searchString);
+var rs3 = await dbClient.Query("SELECT `id`, `name`, `height`, `data` FROM `users` WHERE `name` LIKE concat('%', ?, '%')", searchString);
 PrintTable(rs3);
 
 

Libsql.Client.Tests/EmbeddedReplicaTests.cs

@@ -25,7 +25,7 @@ public async Task CanConnectAndQueryReplicaDatabase()
     {
         await DatabaseClient.Sync();
 
-        var rs = await DatabaseClient.Execute("SELECT COUNT(*) FROM albums");
+        var rs = await DatabaseClient.Query("SELECT COUNT(*) FROM albums");
 
         var count = rs.Rows.First().First();
         var value = Assert.IsType<Integer>(count);

Libsql.Client.Tests/ExecuteTests.cs

@@ -0,0 +1,64 @@
+namespace Libsql.Client.Tests;
+
+public class ExecuteTests
+{
+    private readonly IDatabaseClient _db = DatabaseClient.Create().Result;
+
+    [Fact]
+    public async Task CreateTable_NoRowsAffected()
+    {
+        var rowsAffected = await _db.Execute("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT)");
+
+        Assert.Equal(0ul, rowsAffected);
+    }
+
+
+
+    [Fact]
+    public async Task RowsAffected_ReturnsOne_WhenRepeatedInserts()
+    {
+        await _db.Query("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT)");
+
+        for (int i = 0; i < 10; i++)
+        {
+            var rowsAffected = await _db.Execute("INSERT INTO `test` DEFAULT VALUES");
+            Assert.Equal(1ul, rowsAffected);
+        }
+    }
+
+    [Fact]
+    public async Task RowsAffected_ReturnsExpectedValue()
+    {
+        await _db.Query("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT)");
+
+        var rs = await _db.Query("INSERT INTO `test` DEFAULT VALUES");
+
+        Assert.Equal(1ul, rs.RowsAffected);
+    }
+
+    [Fact]
+    public async Task RowsAffected_ReturnsExectedValue_WhenMultipleUpdates()
+    {
+        await _db.Execute("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `value` INTEGER)");
+
+        for (int i = 0; i < 10; i++)
+        {
+            var rs = await _db.Execute("INSERT INTO `test` DEFAULT VALUES");
+        }
+
+        var rs2 = await _db.Query("UPDATE `test` SET `value` = 1");
+
+        Assert.Equal(10ul, rs2.RowsAffected);
+    }
+
+    [Fact]
+    public async Task Throws_WhenRowsReturned()
+    {
+        async Task action()
+        {
+            await _db.Execute("SELECT 1");
+        }
+
+        await Assert.ThrowsAsync<LibsqlException>(action);
+    }
+}

Libsql.Client.Tests/PositionalArgumentTests.cs

@@ -7,7 +7,7 @@ public class PositionalArgumentTests : IDisposable
     [Fact]
     public async Task SingleParameter()
     {
-        var rs = await _db.Execute("SELECT ?", 1);
+        var rs = await _db.Query("SELECT ?", 1);
         var row = rs.Rows.First();
         var value = row.First();
         var integer = Assert.IsType<Integer>(value);
@@ -18,7 +18,7 @@ public async Task SingleParameter()
     [Fact]
     public async Task MultipleParameters()
     {
-        var rs = await _db.Execute("SELECT ?, ?, ?", 1.0, "2", 3);
+        var rs = await _db.Query("SELECT ?, ?, ?", 1.0, "2", 3);
         var row = rs.Rows.First();
         var integer = Assert.IsType<Integer>(row.Skip(2).First());
 
@@ -28,7 +28,7 @@ public async Task MultipleParameters()
     [Fact]
     public async Task BindIntParameter()
     {
-        var rs = await _db.Execute("SELECT ?", 1);
+        var rs = await _db.Query("SELECT ?", 1);
         var row = rs.Rows.First();
         var value = row.First();
         var integer = Assert.IsType<Integer>(value);
@@ -39,7 +39,7 @@ public async Task BindIntParameter()
     [Fact]
     public async Task BindRealParameter()
     {
-        var rs = await _db.Execute("SELECT ?", 1.0);
+        var rs = await _db.Query("SELECT ?", 1.0);
         var row = rs.Rows.First();
         var value = row.First();
         var real = Assert.IsType<Real>(value);
@@ -50,7 +50,7 @@ public async Task BindRealParameter()
     [Fact]
     public async Task BindStringParameter()
     {
-        var rs = await _db.Execute("SELECT ?", "hello");
+        var rs = await _db.Query("SELECT ?", "hello");
         var row = rs.Rows.First();
         var value = row.First();
         var text = Assert.IsType<Text>(value);
@@ -61,7 +61,7 @@ public async Task BindStringParameter()
     [Fact]
     public async Task BindSingleNullParameter()
     {
-        var rs = await _db.Execute("SELECT ?", null);
+        var rs = await _db.Query("SELECT ?", null);
         var row = rs.Rows.First();
         var value = row.First();
         Assert.IsType<Null>(value);
@@ -70,7 +70,7 @@ public async Task BindSingleNullParameter()
     [Fact]
     public async Task BindMultipleParametersWithANull()
     {
-        var rs = await _db.Execute("SELECT ?, ?, ?", 1, null, 3);
+        var rs = await _db.Query("SELECT ?, ?, ?", 1, null, 3);
         var row = rs.Rows.First();
         var value = row.Skip(1).First();
         Assert.IsType<Null>(value);
@@ -79,7 +79,7 @@ public async Task BindMultipleParametersWithANull()
     [Fact]
     public async Task BindBlobParameter()
     {
-        var rs = await _db.Execute("SELECT ?", new byte[] { 1, 2, 3 });
+        var rs = await _db.Query("SELECT ?", new byte[] { 1, 2, 3 });
         var row = rs.Rows.First();
         var value = row.First();
         var blob = Assert.IsType<Blob>(value);

Libsql.Client.Tests/RemoteTests.cs

@@ -22,7 +22,7 @@ public RemoteTests(DatabaseContainer fixture)
     [SkippableFact]
     public async Task CanConnectAndQueryRemoteDatabase()
     {
-        var rs = await DatabaseClient.Execute("SELECT COUNT(*) FROM tracks");
+        var rs = await DatabaseClient.Query("SELECT COUNT(*) FROM tracks");
 
         var count = rs.Rows.First().First();
         var value = Assert.IsType<Integer>(count);

Libsql.Client.Tests/ResultSetTests.cs

@@ -7,7 +7,7 @@ public class ResultSetTests : IDisposable
     [Fact]
     public async Task Columns_EmptyEnumerable_WhenNonQuery()
     {
-        var rs = await _db.Execute("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT)");
+        var rs = await _db.Query("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT)");
         var columns = rs.Columns;
 
         Assert.Empty(columns);
@@ -16,7 +16,7 @@ public async Task Columns_EmptyEnumerable_WhenNonQuery()
     [Fact]
     public async Task Columns_HasLength_WhenNotEmpty()
     {
-        var rs = await _db.Execute("SELECT 1, 2, 3");
+        var rs = await _db.Query("SELECT 1, 2, 3");
         var columns = rs.Columns;
 
         Assert.Equal(3, columns.Count());
@@ -25,7 +25,7 @@ public async Task Columns_HasLength_WhenNotEmpty()
     [Fact]
     public async Task Columns_NamesAreMarshalled()
     {
-        var rs = await _db.Execute("SELECT 1 AS [column_one]");
+        var rs = await _db.Query("SELECT 1 AS [column_one]");
         var columns = rs.Columns;
 
         Assert.Single(columns);
@@ -35,20 +35,28 @@ public async Task Columns_NamesAreMarshalled()
     [Fact]
     public async Task Columns_NamesAreMarshalled_WhenSeveral()
     {
-        var rs = await _db.Execute("SELECT 1 AS [column_one], 2 AS [column_two]");
+        var rs = await _db.Query("SELECT 1 AS [column_one], 2 AS [column_two]");
         var columns = rs.Columns;
 
         Assert.Equal(2, columns.Count());
         Assert.Equal("column_one", columns.First());
         Assert.Equal("column_two", columns.Last());
     }
 
+    [Fact]
+    public async Task LastInsertRowId_Zero_WhenNonQuery()
+    {
+        var rs = await _db.Query("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT)");
+
+        Assert.Equal(0, rs.LastInsertRowId);
+    }
+
     [Fact]
     public async Task LastInsertRowId_ReturnsExpectedValue()
     {
         await _db.Execute("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT)");
 
-        var rs = await _db.Execute("INSERT INTO `test` DEFAULT VALUES");
+        var rs = await _db.Query("INSERT INTO `test` DEFAULT VALUES");
 
         Assert.Equal(1, rs.LastInsertRowId);
     }
@@ -61,23 +69,31 @@ public async Task LastInsertRowId_ReturnsExpectedValue_WhenMultipleInserts()
         IResultSet rs;
         for (int i = 0; i < 10; i++)
         {
-            rs = await _db.Execute("INSERT INTO `test` DEFAULT VALUES");
+            rs = await _db.Query("INSERT INTO `test` DEFAULT VALUES");
             Assert.Equal(i + 1, rs.LastInsertRowId);
         }
     }
 
     [Fact]
-    public async Task Changes_ReturnsExpectedValue()
+    public async Task RowsAffected_Zero_WhenNonQuery()
+    {
+        var rs = await _db.Query("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT)");
+
+        Assert.Equal(0ul, rs.RowsAffected);
+    }
+
+    [Fact]
+    public async Task RowsAffected_ReturnsExpectedValue()
     {
         await _db.Execute("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT)");
 
-        var rs = await _db.Execute("INSERT INTO `test` DEFAULT VALUES");
+        var rs = await _db.Query("INSERT INTO `test` DEFAULT VALUES");
 
         Assert.Equal(1ul, rs.RowsAffected);
     }
 
     [Fact]
-    public async Task Changes_ReturnsExectedValue_WhenMultipleUpdates()
+    public async Task RowsAffected_ReturnsExectedValue_WhenMultipleUpdates()
     {
         await _db.Execute("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `value` INTEGER)");
 
@@ -86,7 +102,7 @@ public async Task Changes_ReturnsExectedValue_WhenMultipleUpdates()
             var rs = await _db.Execute("INSERT INTO `test` DEFAULT VALUES");
         }
 
-        var rs2 = await _db.Execute("UPDATE `test` SET `value` = 1");
+        var rs2 = await _db.Query("UPDATE `test` SET `value` = 1");
 
         Assert.Equal(10ul, rs2.RowsAffected);
     }

Libsql.Client.Tests/RowsTests.cs

@@ -3,11 +3,53 @@
 public class RowsTests : IDisposable
 {
     private readonly IDatabaseClient _db = DatabaseClient.Create().Result;
+
+    [Fact]
+    public async Task IteratedRows_Throws_WhenCreate()
+    {
+        async Task<IEnumerable<IEnumerable<Value>>> Action() {
+            var rs = await _db.Query("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT)");
+
+            return rs.Rows.ToList();
+        }
+
+        await Assert.ThrowsAsync<LibsqlException>(Action);
+    }
+
+    [Fact]
+    public async Task IteratedRows_Throws_WhenCreateIfNotExists()
+    {
+        var rs = await _db.Query("CREATE TABLE IF NOT EXISTS `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT)");
+
+        Assert.Empty(rs.Rows);
+    }
+
+    [Fact]
+    public async Task Rows_Empty_WhenInsert()
+    {
+        await _db.Query("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT)");
+
+        var rs = await _db.Query("INSERT INTO `test` (`name`) VALUES ('libsql')");
+
+        Assert.Empty(rs.Rows);
+    }
+
+    [Fact]
+    public async Task Rows_Empty_WhenUpdate()
+    {
+        await _db.Query("CREATE TABLE `test` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT)");
+        var rs = await _db.Query("INSERT INTO `test` (`name`) VALUES ('libsql')");
+        Assert.Equal(1ul, rs.RowsAffected);
+
+        var rs2 = await _db.Query("UPDATE `test` SET `name` = 'libsql2' WHERE id = 1");
+
+        Assert.Empty(rs2.Rows);
+    }
 
     [Fact]
     public async Task Rows_WhenEmpty()
     {
-        var rs = await _db.Execute("SELECT 1 WHERE 1 = 0");
+        var rs = await _db.Query("SELECT 1 WHERE 1 = 0");
         var rows = rs.Rows;
 
         Assert.Empty(rows);
@@ -16,7 +58,7 @@ public async Task Rows_WhenEmpty()
     [Fact]
     public async Task Rows_CanIterateTwice()
     {
-        var rs = await _db.Execute("SELECT 1");
+        var rs = await _db.Query("SELECT 1");
 
         var firstArray = rs.Rows.ToArray();
         var secondArray = rs.Rows.ToArray();
@@ -27,7 +69,7 @@ public async Task Rows_CanIterateTwice()
     [Fact]
     public async Task Rows_CanPartiallyIterateTwice()
     {
-        var rs = await _db.Execute("SELECT 1 UNION SELECT 2 UNION SELECT 3");
+        var rs = await _db.Query("SELECT 1 UNION SELECT 2 UNION SELECT 3");
 
         var firstArray = rs.Rows.Take(2).ToArray();
         var secondArray = rs.Rows.ToArray();