Merge branch 'bugfix/Version-Precision' into develop

JeremyCaney · JeremyCaney · commit 90c83d41bf71 · 2020-04-17T13:19:38.000-07:00
diff --git a/OnTopic.Data.Sql/SqlTopicRepository.cs b/OnTopic.Data.Sql/SqlTopicRepository.cs
@@ -5,6 +5,7 @@
 \=============================================================================================================================*/
 using System;
 using System.Data;
+using System.Data.SqlTypes;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
@@ -327,29 +328,27 @@ public override int Save([NotNull]Topic topic, bool isRecursive = false, bool is
       /*------------------------------------------------------------------------------------------------------------------------
       | Establish database connection
       \-----------------------------------------------------------------------------------------------------------------------*/
+      var isNew                 = topic.Id == -1;
       var connection            = new SqlConnection(_connectionString);
-      var procedureName         = topic.Id > 0? "CreateTopic" : "UpdateTopic";
+      var procedureName         = isNew? "CreateTopic" : "UpdateTopic";
       var command               = new SqlCommand(procedureName, connection) {
         CommandType             = CommandType.StoredProcedure
       };
-      var version               = DateTime.Now;
-      var isNew                 = topic.Id == -1;
+      var version               = new SqlDateTime(DateTime.Now);
 
       /*------------------------------------------------------------------------------------------------------------------------
       | Establish query parameters
       \-----------------------------------------------------------------------------------------------------------------------*/
       if (!isNew) {
         command.AddParameter("TopicID", topic.Id);
+        command.AddParameter("DeleteRelationships", true);
       }
       else if (topic.Parent != null) {
         command.AddParameter("ParentID", topic.Parent.Id);
       }
-      command.AddParameter("Version", version);
-      command.Parameters.AddWithValue("@Attributes", attributes);
-      if (!isNew) {
-        command.AddParameter("DeleteRelationships", true);
-      }
+      command.AddParameter("Version", version.Value);
       command.AddParameter("ExtendedAttributes", extendedAttributes);
+      command.Parameters.AddWithValue("@Attributes", attributes);
       command.AddOutputParameter();
 
       /*------------------------------------------------------------------------------------------------------------------------
@@ -369,6 +368,8 @@ public override int Save([NotNull]Topic topic, bool isRecursive = false, bool is
 
         PersistRelations(topic, connection, true);
 
+        topic.VersionHistory.Insert(0, version.Value);
+
       }
 
       /*------------------------------------------------------------------------------------------------------------------------
@@ -390,11 +391,6 @@ public override int Save([NotNull]Topic topic, bool isRecursive = false, bool is
         attributes.Dispose();
       }
 
-      /*------------------------------------------------------------------------------------------------------------------------
-      | Add version to version history
-      \-----------------------------------------------------------------------------------------------------------------------*/
-      topic.VersionHistory.Insert(0, version);
-
       /*------------------------------------------------------------------------------------------------------------------------
       | Recurse
       \-----------------------------------------------------------------------------------------------------------------------*/
