Allow JSON columns on C/C++

Data can be retrieved as getString().

Author: silvakid

cppconn/datatype.h

@@ -59,7 +59,8 @@ class DataType
 		GEOMETRY,
 		ENUM,
 		SET,
-		SQLNULL
+		SQLNULL,
+		JSON
 	};
 };
 

driver/mysql_ps_resultset.cpp

@@ -1033,6 +1033,7 @@ MySQL_Prepared_ResultSet::getString(const uint32_t columnIndex) const
         case sql::DataType::LONGVARBINARY:
         case sql::DataType::SET:
         case sql::DataType::ENUM:
+        case sql::DataType::JSON:
             CPP_INFO("It's a string");
             return  sql::SQLString(static_cast<char *>(result_bind->rbind[columnIndex - 1].buffer), *result_bind->rbind[columnIndex - 1].length);
         default:

driver/mysql_resultbind.cpp

@@ -85,6 +85,7 @@ allocate_buffer_for_field(const MYSQL_FIELD * const field)
 		case MYSQL_TYPE_BLOB:
 		case MYSQL_TYPE_STRING:
 		case MYSQL_TYPE_VAR_STRING:
+    case MYSQL_TYPE_JSON:
 			return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
 
 		case MYSQL_TYPE_DECIMAL:

driver/mysql_resultset.cpp

@@ -926,7 +926,7 @@ MySQL_ResultSet::next()
             sql::SQLException e(proxy_p->error(), proxy_p->sqlstate(), proxy_p->errNo());
             throw e;
         }
-        if (ret = (row != NULL)) {
+        if ((ret = (row != NULL))) {
             ++row_position;
         } else {
             row_position = 0;

driver/mysql_util.cpp

@@ -431,6 +431,8 @@ mysql_type_to_datatype(const MYSQL_FIELD * const field)
 			return sql::DataType::SET;
 		case MYSQL_TYPE_GEOMETRY:
 			return sql::DataType::GEOMETRY;
+		case MYSQL_TYPE_JSON:
+		  return sql::DataType::JSON;
 		default:
 			return sql::DataType::UNKNOWN;
 	}
@@ -496,6 +498,8 @@ mysql_string_type_to_datatype(const sql::SQLString & name)
 		return sql::DataType::SET;
 	} else if (!name.compare("geometry")) {
 		return sql::DataType::GEOMETRY;
+	} else if (!name.compare("json")) {
+	  return sql::DataType::JSON;
 	} else {
 		return sql::DataType::UNKNOWN;
 	}

test/unit/classes/resultset.cpp

@@ -1047,6 +1047,49 @@ void resultset::getResultSetType()
   }
 }
 
+void resultset::JSON_support()
+{
+  std::stringstream msg;
+
+  logMsg("resultset::JSON_support - MySQL_ResultSet::*");
+  try
+  {
+    stmt.reset(con->createStatement());
+    stmt->execute("DROP TABLE IF EXISTS test");
+    stmt->execute("CREATE TABLE test(id INT, jval JSON)");
+    stmt->execute("INSERT INTO test(id, jval) VALUES(1, '[1]')");
+
+#ifdef INCLUDE_NOT_IMPLEMENTED_METHODS
+    doNotImplemented();
+#endif
+
+    pstmt.reset(con->prepareStatement("SELECT * FROM test"));
+    res.reset(pstmt->executeQuery());
+    res->next();
+
+    msg.str();
+    msg << "... PS: id = " << res->getInt(1);
+    msg << "... PS: jval = " << res->getString(2);
+    logMsg(msg.str());
+
+    res.reset(stmt->executeQuery("SELECT * FROM test"));
+    res->next();
+
+    msg.str();
+    msg << "... Statement: id = " << res->getInt(1);
+    msg << "... Statement: jval = " << res->getString(2);
+    logMsg(msg.str());
+
+    stmt->execute("DROP TABLE IF EXISTS test");
+  }
+  catch (sql::SQLException &e)
+  {
+    logErr(e.what());
+    logErr("SQLState: " + std::string(e.getSQLState()));
+    fail(e.what(), __FILE__, __LINE__);
+  }
+}
+
 
 } /* namespace resultset */
 } /* namespace testsuite */

test/unit/classes/resultset.h

@@ -56,6 +56,7 @@ class resultset : public unit_fixture
     TEST_CASE(getTypes);
     TEST_CASE(getResultSetType);
     TEST_CASE(getTypesMinorIssues);
+    TEST_CASE(JSON_support);
 
 #ifdef INCLUDE_NOT_IMPLEMENTED_METHODS
     TEST_CASE(notImplemented);
@@ -109,6 +110,13 @@ class resultset : public unit_fixture
    */
   void fetchBitAsInt();
 
+  /**
+   * Test for resultset::getString() on JSON type columns
+   *
+   * Test of the assorted methods to fetch JSON strings
+   */
+  void JSON_support();
+
 
 };