Merge b09a31f into b7f3e52

Giorgi · Aug 20, 2022 · 6bda227 · 6bda227
2 parents b7f3e52 + b09a31f
commit 6bda227
Show file tree

Hide file tree

Showing 10 changed files with 595 additions and 21 deletions.
diff --git a/DuckDB.NET.Data/DuckDBDataReader.cs b/DuckDB.NET.Data/DuckDBDataReader.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Numerics;
 using System.Runtime.InteropServices;
+using DuckDB.NET.Data.Types;
 
 namespace DuckDB.NET.Data
 {
@@ -61,10 +62,7 @@ public override string GetDataTypeName(int ordinal)
         }
 
         public override DateTime GetDateTime(int ordinal)
-        {
-            var text = GetString(ordinal);
-            return DateTime.Parse(text, null, DateTimeStyles.RoundtripKind);
-        }
+            => Types.DuckDBTimestamp.Load(queryResult, ordinal, currentRow);
 
         public override decimal GetDecimal(int ordinal)
         {

diff --git a/DuckDB.NET.Data/DuckDBParameter.cs b/DuckDB.NET.Data/DuckDBParameter.cs
@@ -1,6 +1,8 @@
+using System;
 using System.Data;
 using System.Data.Common;
 using DuckDB.NET.Data.Internal;
+using DuckDB.NET.Data.Types;
 
 namespace DuckDB.NET.Data;
 
@@ -47,7 +49,7 @@ public DuckDBParameter()
 
     }
 
