Merge branch 'main' into 374-improve-project-directory-structure

Author: SockworkOrange

CodeGenerator/Generators/QueriesGen.cs

@@ -183,15 +183,22 @@ private MemberDeclarationSyntax AddMethodDeclaration(Query query)
         var argInterface = ClassMember.Args.Name(query.Name);
         var returnInterface = ClassMember.Row.Name(query.Name);
 
-        return query.Cmd switch
+        try
         {
-            ":exec" => ((IExec)dbDriver).ExecDeclare(queryTextConstant, argInterface, query),
-            ":one" => ((IOne)dbDriver).OneDeclare(queryTextConstant, argInterface, returnInterface, query),
-            ":many" => ((IMany)dbDriver).ManyDeclare(queryTextConstant, argInterface, returnInterface, query),
-            ":execrows" => ((IExecRows)dbDriver).ExecRowsDeclare(queryTextConstant, argInterface, query),
-            ":execlastid" => ((IExecLastId)dbDriver).ExecLastIdDeclare(queryTextConstant, argInterface, query),
-            ":copyfrom" => ((ICopyFrom)dbDriver).CopyFromDeclare(queryTextConstant, argInterface, query),
-            _ => throw new NotSupportedException($"{query.Cmd} is not supported")
-        };
+            return query.Cmd switch
+            {
+                ":exec" => ((IExec)dbDriver).ExecDeclare(queryTextConstant, argInterface, query),
+                ":one" => ((IOne)dbDriver).OneDeclare(queryTextConstant, argInterface, returnInterface, query),
+                ":many" => ((IMany)dbDriver).ManyDeclare(queryTextConstant, argInterface, returnInterface, query),
+                ":execrows" => ((IExecRows)dbDriver).ExecRowsDeclare(queryTextConstant, argInterface, query),
+                ":execlastid" => ((IExecLastId)dbDriver).ExecLastIdDeclare(queryTextConstant, argInterface, query),
+                ":copyfrom" => ((ICopyFrom)dbDriver).CopyFromDeclare(queryTextConstant, argInterface, query),
+                _ => throw new NotSupportedException($"{query.Cmd} is not supported")
+            };
+        }
+        catch (Exception e)
+        {
+            throw new SystemException($"Failed to add method declaration for query: {query.Name}", e);
+        }
     }
 }

Drivers/DbDriver.cs

@@ -280,11 +280,11 @@ this method uses a few heuristics to assess the data type of the id column
     public string GetIdColumnType(Query query)
     {
         var tableColumns = Tables[query.InsertIntoTable.Schema][query.InsertIntoTable.Name].Columns;
-        var idColumn = tableColumns.First(c => c.Name.Equals("id", StringComparison.OrdinalIgnoreCase));
+        var idColumn = tableColumns.FirstOrDefault(c => c.Name.Equals("id", StringComparison.OrdinalIgnoreCase));
         if (idColumn is not null)
             return GetCsharpType(idColumn, query);
 
-        idColumn = tableColumns.First(c => c.Name.Contains("id", StringComparison.CurrentCultureIgnoreCase));
+        idColumn = tableColumns.FirstOrDefault(c => c.Name.Contains("id", StringComparison.CurrentCultureIgnoreCase));
         return GetCsharpType(idColumn ?? tableColumns[0], query);
     }
 

README.md

@@ -12,8 +12,8 @@ version: "2"
 plugins:
 - name: csharp
   wasm:
-    url: https://github.com/DaredevilOSS/sqlc-gen-csharp/releases/download/v0.22.1/sqlc-gen-csharp.wasm
-    sha256: 0b07a86555e7adf9aed7f5e4eeb5f89762e182420574edf81cf98173e0d80121
+    url: https://github.com/DaredevilOSS/sqlc-gen-csharp/releases/download/v0.22.2/sqlc-gen-csharp.wasm
+    sha256: 40af6dbb1447fb42f9e12d094a79e5adbfcb3669470cf7055896a179ee2e7427
 sql:
   # For PostgresSQL
   - schema: schema.sql

docs/02_Quickstart.md

@@ -4,8 +4,8 @@ version: "2"
 plugins:
 - name: csharp
   wasm:
-    url: https://github.com/DaredevilOSS/sqlc-gen-csharp/releases/download/v0.22.1/sqlc-gen-csharp.wasm
-    sha256: 0b07a86555e7adf9aed7f5e4eeb5f89762e182420574edf81cf98173e0d80121
+    url: https://github.com/DaredevilOSS/sqlc-gen-csharp/releases/download/v0.22.2/sqlc-gen-csharp.wasm
+    sha256: 40af6dbb1447fb42f9e12d094a79e5adbfcb3669470cf7055896a179ee2e7427
 sql:
   # For PostgresSQL
   - schema: schema.sql