Merge remote-tracking branch 'remotes/origin/6.7' into 6.8

Author: Gabriela Martinez

CHANGES

@@ -2,6 +2,7 @@
 - Changed handshake process to use bytes instead of encoded strings.
 - Added support for Chinese character set gb18030. (Oracle bug # 21098546).
 - Added support for Json type. (WL # 8132).
+- Added changes for metadata information in generated columns with 5.7 (WL #411)
 
 
 6.8.6

Source/MySql.Data/SchemaProvider.cs

@@ -1,4 +1,4 @@
-// Copyright © 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2004, 2015, 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 
@@ -175,6 +175,7 @@ public virtual MySqlSchemaCollection GetColumns(string[] restrictions)
  c.AddColumn("EXTRA", typeof(string));
  c.AddColumn("PRIVILEGES", typeof(string));
  c.AddColumn("COLUMN_COMMENT", typeof(string));
+ c.AddColumn("GENERATION_EXPRESSION", typeof(string));
 
  // we don't allow restricting on table type here
  string columnName = null;
@@ -228,6 +229,7 @@ private void LoadTableColumns(MySqlSchemaCollection schemaCollection, string sch
  row["EXTRA"] = reader.GetString(6);
  row["PRIVILEGES"] = reader.GetString(7);
  row["COLUMN_COMMENT"] = reader.GetString(8);
+ row["GENERATION_EXPRESION"] = reader.GetString(6).Contains("VIRTUAL") ? reader.GetString(9) : string.Empty; 
  ParseColumnRow(row);
  }
  }

Tests/MySql.Data.Tests/GetSchemaTests.cs

@@ -257,6 +257,34 @@ col3 varchar(50) character set utf8, col4 tinyint unsigned,
  Assert.Equal("BOO", dt.Rows[4]["COLUMN_DEFAULT"].ToString().ToUpper());
  }
 
+
+ ///<summary>
+ ///Testing out schema information about generated columns
+ /// only in version 5.7.6 or later 
+ ///</summary>
+ [Fact]
+ public void CanGetSchemaInformationGeneratedColumns()
+ { 
+ if (st.Version < new Version(5, 7, 6)) return;
+
+ st.execSQL("DROP TABLE IF EXISTS test");
+ st.execSQL("CREATE TABLE `Test` (`ID` int NOT NULL AUTO_INCREMENT PRIMARY KEY, `Name` char(35) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL)");
+
+ var cmd = new MySqlCommand("ALTER TABLE test ADD COLUMN Name_ci char(35) CHARACTER SET utf8 AS (Name) STORED;", st.conn);
+ cmd.ExecuteNonQuery();
+
+ DataTable dt = st.conn.GetSchema("Columns", new string[] { null, null, "test", null });
+ Assert.Equal(3, dt.Rows.Count);
+ Assert.Equal("Columns", dt.TableName);
+ if (st.Version.Major >= 5 && st.Version.Minor >= 7 && st.Version.Build >= 6)
+ {
+ Assert.Equal("char", dt.Rows[2]["DATA_TYPE"]);
+ Assert.Equal("Name", dt.Rows[2]["GENERATION_EXPRESSION"]);
+ Assert.Equal("STORED GENERATED", dt.Rows[2]["EXTRA"]); 
+ }
+ }
+
+
  /// <summary> 
  /// Bug #46270 connection.GetSchema("Columns") fails on MySQL 4.1 
  /// </summary> 

Tests/MySql.Data.Tests/SetUp.cs

@@ -173,7 +173,7 @@ protected void LoadBaseConfiguration()
  if (string.IsNullOrEmpty(rootUser))
  rootUser = "root";
  if (string.IsNullOrEmpty(rootPassword))
-  rootPassword = string.Empty;
+ rootPassword = "mypass";
  if (string.IsNullOrEmpty(host))
  host = "localhost";
  if (string.IsNullOrEmpty(portString))