Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix parameter type mapping for Sqlite #27291

Merged
merged 3 commits into from
May 31, 2022
Merged

Fix parameter type mapping for Sqlite #27291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d15b33
Fix parameter type mapping for Sqlite
Marusyk Jan 26, 2022
6d440dd
Test PR #27291
bricelam Feb 4, 2022
d1a38d8
Collapse all type tests to a single method and use [MemberData]
Marusyk Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.Data.Sqlite.Core/SqliteParameter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public override void ResetDbType()
public virtual void ResetSqliteType()
{
DbType = DbType.String;
SqliteType = SqliteType.Text;
_sqliteType = null;
}

internal bool Bind(sqlite3_stmt stmt)
Expand Down
6 changes: 5 additions & 1 deletion src/Microsoft.Data.Sqlite.Core/SqliteValueBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,10 @@ public virtual void Bind()
{ typeof(char), SqliteType.Text },
{ typeof(DateTime), SqliteType.Text },
{ typeof(DateTimeOffset), SqliteType.Text },
#if NET6_0_OR_GREATER
{ typeof(DateOnly), SqliteType.Text },
{ typeof(TimeOnly), SqliteType.Text },
#endif
{ typeof(DBNull), SqliteType.Text },
{ typeof(decimal), SqliteType.Text },
{ typeof(double), SqliteType.Real },
Expand All @@ -255,7 +259,7 @@ public virtual void Bind()
{ typeof(long), SqliteType.Integer },
{ typeof(sbyte), SqliteType.Integer },
{ typeof(short), SqliteType.Integer },
{ typeof(string), SqliteType.Integer },
{ typeof(string), SqliteType.Text },
{ typeof(TimeSpan), SqliteType.Text },
{ typeof(uint), SqliteType.Integer },
{ typeof(ulong), SqliteType.Integer },
Expand Down
56 changes: 56 additions & 0 deletions test/Microsoft.Data.Sqlite.Tests/SqliteParameterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using Microsoft.Data.Sqlite.Properties;
Expand Down Expand Up @@ -93,6 +94,21 @@ public void SqliteType_defaults_to_text()
Assert.Equal(SqliteType.Text, new SqliteParameter().SqliteType);
}

[Theory]
[MemberData(nameof(TypesData))]
public void SqliteType_is_inferred_from_value(object value, SqliteType expectedType)
{
var parameter = new SqliteParameter { Value = value };
Assert.Equal(expectedType, parameter.SqliteType);
}

[Fact]
public void SqliteType_overrides_inferred_value()
Marusyk marked this conversation as resolved.
Show resolved Hide resolved
{
var parameter = new SqliteParameter { Value = 'A', SqliteType = SqliteType.Integer };
Assert.Equal(SqliteType.Integer, parameter.SqliteType);
}

[Fact]
public void Direction_input_by_default()
{
Expand Down Expand Up @@ -128,6 +144,16 @@ public void ResetSqliteType_works()
Assert.Equal(SqliteType.Text, parameter.SqliteType);
}

[Fact]
public void ResetSqliteType_works_when_value()
{
var parameter = new SqliteParameter { Value = new byte[0], SqliteType = SqliteType.Text };

parameter.ResetSqliteType();

Assert.Equal(SqliteType.Blob, parameter.SqliteType);
}

[Fact]
public void Bind_requires_set_name()
{
Expand Down Expand Up @@ -557,6 +583,36 @@ public void Add_range_of_parameters_using_DbCommand_base_class()
}
}

public static IEnumerable<object[]> TypesData
=> new List<object[]>
{
new object[] { default(DateTime), SqliteType.Text },
new object[] { default(DateTimeOffset), SqliteType.Text },
new object[] { DBNull.Value, SqliteType.Text },
new object[] { 0m, SqliteType.Text },
new object[] { default(Guid), SqliteType.Text },
new object[] { default(TimeSpan), SqliteType.Text },
new object[] { default(TimeSpan), SqliteType.Text },
#if NET6_0_OR_GREATER
new object[] { default(DateOnly), SqliteType.Text },
new object[] { default(TimeOnly), SqliteType.Text },
#endif
new object[] { 'A', SqliteType.Text },
new object[] { "", SqliteType.Text },
new object[] { false, SqliteType.Integer },
new object[] { (byte)0, SqliteType.Integer },
new object[] { 0, SqliteType.Integer },
new object[] { 0L, SqliteType.Integer },
new object[] { (sbyte)0, SqliteType.Integer },
new object[] { (short)0, SqliteType.Integer },
new object[] { 0u, SqliteType.Integer },
new object[] { 0ul, SqliteType.Integer },
new object[] { (ushort)0, SqliteType.Integer },
new object[] { 0.0, SqliteType.Real },
new object[] { 0f, SqliteType.Real },
new object[] { new byte[0], SqliteType.Blob },
};

private enum MyEnum
{
One = 1
Expand Down