Merge branch 'work/6.9/WL-11325' into 6.9

Author: Jose Ramirez

CHANGES

@@ -1,3 +1,7 @@
+6.9.12
+- Added support for MySQL 8 server features (WL11325).
+
+
 6.9.11
 - 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)

Source/MySql.Data/MySqlError.cs

@@ -1,4 +1,4 @@
-// Copyright © 2004, 2010, 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 
@@ -1789,7 +1789,7 @@ public enum MySqlErrorCode
  ///<remarks>ER_WRONG_PARTITION_NAME</remarks>
  WrongPartitionName = 1567,
  ///<summary></summary>
- ///<remarks>ER_CANT_CHANGE_TX_ISOLATION</remarks>
+ ///<remarks>ER_CANT_CHANGE_TRANSACTION_ISOLATION</remarks>
  CannotChangeTransactionIsolation = 1568,
  ///<summary></summary>
  ///<remarks>ER_DUP_ENTRY_AUTOINCREMENT_CASE</remarks>

Source/MySql.Data/SchemaProvider.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 
@@ -294,8 +294,10 @@ public virtual MySqlSchemaCollection GetIndexes(string[] restrictions)
 
  foreach (MySqlSchemaRow index in indexes.Rows)
  {
- long seq_index = (long)index["SEQ_IN_INDEX"];
- if (seq_index != 1) continue;
+ if (1 != (connection.driver.Version.isAtLeast(8, 0, 1) ?
+ (uint)index["SEQ_IN_INDEX"] :
+ (long)index["SEQ_IN_INDEX"]))
+ continue;
  if (restrictions != null && restrictions.Length == 4 &&
  restrictions[3] != null &&
  !index["KEY_NAME"].Equals(restrictions[3])) continue;
@@ -304,7 +306,9 @@ public virtual MySqlSchemaCollection GetIndexes(string[] restrictions)
  row["INDEX_SCHEMA"] = table["TABLE_SCHEMA"];
  row["INDEX_NAME"] = index["KEY_NAME"];
  row["TABLE_NAME"] = index["TABLE"];
- row["UNIQUE"] = (long)index["NON_UNIQUE"] == 0;
+ row["UNIQUE"] = connection.driver.Version.isAtLeast(8, 0, 1) ?
+ Convert.ToInt64(index["NON_UNIQUE"]) == 0 :
+ (long) index["NON_UNIQUE"] == 0;
  row["PRIMARY"] = index["KEY_NAME"].Equals("PRIMARY");
  row["TYPE"] = index["INDEX_TYPE"];
  row["COMMENT"] = index["COMMENT"];
@@ -606,48 +610,100 @@ public virtual MySqlSchemaCollection GetProcedures(string[] restrictions)
  dt.AddColumn("ROUTINE_COMMENT", typeof(string));
  dt.AddColumn("DEFINER", typeof(string));
 
- StringBuilder sql = new StringBuilder("SELECT * FROM mysql.proc WHERE 1=1");
- if (restrictions != null)
+ StringBuilder sql = null;
+
+ if (connection.driver.Version.isAtLeast(8,0,1))
  {
- if (restrictions.Length >= 2 && restrictions[1] != null)
- sql.AppendFormat(CultureInfo.InvariantCulture,
- " AND db LIKE '{0}'", restrictions[1]);
- if (restrictions.Length >= 3 && restrictions[2] != null)
- sql.AppendFormat(CultureInfo.InvariantCulture,
- " AND name LIKE '{0}'", restrictions[2]);
- if (restrictions.Length >= 4 && restrictions[3] != null)
- sql.AppendFormat(CultureInfo.InvariantCulture,
- " AND type LIKE '{0}'", restrictions[3]);
- }
+ sql = new StringBuilder("SELECT * FROM information_schema.routines WHERE 1=1");
+ if (restrictions != null)
+ {
+ if (restrictions.Length >= 2 && restrictions[1] != null)
+ sql.AppendFormat(CultureInfo.InvariantCulture,
+ " AND routine_schema LIKE '{0}'", restrictions[1]);
+ if (restrictions.Length >= 3 && restrictions[2] != null)
+ sql.AppendFormat(CultureInfo.InvariantCulture,
+ " AND routine_name LIKE '{0}'", restrictions[2]);
+ if (restrictions.Length >= 4 && restrictions[3] != null)
+ sql.AppendFormat(CultureInfo.InvariantCulture,
+ " AND routine_type LIKE '{0}'", restrictions[3]);
+ }
 
- MySqlCommand cmd = new MySqlCommand(sql.ToString(), connection);
- using (MySqlDataReader reader = cmd.ExecuteReader())
+ MySqlCommand cmd = new MySqlCommand(sql.ToString(), connection);
+ using (MySqlDataReader reader = cmd.ExecuteReader())
+ {
+ while (reader.Read())
+ {
+ MySqlSchemaRow row = dt.AddRow();
+ row["SPECIFIC_NAME"] = reader.GetString("specific_name");
+ row["ROUTINE_CATALOG"] = DBNull.Value;
+ row["ROUTINE_SCHEMA"] = reader.GetString("routine_schema");
+ row["ROUTINE_NAME"] = reader.GetString("routine_name");
+ string routineType = reader.GetString("routine_type");
+ row["ROUTINE_TYPE"] = routineType;
+ row["DTD_IDENTIFIER"] = StringUtility.ToLowerInvariant(routineType) == "function" ?
+ (object)reader.GetString("DTD_IDENTIFIER") : DBNull.Value;
+ row["ROUTINE_BODY"] = "SQL";
+ row["ROUTINE_DEFINITION"] = reader.GetString("routine_definition");
+ row["EXTERNAL_NAME"] = DBNull.Value;
+ row["EXTERNAL_LANGUAGE"] = DBNull.Value;
+ row["PARAMETER_STYLE"] = "SQL";
+ row["IS_DETERMINISTIC"] = reader.GetString("is_deterministic");
+ row["SQL_DATA_ACCESS"] = reader.GetString("sql_data_access");
+ row["SQL_PATH"] = DBNull.Value;
+ row["SECURITY_TYPE"] = reader.GetString("security_type");
+ row["CREATED"] = reader.GetDateTime("created");
+ row["LAST_ALTERED"] = reader.GetDateTime("last_altered");
+ row["SQL_MODE"] = reader.GetString("sql_mode");
+ row["ROUTINE_COMMENT"] = reader.GetString("routine_comment");
+ row["DEFINER"] = reader.GetString("definer");
+ }
+ }
+ }
+ else
  {
- while (reader.Read())
+ sql = new StringBuilder("SELECT * FROM mysql.proc WHERE 1=1");
+ if (restrictions != null)
  {
- MySqlSchemaRow row = dt.AddRow();
- row["SPECIFIC_NAME"] = reader.GetString("specific_name");
- row["ROUTINE_CATALOG"] = DBNull.Value;
- row["ROUTINE_SCHEMA"] = reader.GetString("db");
- row["ROUTINE_NAME"] = reader.GetString("name");
- string routineType = reader.GetString("type");
- row["ROUTINE_TYPE"] = routineType;
- row["DTD_IDENTIFIER"] = StringUtility.ToLowerInvariant(routineType) == "function" ?
- (object)reader.GetString("returns") : DBNull.Value;
- row["ROUTINE_BODY"] = "SQL";
- row["ROUTINE_DEFINITION"] = reader.GetString("body");
- row["EXTERNAL_NAME"] = DBNull.Value;
- row["EXTERNAL_LANGUAGE"] = DBNull.Value;
- row["PARAMETER_STYLE"] = "SQL";
- row["IS_DETERMINISTIC"] = reader.GetString("is_deterministic");
- row["SQL_DATA_ACCESS"] = reader.GetString("sql_data_access");
- row["SQL_PATH"] = DBNull.Value;
- row["SECURITY_TYPE"] = reader.GetString("security_type");
- row["CREATED"] = reader.GetDateTime("created");
- row["LAST_ALTERED"] = reader.GetDateTime("modified");
- row["SQL_MODE"] = reader.GetString("sql_mode");
- row["ROUTINE_COMMENT"] = reader.GetString("comment");
- row["DEFINER"] = reader.GetString("definer");
+ if (restrictions.Length >= 2 && restrictions[1] != null)
+ sql.AppendFormat(CultureInfo.InvariantCulture,
+ " AND db LIKE '{0}'", restrictions[1]);
+ if (restrictions.Length >= 3 && restrictions[2] != null)
+ sql.AppendFormat(CultureInfo.InvariantCulture,
+ " AND name LIKE '{0}'", restrictions[2]);
+ if (restrictions.Length >= 4 && restrictions[3] != null)
+ sql.AppendFormat(CultureInfo.InvariantCulture,
+ " AND type LIKE '{0}'", restrictions[3]);
+ }
+
+ MySqlCommand cmd = new MySqlCommand(sql.ToString(), connection);
+ using (MySqlDataReader reader = cmd.ExecuteReader())
+ {
+ while (reader.Read())
+ {
+ MySqlSchemaRow row = dt.AddRow();
+ row["SPECIFIC_NAME"] = reader.GetString("specific_name");
+ row["ROUTINE_CATALOG"] = DBNull.Value;
+ row["ROUTINE_SCHEMA"] = reader.GetString("db");
+ row["ROUTINE_NAME"] = reader.GetString("name");
+ string routineType = reader.GetString("type");
+ row["ROUTINE_TYPE"] = routineType;
+ row["DTD_IDENTIFIER"] = StringUtility.ToLowerInvariant(routineType) == "function" ?
+ (object)reader.GetString("returns") : DBNull.Value;
+ row["ROUTINE_BODY"] = "SQL";
+ row["ROUTINE_DEFINITION"] = reader.GetString("body");
+ row["EXTERNAL_NAME"] = DBNull.Value;
+ row["EXTERNAL_LANGUAGE"] = DBNull.Value;
+ row["PARAMETER_STYLE"] = "SQL";
+ row["IS_DETERMINISTIC"] = reader.GetString("is_deterministic");
+ row["SQL_DATA_ACCESS"] = reader.GetString("sql_data_access");
+ row["SQL_PATH"] = DBNull.Value;
+ row["SECURITY_TYPE"] = reader.GetString("security_type");
+ row["CREATED"] = reader.GetDateTime("created");
+ row["LAST_ALTERED"] = reader.GetDateTime("modified");
+ row["SQL_MODE"] = reader.GetString("sql_mode");
+ row["ROUTINE_COMMENT"] = reader.GetString("comment");
+ row["DEFINER"] = reader.GetString("definer");
+ }
  }
  }
 

