0013-mysql-workbench-no-json.patch 2.88 KB
Newer Older
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
diff -Pdpru mysql-workbench-community-6.3.5-src.orig/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp 
mysql-workbench-community-6.3.5-src/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
--- mysql-workbench-community-6.3.5-src.orig/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp	2015-10-17 16:35:49.000000000 +0200
+++ mysql-workbench-community-6.3.5-src/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp	2015-11-12 06:33:10.787604909 +0100
@@ -314,9 +314,9 @@ public:
         case sql::DataType::SET:
           type = "string";
           break;
-        case sql::DataType::JSON:
-          type = "json";
-          break;
+//        case sql::DataType::JSON:
+//          type = "json";
+//          break;
         case sql::DataType::SQLNULL:
           type = "null";
           break;
diff -Pdpru mysql-workbench-community-6.3.5-src.orig/plugins/migration/copytable/copytable.cpp mysql-workbench-community-6.3.5-src/plugins/migration/copytable/copytable.cpp
--- mysql-workbench-community-6.3.5-src.orig/plugins/migration/copytable/copytable.cpp	2015-10-17 16:35:48.000000000 +0200
+++ mysql-workbench-community-6.3.5-src/plugins/migration/copytable/copytable.cpp	2015-11-12 00:02:35.378227904 +0100
@@ -109,8 +109,8 @@ static const char *mysql_field_type_to_n
       return "MYSQL_TYPE_STRING";
     case MYSQL_TYPE_GEOMETRY:
       return "MYSQL_TYPE_GEOMETRY";
-    case MYSQL_TYPE_JSON:
-      return "MYSQL_TYPE_JSON";
+//    case MYSQL_TYPE_JSON:
+//      return "MYSQL_TYPE_JSON";
gnastyle's avatar
gnastyle committed
29 30 31
     default:
       return "UNKNOWN";
   }
32
@@ -241,7 +241,7 @@ RowBuffer::RowBuffer(boost::shared_ptr<s
gnastyle's avatar
gnastyle committed
33 34 35 36 37 38
       case MYSQL_TYPE_STRING:
       case MYSQL_TYPE_VAR_STRING:
       case MYSQL_TYPE_BIT:
-      case MYSQL_TYPE_JSON:
+//      case MYSQL_TYPE_JSON:
         if (!col->is_long_data)
39
           bind.buffer_length = (unsigned)col->source_length + 1;
gnastyle's avatar
gnastyle committed
40
 
41 42 43 44 45 46
@@ -1393,7 +1393,7 @@ bool MySQLCopyDataSource::fetch_row(RowB
               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_GEOMETRY) {
gnastyle's avatar
gnastyle committed
47 48
             if (rowbuffer[index].buffer_length)
               free(rowbuffer[index].buffer);
49 50 51 52 53 54 55 56 57 58 59
 
@@ -2162,7 +2162,7 @@ bool MySQLCopyDataTarget::append_bulk_co
       case MYSQL_TYPE_STRING:
       case MYSQL_TYPE_ENUM:
       case MYSQL_TYPE_SET:
-      case MYSQL_TYPE_JSON:
+//      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);