-    public DuckDBParameter(string name, DbType type, object value)
+    private DuckDBParameter(string name, DbType type, object value)
     {
         parameterName = name;
         dbType = type;
@@ -146,6 +148,16 @@ public DuckDBParameter(string name, string value)
     {
     }
 
+    public DuckDBParameter(string name, DateTime value)
+        : this(name, DbType.DateTime, Types.DuckDBTimestamp.FromDateTime(value))
+    {
+    }
+
+    public DuckDBParameter(DateTime value)
+        : this(DbType.DateTime, Types.DuckDBTimestamp.FromDateTime(value))
+    {
+    }
+
     public override void ResetDbType()
     {
         DbType = DbType.String;

diff --git a/DuckDB.NET.Data/Internal/PreparedStatement.cs b/DuckDB.NET.Data/Internal/PreparedStatement.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using DuckDB.NET.Data.Types;
 
 namespace DuckDB.NET.Data;
 
@@ -80,12 +81,21 @@ private static void BindParameter(DuckDBPreparedStatement preparedStatement, lon
             return;
         }
 
-        if (!Binders.TryGetValue(parameter.DbType, out var binder))
+        DuckDBState result;
+        if (parameter.Value is IDuckDBParameterValue parameterValue)
         {
-            throw new InvalidOperationException($"Unable to bind value of type {parameter.DbType}.");
+            result = parameterValue.Bind(preparedStatement, index);
+        }
+        else
+        {
+            if (!Binders.TryGetValue(parameter.DbType, out var binder))
+            {
+                throw new InvalidOperationException($"Unable to bind value of type {parameter.DbType}.");
+            }
+
+            result = binder(preparedStatement, index, parameter.Value);
         }
 
-        var result = binder(preparedStatement, index, parameter.Value);
         if (!result.IsSuccess())
         {
             var errorMessage = NativeMethods.PreparedStatements.DuckDBPrepareError(preparedStatement).ToManagedString(false);

diff --git a/DuckDB.NET.Data/Types/DuckDBTimestamp.cs b/DuckDB.NET.Data/Types/DuckDBTimestamp.cs
@@ -0,0 +1,122 @@
+using System;
+
+namespace DuckDB.NET.Data.Types;
+
+internal class DuckDBTimestamp : IDuckDBParameterValue
+{
+    private readonly DuckDBTimestampStruct nativeValue;
+
+    private DuckDBTimestamp(DuckDBTimestampStruct native)
+    {
+        nativeValue = native;
+    }
+
+    public DuckDBState Bind(DuckDBPreparedStatement preparedStatement, long index)
+    {
+        return NativeMethods.PreparedStatements.DuckDBParamType(preparedStatement, index) switch
+        {
+            DuckDBType.DuckdbTypeDate => BindDate(preparedStatement, index),
+            DuckDBType.DuckdbTypeTime => BindTime(preparedStatement, index),
+            DuckDBType.DuckdbTypeTimestamp => BindTimestamp(preparedStatement, index),
+            DuckDBType.DuckdbTypeInvalid => BindTimestamp(preparedStatement, index),
+            _ => throw new ArgumentOutOfRangeException("Unexpected target data type.")
+        };
+    }
+
+    private DuckDBState BindDate(DuckDBPreparedStatement preparedStatement, long index)
+    {
+        var date = NativeMethods.DateTime.DuckDBToDate(nativeValue.Date);
+        return NativeMethods.PreparedStatements.DuckDBBindDate(preparedStatement, index, date);
+    }
+
+    private DuckDBState BindTime(DuckDBPreparedStatement preparedStatement, long index)
+    {
+        var time = NativeMethods.DateTime.DuckDBToTime(nativeValue.Time);
+        return NativeMethods.PreparedStatements.DuckDBBindTime(preparedStatement, index, time);
+    }
+
+    private DuckDBState BindTimestamp(DuckDBPreparedStatement preparedStatement, long index)
+    {
+        var timestamp = NativeMethods.DateTime.DuckDBToTimestamp(nativeValue);
+        return NativeMethods.PreparedStatements.DuckDBBindTimestamp(preparedStatement, index, timestamp);
+    }
+
+    public static DateTime Load(DuckDBResult result, long col, long row)
+    {
+        return (NativeMethods.Query.DuckDBColumnType(result, col) switch
+        {
+            DuckDBType.DuckdbTypeTimestamp => LoadTimestamp(result, col, row),
+            DuckDBType.DuckdbTypeTime => LoadTime(result, col, row),
+            DuckDBType.DuckdbTypeDate => LoadDate(result, col, row),
+            _ => throw new ArgumentOutOfRangeException("Unexpected data type.")
+        }).ToDateTime();
+    }
+
+    private static DuckDBTimestamp LoadTimestamp(DuckDBResult result, long col, long row)
+    {
+        var timestamp = NativeMethods.Types.DuckDbValueTimestamp(result, col, row);
+        var timestampStruct = NativeMethods.DateTime.DuckDBFromTimestamp(timestamp);
+        return new DuckDBTimestamp(timestampStruct);
+    }
+
+    private static DuckDBTimestamp LoadTime(DuckDBResult result, long col, long row)
+    {
+        var time = NativeMethods.Types.DuckDbValueTime(result, col, row);
+        var timeStruct = NativeMethods.DateTime.DuckDBFromTime(time);
+        var timestamp = new DuckDBTimestampStruct
+        {
+            Time = timeStruct,
+            Date = new DuckDBDateStruct()
+        };
+        return new DuckDBTimestamp(timestamp);
+    }
+
+    private static DuckDBTimestamp LoadDate(DuckDBResult result, long col, long row)
+    {
+        var date = NativeMethods.Types.DuckDbValueDate(result, col, row);
+        var dateStruct = NativeMethods.DateTime.DuckDBFromDate(date);
+        var timestamp = new DuckDBTimestampStruct
+        {
+            Date = dateStruct,
+            Time = new DuckDBTimeStruct()
+        };
+        return new DuckDBTimestamp(timestamp);
+    }
+
+    public DateTime ToDateTime()
+    {
+        return new DateTime(
+            Math.Max(nativeValue.Date.Year, DateTime.MinValue.Year),
+            Math.Max(nativeValue.Date.Month, DateTime.MinValue.Month),
+            Math.Max(nativeValue.Date.Day, DateTime.MinValue.Day),
+            Math.Max(nativeValue.Time.Hour, DateTime.MinValue.Hour),
+            Math.Max(nativeValue.Time.Min, DateTime.MinValue.Minute),
+            Math.Max(nativeValue.Time.Sec, DateTime.MinValue.Second),
+            Math.Max(nativeValue.Time.Msec, DateTime.MinValue.Millisecond)
+        );
+    }
+
+    public static DuckDBTimestamp FromDateTime(DateTime dateTime)
+    {
+        var nativeDate = new DuckDBDateStruct
+        {
+            Year = dateTime.Year,
+            Month = (byte)dateTime.Month,
+            Day = (byte)dateTime.Day
+        };
+
+        var nativeTime = new DuckDBTimeStruct
+        {
+            Hour = (byte)dateTime.Hour,
+            Min = (byte)dateTime.Minute,
+            Sec = (byte)dateTime.Second,
+            Msec = dateTime.Millisecond
+        };
+
+        var value = new DuckDBTimestampStruct {
+            Date = nativeDate,
+            Time = nativeTime
+        };
+        return new DuckDBTimestamp(value);
+    }
+}
diff --git a/DuckDB.NET.Data/Types/IDuckDBParameterValue.cs b/DuckDB.NET.Data/Types/IDuckDBParameterValue.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace DuckDB.NET.Data.Types;
+
+internal interface IDuckDBParameterValue
+{
+    DuckDBState Bind(DuckDBPreparedStatement preparedStatement, long index);
+}
diff --git a/DuckDB.NET.Test/DateTimeTests/DateTests.cs b/DuckDB.NET.Test/DateTimeTests/DateTests.cs
@@ -0,0 +1,118 @@
+using System;
+using DuckDB.NET.Data;
+using FluentAssertions;
+using Xunit;
+
+namespace DuckDB.NET.Test.DateTimeTests;
+
+public class DateTests
+{
+    [Theory]
+    [InlineData(1992, 09, 20)]
+    [InlineData(2022, 05, 04)]
+    [InlineData(2022, 04, 05)]
+    [InlineData(1, 1, 1)]
+    public void QueryScalarTest(int year, int mon, int day)
+    {
+        using var connection = new DuckDBConnection(DuckDBConnectionStringBuilder.InMemoryConnectionString);
+        connection.Open();
+
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = $"SELECT DATE '{year}-{mon}-{day}';";
+
+        var scalar = cmd.ExecuteScalar();
+
+        scalar.Should().BeOfType<DateTime>();
+
+        var dateOnly = (DateTime) scalar;
+
+        dateOnly.Year.Should().Be(year);
+        dateOnly.Month.Should().Be(mon);
+        dateOnly.Day.Should().Be(day);
+        dateOnly.Hour.Should().Be(DateTime.MinValue.Hour);
+        dateOnly.Minute.Should().Be(DateTime.MinValue.Minute);
+        dateOnly.Second.Should().Be(DateTime.MinValue.Second);
+        dateOnly.Minute.Should().Be(DateTime.MinValue.Millisecond);
+    }
+
+    [Theory]
+    [InlineData(1992, 09, 20)]
+    [InlineData(2022, 05, 04)]
+    [InlineData(2022, 04, 05)]
+    [InlineData(1, 1, 1)]
+    public void BindParamTest(int year, int mon, int day)
+    {
+        using var connection = new DuckDBConnection(DuckDBConnectionStringBuilder.InMemoryConnectionString);
+        connection.Open();
+
+        var expectedValue = new DateTime(year, mon, day);
+
+        using var cmd = connection.CreateCommand();
+        cmd.CommandText = "SELECT ?::DATE;";
+        cmd.Parameters.Add(new DuckDBParameter(expectedValue));
+
+        var scalar = cmd.ExecuteScalar();
+
+        scalar.Should().BeOfType<DateTime>();
+
+        var dateOnly = (DateTime) scalar;
+
+        dateOnly.Year.Should().Be(year);
+        dateOnly.Month.Should().Be(mon);
+        dateOnly.Day.Should().Be(day);
+        dateOnly.Hour.Should().Be(DateTime.MinValue.Hour);
+        dateOnly.Minute.Should().Be(DateTime.MinValue.Minute);
+        dateOnly.Second.Should().Be(DateTime.MinValue.Second);
+        dateOnly.Minute.Should().Be(DateTime.MinValue.Millisecond);
+
+        dateOnly.Should().Be(expectedValue);
+    }
+
+    [Theory]
+    [InlineData(1992, 09, 20)]
+    [InlineData(2022, 05, 04)]
+    [InlineData(2022, 04, 05)]
+    [InlineData(1, 1, 1)]
+    public void BindAndInsert(int year, int mon, int day)
+    {
+        using var connection = new DuckDBConnection(DuckDBConnectionStringBuilder.InMemoryConnectionString);
+        connection.Open();
+
+        var expectedValue = new DateTime(year, mon, day);
+
+        using var cmd = connection.CreateCommand();
+
+        try
+        {
+            cmd.CommandText = "CREATE TABLE date_test (d DATE);";
+            cmd.ExecuteNonQuery();
+
+            cmd.CommandText = "INSERT INTO date_test (d) VALUES (?);";
+            cmd.Parameters.Add(new DuckDBParameter(expectedValue));
+            cmd.ExecuteNonQuery();
+
+            cmd.CommandText = "SELECT * FROM date_test;";
+            cmd.Parameters.Clear();
+            var scalar = cmd.ExecuteScalar();
+
+            scalar.Should().BeOfType<DateTime>();
+
+            var dateOnly = (DateTime) scalar;
+
+            dateOnly.Year.Should().Be(year);
+            dateOnly.Month.Should().Be(mon);
+            dateOnly.Day.Should().Be(day);
+            dateOnly.Hour.Should().Be(DateTime.MinValue.Hour);
+            dateOnly.Minute.Should().Be(DateTime.MinValue.Minute);
+            dateOnly.Second.Should().Be(DateTime.MinValue.Second);
+            dateOnly.Minute.Should().Be(DateTime.MinValue.Millisecond);
+
+            dateOnly.Should().Be(expectedValue);
+        }
+        finally
+        {
+            cmd.CommandText = "DROP TABLE date_test;";
+            cmd.ExecuteNonQuery();
+        }
+    }
+}