Merge pull request #566 from FredericDgrv/master

Fix for Nullable Enum

Author: praeclarum

src/SQLite.cs

@@ -2069,12 +2069,23 @@ public Column(PropertyInfo prop, CreateFlags createFlags = CreateFlags.None)
 				StoreAsText = prop.PropertyType.GetTypeInfo().CustomAttributes.Any(x => x.AttributeType == typeof(StoreAsTextAttribute));
             }
 
-			public void SetValue (object obj, object val)
-			{
-				_prop.SetValue (obj, val, null);
-			}
-
-			public object GetValue (object obj)
+            public void SetValue(object obj, object val)
+            {
+#if !USE_NEW_REFLECTION_API
+                if (ColumnType.IsEnum)
+#else
+                if (ColumnType.GetTypeInfo().IsEnum)
+#endif
+                {
+                    _prop.SetValue(obj, Enum.ToObject(ColumnType, val));
+                }
+                else
+                {
+                    _prop.SetValue(obj, val, null);
+                }
+            }
+
+            public object GetValue (object obj)
 			{
 				return _prop.GetValue (obj, null);
 			}

tests/EnumNullableTest.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+#if NETFX_CORE
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using SetUp = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestInitializeAttribute;
+using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
+using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
+#else
+using NUnit.Framework;
+#endif
+
+namespace SQLite.Tests
+{
+    [TestFixture]
+    public class EnumNullableTests
+    {
+        public enum TestEnum
+        {
+            Value1,
+
+            Value2,
+
+            Value3
+        }
+
+        public class TestObj
+        {
+            [PrimaryKey]
+            public int Id { get; set; }
+            public TestEnum? Value { get; set; }
+
+            public override string ToString()
+            {
+                return string.Format("[TestObj: Id={0}, Value={1}]", Id, Value);
+            }
+
+        }
+
+        public class TestDb : SQLiteConnection
+        {
+            public TestDb(String path)
+                : base(path)
+            {
+                CreateTable<TestObj>();
+            }
+        }
+
+        [Test]
+        public void ShouldPersistAndReadEnum()
+        {
+            var db = new TestDb(TestPath.GetTempFileName());
+
+            var obj1 = new TestObj() { Id = 1, Value = TestEnum.Value2 };
+            var obj2 = new TestObj() { Id = 2, Value = TestEnum.Value3 };
+
+            var numIn1 = db.Insert(obj1);
+            var numIn2 = db.Insert(obj2);
+            Assert.AreEqual(1, numIn1);
+            Assert.AreEqual(1, numIn2);
+
+            var result = db.Query<TestObj>("select * from TestObj").ToList();
+            Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(obj1.Value, result[0].Value);
+            Assert.AreEqual(obj2.Value, result[1].Value);
+
+            Assert.AreEqual(obj1.Id, result[0].Id);
+            Assert.AreEqual(obj2.Id, result[1].Id);
+
+            db.Close();
+        }
+    }
+}

tests/SQLite.Tests.csproj

@@ -45,6 +45,7 @@
     <Compile Include="ByteArrayTest.cs" />
     <Compile Include="ConcurrencyTest.cs" />
     <Compile Include="EnumCacheTest.cs" />
+    <Compile Include="EnumNullableTest.cs" />
     <Compile Include="EnumTest.cs" />
     <Compile Include="ExceptionAssert.cs" />
     <Compile Include="InsertTest.cs" />