Merge branch 'ronindev-master'

Dapper NET40/SqlMapper.cs

@@ -2674,7 +2674,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>

DapperTests NET45/Tests.cs

@@ -25,7 +25,7 @@ public void TestBasicStringUsageAsyncNonBuffered()
         {
             using (var connection = Program.GetOpenConnection())
             {
-                var query = connection.QueryAsync<string>(new CommandDefinition("select 'abc' as [Value] union all select @txt", new { txt = "def" }, flags:  CommandFlags.None));
+                var query = connection.QueryAsync<string>(new CommandDefinition("select 'abc' as [Value] union all select @txt", new { txt = "def" }, flags: CommandFlags.None));
                 var arr = query.Result.ToArray();
                 arr.IsSequenceEqualTo(new[] { "abc", "def" });
             }
@@ -33,7 +33,7 @@ public void TestBasicStringUsageAsyncNonBuffered()
 
         public void TestLongOperationWithCancellation()
         {
-            using(var connection = Program.GetClosedConnection())
+            using (var connection = Program.GetClosedConnection())
             {
                 CancellationTokenSource cancel = new CancellationTokenSource(TimeSpan.FromSeconds(5));
                 var task = connection.QueryAsync<int>(new CommandDefinition("waitfor delay '00:00:10';select 1", cancellationToken: cancel.Token));
@@ -373,7 +373,7 @@ public void Issue22_ExecuteScalar()
                 k.IsNull();
             }
         }
-
+
         public void TestSupportForDynamicParametersOutputExpressions()
         {
             using (var connection = Program.GetOpenConnection())
@@ -531,7 +531,7 @@ public void TestSupportForDynamicParametersOutputExpressions_QueryMultiple()
                 p.Output(bob, b => b.Address.PersonId);
 
                 int x, y;
-                using(var multi = connection.QueryMultipleAsync(@"
+                using (var multi = connection.QueryMultipleAsync(@"
 SET @Occupation = 'grillmaster' 
 SET @PersonId = @PersonId + 1 
 SET @NumberOfLegs = @NumberOfLegs - 1
@@ -561,7 +561,7 @@ public void TestSubsequentQueriesSuccess()
                 var data0 = connection.QueryAsync<Foo0>("select 1 as [Id] where 1 = 0").Result.ToList();
                 data0.Count().IsEqualTo(0);
 
-                var data1 = connection.QueryAsync<Foo1>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags:CommandFlags.Buffered)).Result.ToList();
+                var data1 = connection.QueryAsync<Foo1>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags: CommandFlags.Buffered)).Result.ToList();
                 data1.Count().IsEqualTo(0);
 
                 var data2 = connection.QueryAsync<Foo2>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags: CommandFlags.None)).Result.ToList();
@@ -578,7 +578,7 @@ public void TestSubsequentQueriesSuccess()
 
             }
         }
-        class Foo0 { public int Id { get;set; } }
+        class Foo0 { public int Id { get; set; } }
         class Foo1 { public int Id { get; set; } }
         class Foo2 { public int Id { get; set; } }
         class Person
@@ -700,8 +700,23 @@ public void TestMultiMapArbitraryMaps()
                 finally
                 {
                     connection.Execute("drop table #Users drop table #ReviewBoards");
+
                 }
             }
         }
+
+        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);
+
+            }
+        }
     }
 }
\ No newline at end of file