Refactoring

Author: Giorgi

DuckDB.NET.Data/Internal/Reader/DateTimeVectorDataReader.cs

@@ -80,27 +80,15 @@ protected override T GetValidValue<T>(ulong offset, Type targetType)
             return (T)(object)timeTz;
         }
 
-        if (DuckDBType == DuckDBType.Timestamp || DuckDBType == DuckDBType.TimestampTz)
-        {
-            return ReadTimestamp<T>(offset, targetType);
-        }
-
-        if (DuckDBType == DuckDBType.TimestampS)
-        {
-            return ReadTimestamp<T>(offset, targetType, 1000000);
-        }
-
-        if (DuckDBType == DuckDBType.TimestampMs)
-        {
-            return ReadTimestamp<T>(offset, targetType, 1000);
-        }
-
-        if (DuckDBType == DuckDBType.TimestampNs)
+        return DuckDBType switch
         {
-            return ReadTimestamp<T>(offset, targetType, 1, 1000);
-        }
-
-        return base.GetValidValue<T>(offset, targetType);
+            DuckDBType.Timestamp => ReadTimestamp<T>(offset, targetType),
+            DuckDBType.TimestampTz => ReadTimestamp<T>(offset, targetType),
+            DuckDBType.TimestampS => ReadTimestamp<T>(offset, targetType, 1000000),
+            DuckDBType.TimestampMs => ReadTimestamp<T>(offset, targetType, 1000),
+            DuckDBType.TimestampNs => ReadTimestamp<T>(offset, targetType, 1, 1000),
+            _ => base.GetValidValue<T>(offset, targetType)
+        };
     }
 
     private T ReadTimestamp<T>(ulong offset, Type targetType, int factor = 1, int divisor = 1)

DuckDB.NET.Data/Internal/Reader/ListVectorDataReader.cs

@@ -93,14 +93,7 @@ private unsafe object GetList(Type returnType, ulong listOffset, ulong length)
             }
             else
             {
-                if (allowNulls)
-                {
-                    list.Add(null);
-                }
-                else
-                {
-                    throw new InvalidCastException("The list contains null value");
-                }
+                list.Add(allowNulls ? null : throw new InvalidCastException("The list contains null value"));
             }
         }
 
@@ -118,14 +111,7 @@ List<T> BuildList<T>(List<T> result)
                 }
                 else
                 {
-                    if (allowNulls)
-                    {
-                        result.Add(default!);
-                    }
-                    else
-                    {
-                        throw new InvalidCastException("The list contains null value");
-                    }
+                    result.Add(allowNulls ? default! : throw new InvalidCastException("The list contains null value"));
                 }
             }
             return result;

DuckDB.NET.Test/DuckDBConnectionTests.cs

@@ -171,8 +171,11 @@ public async Task NoExceptionOnDoubleDispose()
         await using var duckDBConnection = new DuckDBConnection(dbInfo.ConnectionString);
         await duckDBConnection.OpenAsync();
 
-        await duckDBConnection.DisposeAsync();
-        await duckDBConnection.DisposeAsync();
+        await duckDBConnection.Invoking(async connection =>
+        {
+            await connection.DisposeAsync();
+            await connection.DisposeAsync();
+        }).Should().NotThrowAsync();
     }
 
     [Fact]
@@ -183,8 +186,11 @@ public async Task NoExceptionCloseThenDispose()
         await using var duckDBConnection = new DuckDBConnection(dbInfo.ConnectionString);
         await duckDBConnection.OpenAsync();
 
-        await duckDBConnection.CloseAsync();
-        await duckDBConnection.DisposeAsync();
+        await duckDBConnection.Invoking(async connection =>
+        {
+            await connection.CloseAsync();
+            await connection.DisposeAsync();
+        }).Should().NotThrowAsync();
     }
 
     [Fact]