Fix index DateTime litedb-org#922

Lovecxgood · Mar 17, 2018 · aecb2d6 · aecb2d6
1 parent 58747f7
commit aecb2d6
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 11 deletions.
diff --git a/LiteDB.Shell/Properties/AssemblyInfo.cs b/LiteDB.Shell/Properties/AssemblyInfo.cs
@@ -7,12 +7,12 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("LiteDB.Shell")]
-[assembly: AssemblyCopyright("MIT ©  2017")]
+[assembly: AssemblyCopyright("MIT © 2014-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("01ce385b-31a7-4b1a-9487-23fe8acb3888")]
-[assembly: AssemblyVersion("3.1.4.0")]
-[assembly: AssemblyFileVersion("3.1.4.0")]
+[assembly: AssemblyVersion("3.1.5.0")]
+[assembly: AssemblyFileVersion("3.1.5.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/LiteDB.Tests/Database/DateTimeMinMaxTests.cs b/LiteDB.Tests/Database/DateTimeMinMaxTests.cs
@@ -0,0 +1,79 @@
+using System;
+using System.IO;
+using System.Linq;
+using LiteDB;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LiteDB.Tests
+{
+    #region Model
+
+    public class DateTimeTest
+    {
+        public int Id { get; set; }
+        public DateTime? Date { get; set; }
+    }
+
+    #endregion
+
+    [TestClass]
+    public class DateTimeMinMax_Tests
+    {
+        [TestMethod]
+        public void DateTimeMinMax_Test()
+        {
+            var memory = new MemoryStream();
+
+            using (var db = new LiteDatabase(memory))
+            {
+                var col = db.GetCollection<DateTimeTest>();
+                col.EnsureIndex(x => x.Date);
+
+                col.Insert(new DateTimeTest() { Id = 1, Date = new DateTime(2018, 02, 22, 0, 0, 0) });
+                col.Insert(new DateTimeTest() { Id = 2, Date = new DateTime(2018, 02, 22, 23, 59, 59) });
+
+                MinMaxCommon(col);
+            }
+
+            using (var db = new LiteDatabase(memory))
+            {
+                var col = db.GetCollection<DateTimeTest>();
+
+                MinMaxCommon(col);
+
+                col.Insert(new DateTimeTest() { Id = 3, Date = new DateTime(2018, 02, 21, 23, 59, 59) });
+                col.Insert(new DateTimeTest() { Id = 4, Date = new DateTime(2018, 02, 23, 0, 0, 0) });
+                col.Insert(new DateTimeTest() { Id = 5, Date = new DateTime(2018, 02, 22, 0, 0, 1) });
+                col.Insert(new DateTimeTest() { Id = 6, Date = new DateTime(2018, 02, 22, 23, 59, 58) });
+
+                MinMaxCommon(col);
+            }
+
+            using (var db = new LiteDatabase(memory))
+            {
+                var col = db.GetCollection<DateTimeTest>();
+
+                MinMaxCommon(col);
+            }
+        }
+
+        private void MinMaxCommon(LiteCollection<DateTimeTest> coll)
+        {
+            var searchdatetime = new DateTime(2018, 02, 22, 0, 0, 10);
+
+            var min = coll.Min(x => x.Date).AsDateTime;
+            var max = coll.Max(x => x.Date).AsDateTime;
+
+            var smaller = coll.FindOne(x => x.Date < searchdatetime);
+            var greater = coll.FindOne(x => x.Date > searchdatetime);
+
+            var all = coll.FindAll().ToList();
+
+            var linqmin = all.Min(x => x.Date);
+            var linqmax = all.Max(x => x.Date);
+
+            Assert.AreEqual(min, linqmin);
+            Assert.AreEqual(max, linqmax);
+        }
+    }
+}
diff --git a/LiteDB.Tests/Properties/AssemblyInfo.cs b/LiteDB.Tests/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("LiteDB.Tests")]
-[assembly: AssemblyCopyright("MIT ©  2017")]
+[assembly: AssemblyCopyright("MIT © 2014-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en")]
 [assembly: ComVisible(false)]
 [assembly: Guid("de183e83-7df6-475c-8185-b0070d098821")]
-[assembly: AssemblyVersion("3.1.4.0")]
-[assembly: AssemblyFileVersion("3.1.4.0")]
+[assembly: AssemblyVersion("3.1.5.0")]
+[assembly: AssemblyFileVersion("3.1.5.0")]
diff --git a/LiteDB.nuspec b/LiteDB.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
     <metadata>
         <id>LiteDB</id>
-        <version>3.1.3</version>
+        <version>3.1.5</version>
         <title>LiteDB</title>
         <authors>Mauricio David</authors>
         <projectUrl>http://www.litedb.org</projectUrl>

diff --git a/LiteDB/Properties/AssemblyInfo.cs b/LiteDB/Properties/AssemblyInfo.cs
@@ -8,11 +8,11 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Maurício David")]
 [assembly: AssemblyProduct("LiteDB")]
-[assembly: AssemblyCopyright("MIT © 2017")]
+[assembly: AssemblyCopyright("MIT © 2014-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("54989b5c-4bcf-4d58-b8ba-9b014a324f76")]
-[assembly: AssemblyVersion("3.1.4.0")]
-[assembly: AssemblyFileVersion("3.1.4.0")]
+[assembly: AssemblyVersion("3.1.5.0")]
+[assembly: AssemblyFileVersion("3.1.5.0")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/LiteDB/Utils/ByteReader.cs b/LiteDB/Utils/ByteReader.cs
@@ -129,7 +129,12 @@ public string ReadString(int length)
 
         public DateTime ReadDateTime()
         {
-            return new DateTime(this.ReadInt64(), DateTimeKind.Utc);
+            // fix #921 converting index key into LocalTime
+            // this is not best solution because uctDate must be a global parameter
+            // this will be review in v5
+            var date = new DateTime(this.ReadInt64(), DateTimeKind.Utc);
+
+            return date.ToLocalTime();
         }
 
         public Guid ReadGuid()