From 85efd4dc59e70f409dfcec06fb70ecfd24c3e399 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 6 Dec 2018 01:14:06 +1100
Subject: [PATCH] Moves SqlNullableEquals to  SqlExpressionExtensions

---
 src/Umbraco.Core/ObjectExtensions.cs              | 15 +--------------
 .../Querying/SqlExpressionExtensions.cs           | 15 +++++++++++++++
 .../NPocoTests/NPocoSqlExtensionsTests.cs         |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Core/ObjectExtensions.cs b/src/Umbraco.Core/ObjectExtensions.cs
index cfd1eedb5a..6c2fd85dbe 100644
--- a/src/Umbraco.Core/ObjectExtensions.cs
+++ b/src/Umbraco.Core/ObjectExtensions.cs
@@ -788,19 +788,6 @@ namespace Umbraco.Core
             return BoolConvertCache[type] = false;
         }
 
-        /// <summary>
-        /// Indicates whether two nullable values are equal, substituting a fallback value for nulls.
-        /// </summary>
-        /// <typeparam name="T">The nullable type.</typeparam>
-        /// <param name="value">The value to compare.</param>
-        /// <param name="other">The value to compare to.</param>
-        /// <param name="fallbackValue">The value to use when any value is null.</param>
-        /// <remarks>Do not use outside of Sql expressions.</remarks>
-        // see usage in ExpressionVisitorBase
-        public static bool SqlNullableEquals<T>(this T? value, T? other, T fallbackValue)
-            where T : struct
-        {
-            return (value ?? fallbackValue).Equals(other ?? fallbackValue);
-        }
+        
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs b/src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
index 0f9eb47d77..710997472c 100644
--- a/src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
+++ b/src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
@@ -9,6 +9,21 @@ namespace Umbraco.Core.Persistence.Querying
     /// </summary>
     internal static class SqlExpressionExtensions
     {
+        /// <summary>
+        /// Indicates whether two nullable values are equal, substituting a fallback value for nulls.
+        /// </summary>
+        /// <typeparam name="T">The nullable type.</typeparam>
+        /// <param name="value">The value to compare.</param>
+        /// <param name="other">The value to compare to.</param>
+        /// <param name="fallbackValue">The value to use when any value is null.</param>
+        /// <remarks>Do not use outside of Sql expressions.</remarks>
+        // see usage in ExpressionVisitorBase
+        public static bool SqlNullableEquals<T>(this T? value, T? other, T fallbackValue)
+            where T : struct
+        {
+            return (value ?? fallbackValue).Equals(other ?? fallbackValue);
+        }
+
         public static bool SqlIn<T>(this IEnumerable<T> collection, T item)
         {
             return collection.Contains(item);
diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
index de1e3ad5ad..05723c50cd 100644
--- a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
+++ b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using NPoco;
 using NUnit.Framework;
-using Umbraco.Core;
+using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Tests.TestHelpers;