From 384e51dc0bfbac087dbe082f7ea7752f7f128d87 Mon Sep 17 00:00:00 2001
From: Hernan Martinez <hernan.c.martinez@gmail.com>
Date: Tue, 28 Dec 2021 22:24:08 -0700
Subject: [PATCH 1/4] Declared JSON as string data

# Conflicts:
#	Data/include/Poco/Data/MetaColumn.h
#	Data/src/RecordSet.cpp
#	Data/src/StatementImpl.cpp
---
 Data/MySQL/src/ResultMetadata.cpp   | 3 +++
 Data/include/Poco/Data/LOB.h        | 2 +-
 Data/include/Poco/Data/MetaColumn.h | 1 +
 Data/src/RecordSet.cpp              | 1 +
 Data/src/StatementImpl.cpp          | 2 ++
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp
index 14839f13b4..3d631c0d37 100644
--- a/Data/MySQL/src/ResultMetadata.cpp
+++ b/Data/MySQL/src/ResultMetadata.cpp
@@ -71,6 +71,7 @@ namespace
 		case MYSQL_TYPE_MEDIUM_BLOB:
 		case MYSQL_TYPE_LONG_BLOB:
 		case MYSQL_TYPE_BLOB:
+		case MYSQL_TYPE_JSON:
 			return field.length;
 
 		default:
@@ -128,6 +129,8 @@ namespace
 		case MYSQL_TYPE_LONG_BLOB:
 		case MYSQL_TYPE_BLOB:
 			return Poco::Data::MetaColumn::FDT_BLOB;
+		case MYSQL_TYPE_JSON:
+			return Poco::Data::MetaColumn::FDT_JSON;
 		default:
 			return Poco::Data::MetaColumn::FDT_UNKNOWN;
 		}
diff --git a/Data/include/Poco/Data/LOB.h b/Data/include/Poco/Data/LOB.h
index 3ca80463d2..ea8e842f39 100644
--- a/Data/include/Poco/Data/LOB.h
+++ b/Data/include/Poco/Data/LOB.h
@@ -221,7 +221,7 @@ class LOB
 
 using BLOB = LOB<unsigned char>;
 using CLOB = LOB<char>;
-
+using JSON = std::string;
 
 //
 // inlines
diff --git a/Data/include/Poco/Data/MetaColumn.h b/Data/include/Poco/Data/MetaColumn.h
index 2952ed83db..0351766f10 100644
--- a/Data/include/Poco/Data/MetaColumn.h
+++ b/Data/include/Poco/Data/MetaColumn.h
@@ -51,6 +51,7 @@ class Data_API MetaColumn
 		FDT_TIME,
 		FDT_TIMESTAMP,
 		FDT_UUID,
+		FDT_JSON,
 		FDT_UNKNOWN
 	};
 
diff --git a/Data/src/RecordSet.cpp b/Data/src/RecordSet.cpp
index a84c35fdf6..20e978b0a9 100644
--- a/Data/src/RecordSet.cpp
+++ b/Data/src/RecordSet.cpp
@@ -160,6 +160,7 @@ Poco::Dynamic::Var RecordSet::value(std::size_t col, std::size_t row, bool useFi
 	case MetaColumn::FDT_TIME:      return value<Time>(col, row, useFilter);
 	case MetaColumn::FDT_TIMESTAMP: return value<DateTime>(col, row);
 	case MetaColumn::FDT_UUID:      return value<UUID>(col, row);
+	case MetaColumn::FDT_JSON:      return value<std::string>(col, row, useFilter);
 	default:
 		throw UnknownTypeException("Data type not supported.");
 	}
diff --git a/Data/src/StatementImpl.cpp b/Data/src/StatementImpl.cpp
index c905253172..a00f93bccb 100644
--- a/Data/src/StatementImpl.cpp
+++ b/Data/src/StatementImpl.cpp
@@ -353,6 +353,8 @@ void StatementImpl::makeExtractors(std::size_t count)
 				addInternalExtract<DateTime>(mc); break;
 			case MetaColumn::FDT_UUID:
 				addInternalExtract<UUID>(mc); break;
+			case MetaColumn::FDT_JSON:
+				addInternalExtract<std::string>(mc); break;
 			default:
 				throw Poco::InvalidArgumentException("Data type not supported.");
 		}

From 789e25007e8524a932c64a66edf3f1318b2d5085 Mon Sep 17 00:00:00 2001
From: Hernan Martinez <hernan.c.martinez@gmail.com>
Date: Tue, 28 Dec 2021 22:24:23 -0700
Subject: [PATCH 2/4] Added JSON extractor as string

---
 .../MySQL/include/Poco/Data/MySQL/Extractor.h |  2 ++
 Data/MySQL/src/Extractor.cpp                  | 23 +++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
