🐞fix: Guid formatting in where clauses

Fixed Guid formatting in where clauses when using list queries (IN & NOT IN).

Author: lukaferlez

src/Simpleverse.Repository.Db.Test/Model.cs

@@ -13,5 +13,7 @@ public class Model
 		public string String { get; set; }
 		public bool Bool { get; set; }
 		public bool? BoolNullable { get; set; }
+		public Guid Guid { get; set; }
+		public Guid? GuidNullable { get; set; }
 	}
 }

src/Simpleverse.Repository.Db.Test/QueryBuilder/GuidTest.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Simpleverse.Repository.Db.Test.QueryBuilder
+{
+	public class GuidTest : QueryBuilderTestFixture
+	{
+		public Guid Value { get; } = Guid.NewGuid();
+
+		[Fact]
+		public void TestGuid_Equals()
+			=> Test<Model>(
+				queryBuilder => queryBuilder.Where(x => x.Guid, Value),
+				$"WHERE [Guid] = @Guid",
+				new[] { "Guid" }
+			);
+
+		[Fact]
+		public void TestGuid_In()
+			=> Test<Model>(
+				queryBuilder => queryBuilder.Where(x => x.Guid, new List<Guid>() { Value, Value }),
+				$"WHERE [Guid] IN ('{Value}','{Value}')",
+				Array.Empty<string>()
+			);
+
+		[Fact]
+		public void TestGuid_NotIn()
+		=> Test<Model>(
+			queryBuilder => queryBuilder.WhereNot(x => x.Guid, new List<Guid>() { Value, Value }),
+			$"WHERE [Guid] NOT IN ('{Value}','{Value}')",
+			Array.Empty<string>()
+		);
+	}
+}

src/Simpleverse.Repository.Db/Extensions/Dapper/WhereExtensions.cs

@@ -186,6 +186,30 @@ public static SqlBuilder WhereNot<T, TTable>(this SqlBuilder sqlBuilder, Table<T
 
 		#endregion
 
+		#region Guid
+
+		public static SqlBuilder Where(this SqlBuilder sqlBuilder, string name, IEnumerable<Guid> values, string alias, bool not = false)
+			=> sqlBuilder.Where(new Selector(name, alias), values, not: not);
+
+		public static SqlBuilder Where<TTable>(this SqlBuilder sqlBuilder, Table<TTable> table, Expression<Func<TTable, Guid>> column, IEnumerable<Guid> values, bool not = false)
+			=> sqlBuilder.Where(table.Column(column), values, not: not);
+
+		public static SqlBuilder Where(this SqlBuilder sqlBuilder, Selector column, IEnumerable<Guid> values, bool not = false)
+		{
+			if (values == null || !values.Any())
+				return sqlBuilder;
+
+			return sqlBuilder.Where(column.In(values, not).ToString());
+		}
+
+		public static void WhereNot(this SqlBuilder sqlBuilder, string name, IEnumerable<Guid> values, string alias)
+			=> sqlBuilder.Where(name, values, alias, not: true);
+
+		public static SqlBuilder WhereNot<TTable>(this SqlBuilder sqlBuilder, Table<TTable> table, Expression<Func<TTable, Guid>> column, IEnumerable<Guid> values)
+			=> sqlBuilder.Where(table.Column(column), values, not: true);
+
+		#endregion
+
 		#region DateTime
 
 		public static SqlBuilder Where(this SqlBuilder sqlBuilder, string name, IEnumerable<DateTime> values, string alias, bool not = false)

src/Simpleverse.Repository.Db/QueryBuilder.cs

@@ -2,6 +2,7 @@
 using Simpleverse.Repository.Db.Extensions.Dapper;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
 
 namespace Simpleverse.Repository.Db
@@ -338,6 +339,25 @@ public QueryBuilder<TTable> WhereNot<T>(Expression<Func<TTable, T>> column, IEnu
 
 		#endregion
 
+		#region Guid
+
+		public QueryBuilder<TTable> Where(Expression<Func<TTable, Guid>> column, Guid value, string condition = "=")
+		{
+			this.Where(Table.Column(column), value, condition: condition);
+			return this;
+		}
+
+		public QueryBuilder<TTable> Where(Expression<Func<TTable, Guid>> column, IEnumerable<Guid> values, bool not = false)
+		{
+			this.Where(Table.Column(column), values, not: not);
+			return this;
+		}
+
+		public QueryBuilder<TTable> WhereNot(Expression<Func<TTable, Guid>> column, IEnumerable<Guid> values)
+			=> Where(column, values, not: true);
+
+		#endregion
+
 		#region DateTime
 
 		public QueryBuilder<TTable> Where(Expression<Func<TTable, DateTime>> column, IEnumerable<DateTime> values, bool not = false)

src/Simpleverse.Repository.Db/Selector.cs

@@ -113,6 +113,9 @@ public Selector In<T>(IEnumerable<T> values, bool not = false)
 			return In(valuesJoined, not);
 		}
 
+		public Selector In(IEnumerable<Guid> values, bool not = false)
+			=> In(values.Select(x => x.ToString()), not);
+
 		public Selector In(IEnumerable<DateTime> values, bool not = false)
 		{
 			if (values == null || !values.Any())

src/Simpleverse.Repository.Db/Simpleverse.Repository.Db.csproj

@@ -13,10 +13,10 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>Dapper, Bulk, Merge, Upsert, Delete, Insert, Update, Repository</PackageTags>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <Version>2.1.24</Version>
+    <Version>2.1.25</Version>
     <Description>High performance operation for MS SQL Server built for Dapper ORM. Including bulk operations Insert, Update, Delete, Get as well as Upsert both single and bulk.</Description>
-    <AssemblyVersion>2.1.24.0</AssemblyVersion>
-    <FileVersion>2.1.24.0</FileVersion>
+    <AssemblyVersion>2.1.25.0</AssemblyVersion>
+    <FileVersion>2.1.25.0</FileVersion>
     <RepositoryUrl>https://github.com/lukaferlez/Simpleverse.Repository</RepositoryUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <EmbedAllSources>true</EmbedAllSources>