Merge pull request #288 from phnx47/fix/clear-filterdata

fix: cleanup filterdata.ordered
phnx47 · Jul 3, 2023 · e77ecb1 · e77ecb1
2 parents c665b9e + 86fee38
commit e77ecb1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/src/DbContext/DapperDbContext.cs b/src/DbContext/DapperDbContext.cs
@@ -2,7 +2,6 @@
 
 namespace MicroOrm.Dapper.Repositories.DbContext;
 
-
 public class DapperDbContext : IDapperDbContext
 {
     /// <summary>
@@ -18,7 +17,6 @@ protected DapperDbContext(IDbConnection connection)
         InnerConnection = connection;
     }
 
-
     public virtual IDbConnection Connection
     {
         get
@@ -28,26 +26,23 @@ public virtual IDbConnection Connection
         }
     }
 
-
     public void OpenConnection()
     {
         if (InnerConnection.State != ConnectionState.Open && InnerConnection.State != ConnectionState.Connecting)
             InnerConnection.Open();
     }
 
-
     public virtual IDbTransaction BeginTransaction()
     {
         return Connection.BeginTransaction();
     }
 
-
     /// <summary>
     ///     Close DB connection
     /// </summary>
     public void Dispose()
     {
-        if (InnerConnection != null && InnerConnection.State != ConnectionState.Closed)
+        if (InnerConnection.State != ConnectionState.Closed)
             InnerConnection.Close();
     }
 }
diff --git a/src/MicroOrm.Dapper.Repositories.csproj b/src/MicroOrm.Dapper.Repositories.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>CRUD for Dapper</Description>
     <Copyright>2015 © Serge K</Copyright>
-    <VersionPrefix>1.25.0</VersionPrefix>
+    <VersionPrefix>1.25.1</VersionPrefix>
     <Authors>Serge K and Contributors</Authors>
     <TargetFrameworks>net461;netstandard2.0;net5.0</TargetFrameworks>
     <LangVersion>11.0</LangVersion>

diff --git a/src/ReadOnlyDapperRepository.cs b/src/ReadOnlyDapperRepository.cs
@@ -68,9 +68,17 @@ public void Dispose()
     {
         _connection?.Dispose();
         _connection = null;
+
         if (_filterData == null)
             return;
-        _filterData.LimitInfo = null;
+
+        _filterData.Ordered = false;
+
+        if (_filterData.LimitInfo != null)
+        {
+            _filterData.LimitInfo = null;
+        }
+
         if (_filterData.OrderInfo != null)
         {
             _filterData.OrderInfo.Columns?.Clear();

diff --git a/src/SqlGenerator/Filters/OrderInfo.cs b/src/SqlGenerator/Filters/OrderInfo.cs
@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 
+// ReSharper disable InconsistentNaming
+
 namespace MicroOrm.Dapper.Repositories.SqlGenerator.Filters;
 
 /// <summary>

diff --git a/src/SqlGenerator/Filters/SelectInfo.cs b/src/SqlGenerator/Filters/SelectInfo.cs
@@ -3,7 +3,7 @@
 namespace MicroOrm.Dapper.Repositories.SqlGenerator.Filters;
 
 /// <summary>
-///
+///  Select Info
 /// </summary>
 public class SelectInfo
 {