fix: adding LAST_INSERT_ID query only on :execlastid annotation

Author: SockworkOrange

Drivers/MySqlConnectorDriver.cs

@@ -283,9 +283,14 @@ public override string TransformQueryText(Query query)
         if (query.Cmd == ":copyfrom")
             return string.Empty;
 
-        var queryText = Options.UseDapper ? $"{query.Text}; SELECT LAST_INSERT_ID()" : query.Text;
         var counter = 0;
-        return QueryParamRegex().Replace(queryText, _ => "@" + query.Params[counter++].Column.Name);
+        var queryText = query.Text;
+        queryText = QueryParamRegex().Replace(queryText, _ => "@" + query.Params[counter++].Column.Name);
+        queryText = Options.UseDapper && query.Cmd == ":execlastid"
+            ? $"{queryText}; SELECT LAST_INSERT_ID()"
+            : queryText;
+
+        return queryText;
     }
 
     [GeneratedRegex(@"\?")]

examples/MySqlConnectorDapperExample/QuerySql.cs

@@ -69,7 +69,7 @@ public class GetAuthorArgs
         return await this.Transaction.Connection.QueryFirstOrDefaultAsync<GetAuthorRow?>(GetAuthorSql, queryParams, transaction: this.Transaction);
     }
 
-    private const string ListAuthorsSql = "SELECT id, name, bio  FROM  authors  ORDER  BY  name  LIMIT  @limit  OFFSET  @offset  ";  
+    private const string ListAuthorsSql = "SELECT id, name, bio FROM  authors  ORDER  BY  name  LIMIT  @limit  OFFSET  @offset  ";  
     public class ListAuthorsRow
     {
         public required int Id { get; init; }

examples/MySqlConnectorDapperLegacyExample/QuerySql.cs

@@ -225,7 +225,7 @@
       "filename": "query.sql"
     },
     {
-      "text": "SELECT id, name, bio \nFROM authors\nORDER BY name\nLIMIT ?2\nOFFSET ?1",
+      "text": "SELECT id, name, bio\nFROM authors\nORDER BY name\nLIMIT ?2 OFFSET ?1",
       "name": "ListAuthors",
       "cmd": ":many",
       "columns": [

examples/SqliteDapperExample/QuerySql.cs

@@ -70,7 +70,7 @@ public async Task<GetAuthorRow> GetAuthor(GetAuthorArgs args)
             return await this.Transaction.Connection.QueryFirstOrDefaultAsync<GetAuthorRow>(GetAuthorSql, queryParams, transaction: this.Transaction);
         }
 
-        private const string ListAuthorsSql = "SELECT id, name, bio  FROM  authors  ORDER  BY  name  LIMIT  @limit  OFFSET  @offset  ";  
+        private const string ListAuthorsSql = "SELECT id, name, bio FROM  authors  ORDER  BY  name  LIMIT  @limit  OFFSET  @offset  ";  
         public class ListAuthorsRow
         {
             public int Id { get; set; }

examples/SqliteDapperExample/request.json

@@ -225,7 +225,7 @@
       "filename": "query.sql"
     },
     {
-      "text": "SELECT id, name, bio \nFROM authors\nORDER BY name\nLIMIT ?2\nOFFSET ?1",
+      "text": "SELECT id, name, bio\nFROM authors\nORDER BY name\nLIMIT ?2 OFFSET ?1",
       "name": "ListAuthors",
       "cmd": ":many",
       "columns": [

examples/SqliteDapperExample/request.message

@@ -92,7 +92,7 @@ public static QuerySql WithTransaction(SqliteTransaction transaction)
         return null;
     }
 
-    private const string ListAuthorsSql = "SELECT id, name, bio  FROM  authors  ORDER  BY  name  LIMIT  @limit  OFFSET  @offset  ";  
+    private const string ListAuthorsSql = "SELECT id, name, bio FROM  authors  ORDER  BY  name  LIMIT  @limit  OFFSET  @offset  ";  
     public readonly record struct ListAuthorsRow(int Id, string Name, string? Bio);
     public readonly record struct ListAuthorsArgs(int Offset, int Limit);
     public async Task<List<ListAuthorsRow>> ListAuthors(ListAuthorsArgs args)