Merge branch 'johandanforth-bug-in-keypropertiescache'

Dapper.Contrib/SqlMapperExtensions.cs

@@ -91,12 +91,15 @@ private static List<PropertyInfo> KeyPropertiesCache(Type type)
             }
 
             var allProperties = TypePropertiesCache(type);
-            var keyProperties = allProperties.Where(p => p.GetCustomAttributes(true).Any(a => a is KeyAttribute)).ToList();
+            var keyProperties = allProperties.Where(p =>
+            {
+                return p.GetCustomAttributes(true).Any(a => a is KeyAttribute);
+            }).ToList();
 
             if (keyProperties.Count == 0)
             {
                 var idProp = allProperties.FirstOrDefault(p => p.Name.ToLower() == "id");
-                if (idProp != null)
+                if (idProp != null && !idProp.GetCustomAttributes(true).Any(a => a is ExplicitKeyAttribute))
                 {
                     keyProperties.Add(idProp);
                 }

Dapper.Tests.Contrib/TestSuite.cs

@@ -34,6 +34,14 @@ public class ObjectY
         public int ObjectYId { get; set; }
         public string Name { get; set; }
     }
+    
+    [Table("ObjectZ")]
+    public class ObjectZ
+    {
+        [ExplicitKey]
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
 
     public interface IUser
     {
@@ -134,7 +142,7 @@ public void InsertGetUpdateDeleteWithExplicitKey()
                 o2.IsNull();
             }
         }
-
+        
         [Fact]
         public void GetAllWithExplicitKey()
         {
@@ -149,7 +157,29 @@ public void GetAllWithExplicitKey()
             }
         }
 
-        [Fact]
+        [Fact]
+        public void InsertGetUpdateDeleteWithExplicitKeyNamedId()
+        {
+            using (var connection = GetOpenConnection())
+            {
+                const int id = 42;
+                var o2 = new ObjectZ { Id = id, Name = "Foo" };
+                connection.Insert(o2);
+                var list2 = connection.Query<ObjectZ>("select * from ObjectZ").ToList();
+                list2.Count.IsEqualTo(1);
+                o2 = connection.Get<ObjectZ>(id);
+                o2.Id.IsEqualTo(id);
+                //o2.Name = "Bar";
+                //connection.Update(o2);
+                //o2 = connection.Get<ObjectY>(id);
+                //o2.Name.IsEqualTo("Bar");
+                //connection.Delete(o2);
+                //o2 = connection.Get<ObjectY>(id);
+                //o2.IsNull();
+            }
+        }
+        
+        [Fact]
         public void ShortIdentity()
         {
             using (var connection = GetOpenConnection())

Dapper.Tests.Contrib/TestSuites.cs

@@ -55,6 +55,8 @@ static SqlServerTestSuite()
                 connection.Execute(@"CREATE TABLE ObjectX (ObjectXId nvarchar(100) not null, Name nvarchar(100) not null);");
                 dropTable("ObjectY");
                 connection.Execute(@"CREATE TABLE ObjectY (ObjectYId int not null, Name nvarchar(100) not null);");
+                dropTable("ObjectZ");
+                connection.Execute(@"CREATE TABLE ObjectZ (Id int not null, Name nvarchar(100) not null);");
             }
         }
     }
@@ -101,6 +103,8 @@ static MySqlServerTestSuite()
                     connection.Execute(@"CREATE TABLE ObjectX (ObjectXId nvarchar(100) not null, Name nvarchar(100) not null);");
                     dropTable("ObjectY");
                     connection.Execute(@"CREATE TABLE ObjectY (ObjectYId int not null, Name nvarchar(100) not null);");
+                    dropTable("ObjectZ");
+                    connection.Execute(@"CREATE TABLE ObjectZ (Id int not null, Name nvarchar(100) not null);");
                 }
             }
             catch (MySqlException e)
@@ -141,6 +145,7 @@ static SQLiteTestSuite()
                 connection.Execute(@"CREATE TABLE Results (Id integer primary key autoincrement not null, Name nvarchar(100) not null, [Order] int not null) ");
                 connection.Execute(@"CREATE TABLE ObjectX (ObjectXId nvarchar(100) not null, Name nvarchar(100) not null) ");
                 connection.Execute(@"CREATE TABLE ObjectY (ObjectYId integer not null, Name nvarchar(100) not null) ");
+                connection.Execute(@"CREATE TABLE ObjectZ (Id integer not null, Name nvarchar(100) not null) ");
             }
         }
     }
@@ -171,6 +176,7 @@ static SqlCETestSuite()
                 connection.Execute(@"CREATE TABLE Results (Id int IDENTITY(1,1) not null, Name nvarchar(100) not null, [Order] int not null) ");
                 connection.Execute(@"CREATE TABLE ObjectX (ObjectXId nvarchar(100) not null, Name nvarchar(100) not null) ");
                 connection.Execute(@"CREATE TABLE ObjectY (ObjectYId int not null, Name nvarchar(100) not null) ");
+                connection.Execute(@"CREATE TABLE ObjectZ (Id int not null, Name nvarchar(100) not null) ");
             }
             Console.WriteLine("Created database");
         }