Source/MySql.Data/Types/MySqlDateTime.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc., 2009, 2014 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2009, 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 
@@ -272,7 +272,7 @@ private void SerializeText(MySqlPacket packet, MySqlDateTime value)
  if (type != MySqlDbType.Date)
  {
  val = value.Microsecond > 0 ? String.Format("{0} {1:00}:{2:00}:{3:00}.{4:000000}", val,
- value.Hour, value.Minute, value.Second, value.Microsecond) : String.Format("{0} {1:00}:{2:00}:{3:00} ", val,
+ value.Hour, value.Minute, value.Second, value.Microsecond) : String.Format("{0} {1:00}:{2:00}:{3:00}", val,
  value.Hour, value.Minute, value.Second);
  }
 

Tests/MySql.Data.Tests/CharacterSetTests.cs

@@ -1,4 +1,4 @@
-// Copyright © 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2013, 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 
@@ -291,7 +291,7 @@ public void FunctionReturnsStringWithCharSet()
  [Fact]
  public void RespectBinaryFlags()
  {
- if (st.Version.Major >= 5 && st.Version.Minor >= 5) return;
+ if (st.conn.driver.Version.isAtLeast(5,5,0)) return;
 
  string connStr = st.GetConnectionString(true) + ";respect binary flags=true";
  using (MySqlConnection c = new MySqlConnection(connStr))
@@ -383,7 +383,14 @@ public void UsingUtf16()
  con.Open();
  try
  {
- MySqlCommand cmd = new MySqlCommand("", con);
+ MySqlCommand cmd = null;
+ if (con.driver.Version.isAtLeast(8,0,1))
+ {
+ cmd = new MySqlCommand("SET SESSION SQL_MODE='ALLOW_INVALID_DATES';", con);
+ cmd.ExecuteNonQuery();
+ }
+
+ cmd = new MySqlCommand("", con);
  cmd.CommandText = "drop table if exists `actor`";
  cmd.ExecuteNonQuery();
  cmd.CommandText = @"CREATE TABLE `actor` (
@@ -442,7 +449,14 @@ public void UsingUtf32()
  con.Open();
  try
  {
- MySqlCommand cmd = new MySqlCommand("", con);
+ MySqlCommand cmd = null;
+ if (con.driver.Version.isAtLeast(8,0,1))
+ {
+ cmd = new MySqlCommand("SET SESSION SQL_MODE='ALLOW_INVALID_DATES';", con);
+ cmd.ExecuteNonQuery();
+ }
+
+ cmd = new MySqlCommand("", con);
  cmd.CommandText = "drop table if exists `actor`";
  cmd.ExecuteNonQuery();
  cmd.CommandText = @"CREATE TABLE `actor` (

Tests/MySql.Data.Tests/DataTypeTests.cs

@@ -1,4 +1,4 @@
-// Copyright © 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2013, 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 
@@ -254,7 +254,7 @@ public void TypeCoercion()
  public void Timestamp()
  {
  // don't run this test on 6 and higher
- if (st.Version.Major >= 5 && st.Version.Minor >= 5) return;
+ if (st.conn.driver.Version.isAtLeast(5,5,0)) return;
 
  st.execSQL("DROP TABLE IF EXISTS Test");
  st.execSQL("CREATE TABLE Test (id int, dt DATETIME, ts2 TIMESTAMP(2), ts4 TIMESTAMP(4), " +
@@ -782,8 +782,12 @@ public void GeometryType()
 
  st.execSQL(@"CREATE TABLE Test (ID int(11) NOT NULL, ogc_geom geometry NOT NULL,
  PRIMARY KEY (`ID`))");
- st.execSQL(@"INSERT INTO Test VALUES (1, 
- GeomFromText('GeometryCollection(Point(1 1), LineString(2 2, 3 3))'))");
+ if (st.conn.driver.Version.isAtLeast(8,0,1))
+ st.execSQL(@"INSERT INTO Test VALUES (1,
+ ST_GeomFromText('GeometryCollection(Point(1 1), LineString(2 2, 3 3))'))");
+ else
+ st.execSQL(@"INSERT INTO Test VALUES (1,
+ GeomFromText('GeometryCollection(Point(1 1), LineString(2 2, 3 3))'))");
 
  MySqlCommand cmd = new MySqlCommand("SELECT * FROM Test", st.conn);
  using (MySqlDataReader reader = cmd.ExecuteReader())
@@ -826,12 +830,17 @@ public void StoringAndRetrievingGeometry()
  st.execSQL("DROP TABLE IF EXISTS Test");
  st.execSQL("CREATE TABLE Test (v Geometry NOT NULL)");
 
- MySqlCommand cmd = new MySqlCommand("INSERT INTO Test VALUES (GeomFromText(?v))", st.conn);
+ MySqlCommand cmd = new MySqlCommand(st.conn.driver.Version.isAtLeast(8, 0, 1) ?
+ "INSERT INTO Test VALUES (ST_GeomFromText(?v))":
+ "INSERT INTO Test VALUES (GeomFromText(?v))"
+ , st.conn);
  cmd.Parameters.Add("?v", MySqlDbType.String);
  cmd.Parameters[0].Value = "POINT(47.37 -122.21)";
  cmd.ExecuteNonQuery();
 
- cmd.CommandText = "SELECT AsText(v) FROM Test";
+ cmd.CommandText = st.conn.driver.Version.isAtLeast(8, 0, 1) ?
+ "SELECT ST_AsText(v) FROM Test":
+ "SELECT AsText(v) FROM Test";
  using (MySqlDataReader reader = cmd.ExecuteReader())
  {
  reader.Read();
@@ -856,7 +865,9 @@ public void CanFetchGeometryAsBinary()
  cmd.Parameters.Add(par);
  cmd.ExecuteNonQuery();
 
- cmd.CommandText = "SELECT AsBinary(v) FROM Test";
+ cmd.CommandText = st.conn.driver.Version.isAtLeast(8, 0, 1) ?
+ "SELECT ST_AsBinary(v) FROM Test":
+ "SELECT AsBinary(v) FROM Test";
  using (MySqlDataReader reader = cmd.ExecuteReader())
  {
  reader.Read();
@@ -883,7 +894,9 @@ public void CanSaveSridValueOnGeometry()
  cmd.Parameters.Add(par);
  cmd.ExecuteNonQuery();
 
- cmd.CommandText = "SELECT SRID(v) FROM Test";
+ cmd.CommandText = st.conn.driver.Version.isAtLeast(8, 0, 1) ?
+ "SELECT ST_SRID(v) FROM Test":
+ "SELECT SRID(v) FROM Test";
 
  using (MySqlDataReader reader = cmd.ExecuteReader())
  {
@@ -910,7 +923,9 @@ public void CanFetchGeometryAsText()
  cmd.Parameters.Add(par);
  cmd.ExecuteNonQuery();
 
- cmd.CommandText = "SELECT AsText(v) FROM Test";
+ cmd.CommandText = st.conn.driver.Version.isAtLeast(8, 0, 1) ?
+ "SELECT ST_AsText(v) FROM Test":
+ "SELECT AsText(v) FROM Test";
 
  using (MySqlDataReader reader = cmd.ExecuteReader())
  {
@@ -937,7 +952,9 @@ public void CanUseReaderGetMySqlGeometry()
  cmd.ExecuteNonQuery();
 
  // reading as binary
- cmd.CommandText = "SELECT AsBinary(v) as v FROM Test";
+ cmd.CommandText = st.conn.driver.Version.isAtLeast(8, 0, 1) ?
+ "SELECT ST_AsBinary(v) as v FROM Test":
+ "SELECT AsBinary(v) as v FROM Test";
  using (MySqlDataReader reader = cmd.ExecuteReader())
  {
  reader.Read();