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

Author: Gabriela Martinez

CHANGES

@@ -1,5 +1,6 @@
 6.9.8
 - Added support for Chinese character set gb18030. (Oracle bug # 21098546).
+- Added support for Json type. (WL # 8132).
 
 6.9.7
 - Changed default SSL mode to Preferred in connection string. Now the server connections will be using SSL if server allows it by default but it's possible to override this configuration.

Source/MySql.Data/Field.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 
@@ -374,6 +374,7 @@ public static IMySqlValue GetIMySqlValue(MySqlDbType type)
         case MySqlDbType.TinyText:
         case MySqlDbType.MediumText:
         case MySqlDbType.LongText:
+        case MySqlDbType.JSON:
         case (MySqlDbType)Field_Type.NULL:
           return new MySqlString(type, true);
 #if !CF

Source/MySql.Data/MysqlDefs.cs

@@ -1,4 +1,4 @@
-// Copyright © 2004, 2011, 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 
@@ -201,6 +201,10 @@ public enum MySqlDbType
     /// </summary>
     Bit = 16,
     /// <summary>
+    /// JSON
+    /// </summary>
+    JSON = 245,
+    /// <summary>
     /// New Decimal
     /// </summary>
     NewDecimal = 246,

Tests/MySql.Data.Tests/DataTypeTests.cs

@@ -1,4 +1,4 @@
-// Copyright © 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2013, 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 
@@ -1277,5 +1277,52 @@ public void Timediff()
       var result = cmd.ExecuteScalar();
       Assert.Equal(new TimeSpan(new TimeSpan(-2, -1, -1, -2).Ticks - 1234560), result);
     }
+
+    [Fact]
+    public void CanReadJsonValue()
+    {
+      st.execSQL("DROP TABLE IF EXISTS test");
+      st.execSQL("CREATE TABLE test(Id int NOT NULL PRIMARY KEY, jsoncolumn JSON)");
+    
+      MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES (@id, '[1]')", st.conn);
+      cmd.Parameters.AddWithValue("@id", 1);
+      cmd.ExecuteNonQuery();
+
+      string command = @"INSERT INTO test VALUES (@id, '[""a"", {""b"": [true, false]}, [10, 20]]')";
+      cmd = new MySqlCommand(command, st.conn);
+      cmd.Parameters.AddWithValue("@id", 2);
+      cmd.ExecuteNonQuery();
+
+      cmd = new MySqlCommand("SELECT jsoncolumn from test where id = 2 ", st.conn);
+
+      using (MySqlDataReader reader = cmd.ExecuteReader())
+      {
+        Assert.True(reader.Read());
+        Assert.Equal("[\"a\", {\"b\": [true, false]}, [10, 20]]", reader.GetString(0));
+      }    
+    }
+
+    [Fact]
+    public void CanUpdateJsonValue()
+    {
+      st.execSQL("DROP TABLE IF EXISTS test");
+      st.execSQL("CREATE TABLE test(Id int NOT NULL PRIMARY KEY, jsoncolumn JSON)");
+
+      MySqlCommand cmd = new MySqlCommand("INSERT INTO test VALUES (@id, '[1]')", st.conn);
+      cmd.Parameters.AddWithValue("@id", 1);
+      cmd.ExecuteNonQuery();
+
+      string command = @"UPDATE test set jsoncolumn = '[""a"", {""b"": [true, false]}, [10, 20]]' where id = 1";
+      cmd = new MySqlCommand(command, st.conn);      
+      cmd.ExecuteNonQuery();
+
+      cmd = new MySqlCommand("SELECT jsoncolumn from test where id = 1 ", st.conn);
+
+      using (MySqlDataReader reader = cmd.ExecuteReader())
+      {
+        Assert.True(reader.Read());
+        Assert.Equal("[\"a\", {\"b\": [true, false]}, [10, 20]]", reader.GetString(0));
+      }
+    }
   }
 }

Tests/MySql.Data.Tests/MySqlConnectionTests.cs

@@ -1129,6 +1129,8 @@ public void PasswordExpiration()
       [Fact]
       public void OldPasswordNotSupported()
       {
+
+          if (st.Version > new Version(5, 6)) return;
           //get value of flag 'old_passwords'
           MySqlConnectionStringBuilder csb = new MySqlConnectionStringBuilder(st.GetConnectionString(true));
           MySqlConnection con = new MySqlConnection(csb.ToString());