index ee337c5dd0..6952f8cd4e 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
@@ -325,6 +325,8 @@ class MySQL_API Extractor: public Poco::Data::AbstractExtractor
 
 	bool extractLongLOB(std::size_t pos);
 
+	bool extractJSON(std::size_t pos);
+
 	// Prevent VC8 warning "operator= could not be generated"
 	Extractor& operator=(const Extractor&);
 
diff --git a/Data/MySQL/src/Extractor.cpp b/Data/MySQL/src/Extractor.cpp
index 46218d96c8..8ee72ef3c5 100644
--- a/Data/MySQL/src/Extractor.cpp
+++ b/Data/MySQL/src/Extractor.cpp
@@ -128,9 +128,12 @@ bool Extractor::extract(std::size_t pos, std::string& val)
 
 	//mysql reports TEXT types as FDT_BLOB when being extracted
 	MetaColumn::ColumnDataType columnType = _metadata.metaColumn(static_cast<Poco::UInt32>(pos)).type();
-	if (columnType != Poco::Data::MetaColumn::FDT_STRING && columnType != Poco::Data::MetaColumn::FDT_BLOB)
+	if (columnType != Poco::Data::MetaColumn::FDT_STRING && columnType != Poco::Data::MetaColumn::FDT_BLOB && columnType != Poco::Data::MetaColumn::FDT_JSON)
 		throw MySQLException("Extractor: not a string");
 
+	if (columnType == Poco::Data::MetaColumn::FDT_JSON && !extractJSON(pos))
+		return false;
+
 	val.assign(reinterpret_cast<const char*>(_metadata.rawData(pos)), _metadata.length(pos));
 	return true;
 }
@@ -142,7 +145,7 @@ bool Extractor::extract(std::size_t pos, Poco::Data::BLOB& val)
 		throw MySQLException("Extractor: attempt to extract more parameters, than query result contain");
 
 	if (_metadata.isNull(static_cast<Poco::UInt32>(pos)))
-	return false;
+		return false;
 
 	if (_metadata.metaColumn(static_cast<Poco::UInt32>(pos)).type() != Poco::Data::MetaColumn::FDT_BLOB)
 		throw MySQLException("Extractor: not a blob");
@@ -285,6 +288,22 @@ bool Extractor::extractLongLOB(std::size_t pos)
 	return true;
 }
 
+bool Extractor::extractJSON(std::size_t pos)
+{
+	// Large LOBs (LONGBLOB and LONGTEXT) are fetched
+	// with a zero-length buffer to avoid allocating
+	// huge amounts of memory. Therefore, when extracting
+	// the buffers need to be adjusted.
+
+	_metadata.adjustColumnSizeToFit(pos);
+
+	MYSQL_BIND* row = _metadata.row();
+	row->buffer_type = MYSQL_TYPE_JSON;
+	if (!_stmt.fetchColumn(pos, &row[pos]))
+		return false;
+
+	return true;
+}
 
 //////////////
 // Not implemented

From c68598d9cc76abb39ba31a693e0a48756efdb655 Mon Sep 17 00:00:00 2001
From: Hernan Martinez <hernan.c.martinez@gmail.com>
Date: Tue, 28 Dec 2021 22:24:31 -0700
Subject: [PATCH 3/4] Added unit test

---
 Data/MySQL/testsuite/src/MySQLTest.cpp   | 18 +++++++++++++++++
 Data/MySQL/testsuite/src/MySQLTest.h     |  2 ++
 Data/MySQL/testsuite/src/SQLExecutor.cpp | 25 ++++++++++++++++++++++++
 Data/MySQL/testsuite/src/SQLExecutor.h   |  1 +
 4 files changed, 46 insertions(+)

diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp
index f485c0f12e..bdfb68377c 100644
--- a/Data/MySQL/testsuite/src/MySQLTest.cpp
+++ b/Data/MySQL/testsuite/src/MySQLTest.cpp
@@ -477,6 +477,14 @@ void MySQLTest::testLongBLOB()
 	_pExecutor->longBlob();
 }
 
+void MySQLTest::testJSON()
+{
+	if (!_pSession) fail("Test not available.");
+
+	recreatePersonJSONTable();
+	_pExecutor->json();
+}
+
 
 void MySQLTest::testUnsignedInts()
 {
@@ -770,6 +778,15 @@ void MySQLTest::recreatePersonLongBLOBTable()
 }
 
 
+void MySQLTest::recreatePersonJSONTable()
+{
+	dropTable("Person");
+	try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Biography JSON)", now; }
+	catch (ConnectionException& ce) { std::cout << ce.displayText() << std::endl; fail("recreatePersonLongBLOBTable()"); }
+	catch (StatementException& se) { std::cout << se.displayText() << std::endl; fail("recreatePersonLongBLOBTable()"); }
+}
+
+
 void MySQLTest::recreateIntsTable()
 {
 	dropTable("Strings");
@@ -938,6 +955,7 @@ CppUnit::Test* MySQLTest::suite()
 	//CppUnit_addTest(pSuite, MySQLTest, testBLOB);
 	CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt);
 	CppUnit_addTest(pSuite, MySQLTest, testLongBLOB);
