Fixed a syntax error with the SQL where clause builder

Yuck · Feb 1, 2021 · 60a22b1 · 60a22b1
1 parent 6599024
commit 60a22b1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/src/YuckQi.Data.Sql.Dapper/Providers/Abstract/ReadProviderBase.cs b/src/YuckQi.Data.Sql.Dapper/Providers/Abstract/ReadProviderBase.cs
@@ -44,7 +44,7 @@ protected string BuildSqlForCount(IReadOnlyCollection<IDataParameter> parameters
             var select = "select count(*)";
             var from = BuildFromSql();
             var where = BuildWhereSql(parameters);
-            var sql = CombineSql(select, from, where);
+            var sql = $"{CombineSql(select, from, where)};";
 
             return sql;
         }
@@ -56,7 +56,7 @@ protected string BuildSqlForGet(IReadOnlyCollection<IDataParameter> parameters)
             var select = $"select {columns}";
             var from = BuildFromSql();
             var where = BuildWhereSql(parameters);
-            var sql = CombineSql(select, from, where);
+            var sql = $"{CombineSql(select, from, where)};";
 
             return sql;
         }
@@ -71,7 +71,7 @@ protected string BuildSqlForSearch(IReadOnlyCollection<IDataParameter> parameter
             var where = BuildWhereSql(parameters);
             var order = ! string.IsNullOrWhiteSpace(sorting) ? $"order by {sorting}" : string.Empty;
             var limit = page != null ? $"offset {(page.PageNumber - 1) * page.PageSize} rows fetch first {page.PageSize} only" : string.Empty;
-            var sql = CombineSql(select, from, where, order, limit);
+            var sql = $"{CombineSql(select, from, where, order, limit)};";
 
             return sql;
         }
@@ -81,7 +81,7 @@ protected string BuildSqlForSearch(IReadOnlyCollection<IDataParameter> parameter
 
         #region Supporting Methods
 
-        private string BuildColumnsSql()
+        private static string BuildColumnsSql()
         {
             var properties = typeof(TRecord).GetProperties().Where(t => t.CustomAttributes.All(u => u.AttributeType != typeof(IgnoreSelectAttribute)));
             var columns = string.Join(", ", properties.Select(t =>
@@ -114,7 +114,7 @@ private static string BuildWhereSql(IEnumerable<IDataParameter> parameters)
 
                 return $"({column} {comparison} {parameter})";
             }));
-            var where = $"{(string.IsNullOrWhiteSpace(filter) ? "" : $"where {filter}")};";
+            var where = $"{(string.IsNullOrWhiteSpace(filter) ? "" : $"where {filter}")}";
 
             return where;
         }

diff --git a/src/YuckQi.Data.Sql.Dapper/Providers/SearchProvider.cs b/src/YuckQi.Data.Sql.Dapper/Providers/SearchProvider.cs
@@ -41,16 +41,6 @@ public async Task<IPage<TEntity>> SearchAsync(IReadOnlyCollection<IDataParameter
                 throw new ArgumentNullException(nameof(sort));
 
             var sql = BuildSqlForSearch(parameters, page, sort);
-
-            var fuckers = new DynamicParameters();
-            foreach (var fuck in parameters)
-            {
-                var name = fuck.ParameterName;
-                var value = fuck.Value;
-
-                fuckers.Add(name, value);
-            }
-
             var records = await Db.QueryAsync<TRecord>(sql, parameters.ToDynamicParameters(), Transaction);
             var entities = records.Adapt<IReadOnlyCollection<TEntity>>();
             var total = await CountAsync(parameters);

diff --git a/src/YuckQi.Data.Sql.Dapper/YuckQi.Data.Sql.Dapper.csproj b/src/YuckQi.Data.Sql.Dapper/YuckQi.Data.Sql.Dapper.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>0.4.3</Version>
+    <Version>0.4.4</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>An implementation of YuckQi.Data using Dapper and SimpleCRUD.</Description>
   </PropertyGroup>

diff --git a/src/YuckQi.Data.Sql.EntityFramework/YuckQi.Data.Sql.EntityFramework.csproj b/src/YuckQi.Data.Sql.EntityFramework/YuckQi.Data.Sql.EntityFramework.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>0.4.3</Version>
+    <Version>0.4.4</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>An implementation of YuckQi.Data using Entity Framework.</Description>
   </PropertyGroup>

diff --git a/src/YuckQi.Data/YuckQi.Data.csproj b/src/YuckQi.Data/YuckQi.Data.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>0.4.3</Version>
+    <Version>0.4.4</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>A .NET library providing fine-grained data providers useful in data repository or domain service implementations.</Description>
   </PropertyGroup>