summaryrefslogtreecommitdiff
path: root/development/mysql-workbench/mysql-workbench-no-json.patch
blob: 100b27a48e277cde63b8bb58962118b7ecb2decb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
--- mysql-workbench-community-6.3.9-src/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp.orig	2017-02-08 22:24:43.203746527 +0700
+++ mysql-workbench-community-6.3.9-src/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp	2017-02-08 22:25:07.878416096 +0700
@@ -314,9 +314,6 @@
         case sql::DataType::SET:
           type = "string";
           break;
-        case sql::DataType::JSON:
-          type = "json";
-          break;
         case sql::DataType::SQLNULL:
           type = "null";
           break;
--- mysql-workbench-community-6.3.9-src/plugins/migration/copytable/copytable.cpp.orig	2017-02-08 22:15:34.084153506 +0700
+++ mysql-workbench-community-6.3.9-src/plugins/migration/copytable/copytable.cpp	2017-02-08 22:23:01.194114625 +0700
@@ -109,8 +109,6 @@
       return "MYSQL_TYPE_STRING";
     case MYSQL_TYPE_GEOMETRY:
       return "MYSQL_TYPE_GEOMETRY";
-    case MYSQL_TYPE_JSON:
-      return "MYSQL_TYPE_JSON";
     default:
       return "UNKNOWN";
   }
@@ -295,7 +293,6 @@
       case MYSQL_TYPE_STRING:
       case MYSQL_TYPE_VAR_STRING:
       case MYSQL_TYPE_BIT:
-      case MYSQL_TYPE_JSON:
         if (!col->is_long_data)
           bind.buffer_length = (unsigned)col->source_length + 1;
 
@@ -1391,8 +1388,7 @@
           if (rowbuffer[index].buffer_type == MYSQL_TYPE_TINY_BLOB ||
               rowbuffer[index].buffer_type == MYSQL_TYPE_MEDIUM_BLOB ||
               rowbuffer[index].buffer_type == MYSQL_TYPE_LONG_BLOB || rowbuffer[index].buffer_type == MYSQL_TYPE_BLOB ||
-              rowbuffer[index].buffer_type == MYSQL_TYPE_STRING ||
-              rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON) {
+              rowbuffer[index].buffer_type == MYSQL_TYPE_STRING) {
             if (rowbuffer[index].buffer_length)
               free(rowbuffer[index].buffer);
 
@@ -2162,7 +2158,6 @@
       case MYSQL_TYPE_STRING:
       case MYSQL_TYPE_ENUM:
       case MYSQL_TYPE_SET:
-      case MYSQL_TYPE_JSON:
         _bulk_insert_record.append("'", 1);
         ret_val = _bulk_insert_record.append_escaped((char *)(*_row_buffer)[col_index].buffer,
                                                      *(*_row_buffer)[col_index].length);