+	CppUnit_addTest(pSuite, MySQLTest, testJSON);
 	CppUnit_addTest(pSuite, MySQLTest, testUnsignedInts);
 	CppUnit_addTest(pSuite, MySQLTest, testFloat);
 	CppUnit_addTest(pSuite, MySQLTest, testDouble);
diff --git a/Data/MySQL/testsuite/src/MySQLTest.h b/Data/MySQL/testsuite/src/MySQLTest.h
index 7805f829bd..3d75d7f45f 100644
--- a/Data/MySQL/testsuite/src/MySQLTest.h
+++ b/Data/MySQL/testsuite/src/MySQLTest.h
@@ -80,6 +80,7 @@ class MySQLTest: public CppUnit::TestCase
 	void testBLOB();
 	void testBLOBStmt();
 	void testLongBLOB();
+	void testJSON();
 
 	void testUnsignedInts();
 	void testFloat();
@@ -119,6 +120,7 @@ class MySQLTest: public CppUnit::TestCase
 	void recreatePersonDateTable();
 	void recreatePersonTimeTable();
 	void recreatePersonLongBLOBTable();
+	void recreatePersonJSONTable();
 	void recreateStringsTable();
 	void recreateIntsTable();
 	void recreateUnsignedIntsTable();
diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp
index a68942ac06..e8a22b7c14 100644
--- a/Data/MySQL/testsuite/src/SQLExecutor.cpp
+++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp
@@ -1460,6 +1460,31 @@ void SQLExecutor::longBlob()
 	poco_assert (res == biography);
 }
 
+void SQLExecutor::json()
+{
+	std::string funct = "json()";
+	std::string lastName("lastname");
+	std::string firstName("firstname");
+	std::string address("Address");
+	std::string biography(R"({"biography": {"count": 42, "title": "Lorem Ipsum", "released": true}})");
+
+	int count = 0;
+	Statement ins = (*_pSession << "INSERT INTO Person VALUES (?,?,?,?)", use(lastName), use(firstName), use(address), use(biography));
+	ins.execute();
+	try { *_pSession << "SELECT COUNT(*) FROM Person", into(count), now; }
+	catch (ConnectionException& ce) { std::cout << ce.displayText() << std::endl; fail(funct); }
+	catch (StatementException& se) { std::cout << se.displayText() << std::endl; fail(funct); }
+	assertTrue(count == 1);
+
+	Poco::Data::JSON res;
+	poco_assert(res.size() == 0);
+	Statement stmt = (*_pSession << "SELECT Biography FROM Person", into(res));
+	try { stmt.execute(); }
+	catch (ConnectionException& ce) { std::cout << ce.displayText() << std::endl; fail(funct); }
+	catch (StatementException& se) { std::cout << se.displayText() << std::endl; fail(funct); }
+	poco_assert(res == biography);
+}
+
 
 void SQLExecutor::tuples()
 {
diff --git a/Data/MySQL/testsuite/src/SQLExecutor.h b/Data/MySQL/testsuite/src/SQLExecutor.h
index 1269fbd42d..e118118532 100644
--- a/Data/MySQL/testsuite/src/SQLExecutor.h
+++ b/Data/MySQL/testsuite/src/SQLExecutor.h
@@ -84,6 +84,7 @@ class SQLExecutor: public CppUnit::TestCase
 	void date();
 	void time();
 	void longBlob();
+	void json();
 	void unsignedInts();
 	void floats();
 	void doubles();

From 625aa46505e89cce64a0ddaadfa9b5546c55a02c Mon Sep 17 00:00:00 2001
From: Hernan Martinez <hernan.c.martinez@gmail.com>
Date: Sat, 14 May 2022 20:26:54 -0600
Subject: [PATCH 4/4] Update comment

---
 Data/MySQL/src/Extractor.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Data/MySQL/src/Extractor.cpp b/Data/MySQL/src/Extractor.cpp
index 8ee72ef3c5..0e0862ea33 100644
--- a/Data/MySQL/src/Extractor.cpp
+++ b/Data/MySQL/src/Extractor.cpp
@@ -290,10 +290,9 @@ bool Extractor::extractLongLOB(std::size_t pos)
 
 bool Extractor::extractJSON(std::size_t pos)
 {
-	// Large LOBs (LONGBLOB and LONGTEXT) are fetched
-	// with a zero-length buffer to avoid allocating
-	// huge amounts of memory. Therefore, when extracting
-	// the buffers need to be adjusted.
+	// JSON columns are fetched with a zero-length
+	// buffer to avoid allocating huge amounts of memory.
+	// Therefore, when extracting the buffers need to be adjusted.
 
 	_metadata.adjustColumnSizeToFit(pos);