Fix Bug #27277013 - DATAREADER CREATED WITH COMMANDBEHAVIOR.CLOSECONNECTION NOT CLOSING CONNECTION

Applying Dispose Pattern to MySqlDataReader, MySqlCommand and MySqlConnection classes (Other related classes have the pattern implemented correctly, i.e. Transaction).

Author: davaldezr

CHANGES

@@ -3,6 +3,7 @@
 - Fix for unexpected ColumnSize for CHAR(63) and BLOB columns in GetSchemaTable (MySQL Bug #87868, Oracle Bug #26876582)
 - Fix to correct unexpected ColummSize and IsLong values returned by MySqlDataReader.GetSchemaTable when using LongText and LongBlob data types. (MySQL Bug #87876, Oracle Bug #26876592)
 - Fix to correct the wrong NumericPrecision value returned by MySqlDataReader.GetSchemaTable when NumericScale is 0 for Decimal data types. (MySQL Bug #88058, Oracle Bug #26954812)
+- Fix to close connection when MySqlDataReader is created with CommandBehavior.CloseConnection. (Oracle Bug #27277013)
 
 
 6.9.10

Source/MySql.Data/command.cs

@@ -1,4 +1,4 @@
-// Copyright © 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2004, 2018 Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -328,7 +328,7 @@ public override int ExecuteNonQuery()
 
 #if !RT
  // give our interceptors a shot at it first
- if ( connection != null && 
+ if (connection != null &&
  connection.commandInterceptor != null &&
  connection.commandInterceptor.ExecuteNonQuery(CommandText, ref records))
  return records;
@@ -402,12 +402,12 @@ internal void ResetSqlSelectLimit()
 #if !RT
  // give our interceptors a shot at it first
  MySqlDataReader interceptedReader = null;
- if ( connection != null &&
- connection.commandInterceptor != null && 
+ if (connection != null &&
+ connection.commandInterceptor != null &&
  connection.commandInterceptor.ExecuteReader(CommandText, behavior, ref interceptedReader))
  return interceptedReader;
 #endif
- 
+
  // interceptors didn't handle this so we fall through
  bool success = false;
  CheckState();
@@ -864,7 +864,7 @@ private bool AddCallStatement(string query)
 
  string keyword = query.ToUpper();
  int indexChar = keyword.IndexOfAny(new char[] { '(', '"', '@', '\'', '`' });
- if(indexChar > 0)
+ if (indexChar > 0)
  keyword = keyword.Substring(0, indexChar);
 
  if (keywords == null)
@@ -999,15 +999,13 @@ protected override void Dispose(bool disposing)
  if (disposed)
  return;
 
- if (!disposing)
- return;
- 
- if (statement != null && statement.IsPrepared)
- statement.CloseStatement();
+ if (disposing)
+ if (statement != null && statement.IsPrepared)
+ statement.CloseStatement();
 
  base.Dispose(disposing);
-
  disposed = true;
+
  }
 #else
  public void Dispose()

Source/MySql.Data/datareader.cs

@@ -1,4 +1,4 @@
-// Copyright © 2004, 2014 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2004, 2018 Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -48,6 +48,7 @@ public sealed partial class MySqlDataReader : IDisposable
  internal Driver driver;
  private PreparableStatement statement;
  private ResultSet resultSet;
+ private bool disposed = false;
 
  // Used in special circumstances with stored procs to avoid exceptions from DbDataAdapter
  // If set, AffectedRows returns -1 instead of 0.
@@ -75,7 +76,7 @@ internal MySqlDataReader(MySqlCommand cmd, PreparableStatement statement, Comman
  this.statement = statement;
 
 #if !RT
- if (cmd.CommandType == CommandType.StoredProcedure 
+ if (cmd.CommandType == CommandType.StoredProcedure
  && cmd.UpdatedRowSource == UpdateRowSource.FirstReturnedRecord
  )
  {
@@ -1036,12 +1037,15 @@ private void Throw(Exception ex)
  GC.SuppressFinalize(this);
  }
 
- internal new void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
  {
- if (disposing)
- {
- Close();
- }
+ if (disposed)
+ return;
+
+ Close();
+
+ base.Dispose(disposing);
+ disposed = true;
  }
 
  #region Destructor

Source/MySql.Data/extensions/NonRT/MySqlConnection.cs

@@ -1,4 +1,4 @@
-// Copyright © 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2004, 2018 Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -36,6 +36,8 @@ namespace MySql.Data.MySqlClient
  [ToolboxItem(true)]
  public sealed partial class MySqlConnection : DbConnection, ICloneable
  {
+ private bool disposed = false;
+
  /// <summary>
  /// Returns schema information for the data source of this <see cref="DbConnection"/>. 
  /// </summary>
@@ -99,19 +101,23 @@ partial void AssertPermissions()
  PermissionSet set = new PermissionSet(PermissionState.None);
  set.AddPermission(new MySqlClientPermission(ConnectionString));
  set.Demand();
- MySqlSecurityPermission.CreatePermissionSet(true).Assert(); 
+ MySqlSecurityPermission.CreatePermissionSet(true).Assert();
  }
  }
 
  #region IDisposeable
-
  protected override void Dispose(bool disposing)
  {
+ if (disposed)
+ return;
+
  if (State == ConnectionState.Open)
  Close();
+
+ disposed = true;
  base.Dispose(disposing);
- }
 
+ }
  #endregion
  }
 }