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

whitespace for auto-SP detection: use unicode spec via regex #1987

Merged
merged 2 commits into from
Oct 19, 2023
Merged

whitespace for auto-SP detection: use unicode spec via regex #1987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f6a892
add fix and test for #1975
mgravell Oct 19, 2023
4896cf3
wrong ticket number; is #1986
mgravell Oct 19, 2023
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
7 changes: 4 additions & 3 deletions Dapper/CommandDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Data;
using System.Reflection;
using System.Reflection.Emit;
using System.Text.RegularExpressions;
using System.Threading;

namespace Dapper
Expand Down Expand Up @@ -103,14 +104,14 @@ public CommandDefinition(string commandText, object? parameters = null, IDbTrans

static CommandType InferCommandType(string sql)
{
if (sql is null || sql.IndexOfAny(WhitespaceChars) >= 0) return System.Data.CommandType.Text;
if (sql is null || WhitespaceChars.IsMatch(sql)) return System.Data.CommandType.Text;
return System.Data.CommandType.StoredProcedure;
}
}

// if the sql contains any whitespace character (space/tab/cr/lf): interpret as ad-hoc; but "SomeName" should be treated as a stored-proc
// if the sql contains any whitespace character (space/tab/cr/lf/etc - via unicode): interpret as ad-hoc; but "SomeName" should be treated as a stored-proc
// (note TableDirect would need to be specified explicitly, but in reality providers don't usually support TableDirect anyway)
private static readonly char[] WhitespaceChars = new char[] { ' ', '\t', '\r', '\n' };
private static readonly Regex WhitespaceChars = new(@"\s", RegexOptions.Compiled);

private CommandDefinition(object? parameters) : this()
{
Expand Down
15 changes: 15 additions & 0 deletions tests/Dapper.Tests/ProcedureTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,5 +302,20 @@ select 1 as Num

Assert.Empty(result);
}

[Theory]
[InlineData(" ")]
[InlineData("\u00A0")] // nbsp
[InlineData("\u202F")] // narrow nbsp
[InlineData("\u2000")] // n quad
[InlineData("\t")]
[InlineData("\r")]
[InlineData("\n")]
public async Task Issue1986_AutoProc_Whitespace(string space)
{
var sql = "select!42".Replace("!", space);
var result = await connection.QuerySingleAsync<int>(sql);
Assert.Equal(42, result);
}
}
}