Fix ignoring redefined columns

Fixes #586

Author: praeclarum

src/SQLite.cs

@@ -1875,19 +1875,29 @@ public TableMapping(Type type, CreateFlags createFlags = CreateFlags.None)
 
 			var props = new List<PropertyInfo> ();
 			var baseType = type;
+			var propNames = new HashSet<string> ();
 			while (baseType != typeof(object)) {
 				var ti = baseType.GetTypeInfo();
-				props.AddRange(
+				var newProps = (
 					from p in ti.DeclaredProperties
-					where ((p.GetMethod != null && p.GetMethod.IsPublic) || (p.SetMethod != null && p.SetMethod.IsPublic) || (p.GetMethod != null && p.GetMethod.IsStatic) || (p.SetMethod != null && p.SetMethod.IsStatic))
-					select p);
+					where
+						!propNames.Contains(p.Name) &&
+						p.CanRead && p.CanWrite &&
+						(p.GetMethod != null) && (p.SetMethod != null) &&
+						(p.GetMethod.IsPublic && p.SetMethod.IsPublic) &&
+						(!p.GetMethod.IsStatic) && (!p.SetMethod.IsStatic)
+					select p).ToList();
+				foreach (var p in newProps) {
+					propNames.Add(p.Name);
+				}
+				props.AddRange (newProps);
 				baseType = ti.BaseType;
 			}
 
 			var cols = new List<Column> ();
 			foreach (var p in props) {
 				var ignore = p.IsDefined(typeof(IgnoreAttribute),true);
-				if (p.CanWrite && !ignore) {
+				if (!ignore) {
 					cols.Add (new Column (p, createFlags));
 				}
 			}

tests/IgnoreTest.cs

@@ -125,5 +125,38 @@ public void BaseIgnores ()
 			Assert.AreEqual ("World", oo.Name);
 		}
 
+		public class RedefinedBaseClass
+		{
+			public string Name { get; set; }
+			public List<string> Values { get; set; }
+		}
+
+		public class RedefinedClass : RedefinedBaseClass
+		{
+			[Ignore]
+			public new List<string> Values { get; set; }
+			public string Value { get; set; }
+		}
+
+		[Test]
+		public void RedefinedIgnores ()
+		{
+			var db = new TestDb ();
+			db.CreateTable<RedefinedClass> ();
+
+			var o = new RedefinedClass {
+				Name = "Foo",
+				Value = "Bar",
+				Values = new List<string> { "hello", "world" },
+			};
+
+			db.Insert (o);
+
+			var oo = db.Table<RedefinedClass> ().First ();
+
+			Assert.AreEqual ("Foo", oo.Name);
+			Assert.AreEqual ("Bar", oo.Value);
+			Assert.AreEqual (null, oo.Values);
+		}
 	}
 }