Refactoring

Author: Giorgi

DuckDB.NET.Data/DuckDBTransaction.cs

@@ -9,9 +9,9 @@ public class DuckDBTransaction : DbTransaction
 {
     private bool finished = false;
     private readonly DuckDBConnection connection;
-        
+
     protected override DbConnection DbConnection => connection;
-        
+
     public override IsolationLevel IsolationLevel { get; }
 
     public DuckDBTransaction(DuckDBConnection connection, IsolationLevel isolationLevel)
@@ -41,17 +41,21 @@ private void FinishTransaction(string finalizer)
         try
         {
             connection.ExecuteNonQuery(finalizer);
-            connection.Transaction = null;
-            finished = true;
+            Cleanup();
         }
         // If something goes wrong with the transaction, to match the
         // transaction's internal duckdb state it should still be considered
         // finished and should no longer be used
         catch (DuckDBException ex) when (ex.ErrorType == Native.DuckDBErrorType.Transaction)
+        {
+            Cleanup();
+            throw;
+        }
+
+        void Cleanup()
         {
             connection.Transaction = null;
             finished = true;
-            throw;
         }
     }
 

DuckDB.NET.Data/PreparedStatement/ClrToDuckDBConverter.cs

@@ -163,7 +163,7 @@ private static DuckDBValue DecimalToDuckDBValue(decimal value)
     {
         var bits = decimal.GetBits(value);
         var scale = (byte)((bits[3] >> 16) & 0x7F);
-        
+
         var power = Math.Pow(10, scale);
 
         var integralPart = decimal.Truncate(value);
@@ -173,7 +173,7 @@ private static DuckDBValue DecimalToDuckDBValue(decimal value)
 
         result += new BigInteger(decimal.Multiply(fractionalPart, (decimal)power));
 
-        int width = Math.Max(scale, result.IsZero ? 1 : (int)Math.Floor(BigInteger.Log10(BigInteger.Abs(result))) + 1);
+        var width = integralPart == 0 ? scale + 1 : (int)Math.Floor(BigInteger.Log10(BigInteger.Abs(result))) + 1;
 
         return NativeMethods.Value.DuckDBCreateDecimal(new DuckDBDecimal((byte)width, scale, new DuckDBHugeInt(result)));
     }