Merge branch '6.9' of D:\Repos\ConnectorNET\connector-net into 6.9

Author: davaldezr

CHANGES

@@ -2,6 +2,7 @@
 - Fix for sockets stay in CLOSE_WAIT when using SSL (MySQL Bug #75022, Oracle Bug #20393654).
 - 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)
 
 
 6.9.10

Source/MySql.Data/NativeDriver.cs

@@ -197,8 +197,8 @@ public void Open()
  {
  baseStream = StreamCreator.GetStream(Settings);
 #if !RT
-  if (Settings.IncludeSecurityAsserts)
-  MySqlSecurityPermission.CreatePermissionSet(false).Assert();
+ if (Settings.IncludeSecurityAsserts)
+ MySqlSecurityPermission.CreatePermissionSet(false).Assert();
 #endif
  }
  catch (System.Security.SecurityException)
@@ -418,16 +418,16 @@ private bool ServerCheckValidation(object sender, X509Certificate certificate,
  }
 
 
-#endregion
+ #endregion
 
 #endif
 
-  #region Authentication
+ #region Authentication
 
-  /// <summary>
-  /// Return the appropriate set of connection flags for our
-  /// server capabilities and our user requested options.
-  /// </summary>
+ /// <summary>
+ /// Return the appropriate set of connection flags for our
+ /// server capabilities and our user requested options.
+ /// </summary>
  private void SetConnectionFlags(ClientFlags serverCaps)
  {
  // allow load data local infile
@@ -739,9 +739,9 @@ private void GetColumnData(MySqlField field)
 
  if (type == MySqlDbType.Decimal || type == MySqlDbType.NewDecimal)
  {
- field.Precision = (byte)(field.ColumnLength - 2);
- if ((colFlags & ColumnFlags.UNSIGNED) != 0)
- field.Precision++;
+ field.Precision = ((colFlags & ColumnFlags.UNSIGNED) != 0) ? (byte)(field.ColumnLength) : (byte)(--field.ColumnLength);
+ if (field.Scale != 0)
+ field.Precision--;
  }
 
  field.SetTypeAndFlags(type, colFlags);

Tests/MySql.Data.Tests/GetSchemaTests.cs

@@ -690,8 +690,8 @@ public void ColumnSize()
  [Fact]
  public void IsLongProperty()
  {
- st.execSQL("DROP TABLE IF EXISTS test");
- st.execSQL("CREATE TABLE test(`longtext` longtext, `longblob` longblob, `tinytext` tinytext, `tinyblob` tinyblob, `text` text, `blob` blob");
+ st.execSQL("DROP TABLE IF EXISTS test;");
+ st.execSQL("CREATE TABLE test(`longtext` longtext, `longblob` longblob, `tinytext` tinytext, `tinyblob` tinyblob, `text` text, `blob` blob);");
 
  using (MySqlDataReader reader = st.execReader("SELECT * FROM test;"))
  {
@@ -711,5 +711,29 @@ public void IsLongProperty()
  Assert.True((bool)schemaTable.Rows[5]["IsLong"]);
  }
  }
+
+ /// <summary> 
+ /// Bug #26954812 Decimal with numericScale of 0 has wrong numericPrecision in GetSchemaTable.
+ /// </summary>
+ [Fact]
+ public void NumericPrecisionProperty()
+ {
+ st.execSQL("DROP TABLE IF EXISTS test;");
+ st.execSQL("CREATE TABLE test(decimal0 decimal(8,0), decimal1 decimal(8), decimal2 decimal(8,2), decimal3 decimal(8,1) UNSIGNED);");
+
+ using (MySqlDataReader reader = st.execReader("SELECT * FROM test;"))
+ {
+ DataTable schemaTable = reader.GetSchemaTable();
+
+ Assert.Equal(8, schemaTable.Rows[0]["NumericPrecision"]);
+ Assert.Equal(0, schemaTable.Rows[0]["NumericScale"]);
+ Assert.Equal(8, schemaTable.Rows[1]["NumericPrecision"]);
+ Assert.Equal(0, schemaTable.Rows[1]["NumericScale"]);
+ Assert.Equal(8, schemaTable.Rows[2]["NumericPrecision"]);
+ Assert.Equal(2, schemaTable.Rows[2]["NumericScale"]);
+ Assert.Equal(8, schemaTable.Rows[3]["NumericPrecision"]);
+ Assert.Equal(1, schemaTable.Rows[3]["NumericScale"]);
+ }
+ }
  }
 }