Skip to content

Fix improper oledb parameter regex detection #164

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

Merged
mgravell merged 2 commits into from
Sep 15, 2014
Merged

Fix improper oledb parameter regex detection #164

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
727ba27
Fix improper oledb parameter regex detection
ronindev Sep 11, 2014
5f2ce9b
Removed unnecessary actions in test
ronindev Sep 12, 2014
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 Dapper NET40/SqlMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2533,7 +2533,7 @@ private static IEnumerable<PropertyInfo> FilterParameters(IEnumerable<PropertyIn


// look for ? / @ / : *by itself*
static readonly Regex smellsLikeOleDb = new Regex(@"(?<![a-zA-Z0-9_])[?@:](?![a-zA-Z0-9_])", RegexOptions.IgnoreCase | RegexOptions.Multiline | RegexOptions.CultureInvariant | RegexOptions.Compiled),
static readonly Regex smellsLikeOleDb = new Regex(@"(?<![a-zA-Z0-9@_])[?@:](?![a-zA-Z0-9@_])", RegexOptions.IgnoreCase | RegexOptions.Multiline | RegexOptions.CultureInvariant | RegexOptions.Compiled),
literalTokens = new Regex(@"\{=([a-zA-Z0-9_]+)\}", RegexOptions.IgnoreCase | RegexOptions.Multiline | RegexOptions.CultureInvariant | RegexOptions.Compiled);

/// <summary>
Expand Down
13 changes: 13 additions & 0 deletions DapperTests NET45/Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,5 +355,18 @@ public void Issue22_ExecuteScalar()
k.IsNull();
}
}

public void TestAtEscaping()
{
using (var connection = Program.GetOpenConnection())
{
var id = connection.QueryAsync<int>(@"
declare @@Name int
select @@Name = @Id+1
select @@Name
", new Product { Id = 1 }).Result.Single();
id.IsEqualTo(2);
}
}
}
}