add support for MySQL 8

Data/MySQL/include/Poco/Data/MySQL/Binder.h

@@ -17,12 +17,14 @@
 #ifndef Data_MySQL_Binder_INCLUDED
 #define Data_MySQL_Binder_INCLUDED
 
+
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/AbstractBinder.h"
 #include "Poco/Data/LOB.h"
 #include "Poco/Data/MySQL/MySQLException.h"
 #include <mysql.h>
 
+
 namespace Poco {
 namespace Data {
 namespace MySQL {
@@ -105,7 +107,6 @@ public:
 	virtual void bind(std::size_t pos, const NullData& val, Direction dir);
 		/// Binds a null.
 
-
 	virtual void bind(std::size_t pos, const std::vector<Poco::Int8>& val, Direction dir = PD_IN);
 
 	virtual void bind(std::size_t pos, const std::deque<Poco::Int8>& val, Direction dir = PD_IN);
@@ -226,9 +227,6 @@ public:
 	MYSQL_BIND* getBindArray() const;
 		/// Return array
 
-	//void updateDates();
-		/// Update linked times
-
 private:
 	Binder(const Binder&);
 		/// Don't copy the binder
@@ -244,7 +242,6 @@ private:
 		/// Common bind implementation
 
 private:
-
 	std::vector<MYSQL_BIND> _bindArray;
 	std::vector<MYSQL_TIME*> _dates;
 };

Data/MySQL/include/Poco/Data/MySQL/Connector.h

@@ -31,7 +31,6 @@ class MySQL_API Connector: public Poco::Data::Connector
 	/// Connector instantiates MySQL SessionImpl objects.
 {
 public:
-
 	static std::string KEY;
 
 	Connector();

Data/MySQL/include/Poco/Data/MySQL/Extractor.h

@@ -318,18 +318,17 @@ public:
 		/// Extracts a Dynamic::Var list.
 
 private:
-
 	bool realExtractFixed(std::size_t pos, enum_field_types type, void* buffer, bool isUnsigned = false);
 
 	// Prevent VC8 warning "operator= could not be generated"
 	Extractor& operator=(const Extractor&);
 
 private:
-
 	StatementExecutor& _stmt;
 	ResultMetadata& _metadata;
 };
 
+
 } } } // namespace Poco::Data::MySQL
 
 

Data/MySQL/include/Poco/Data/MySQL/MySQLException.h

@@ -17,31 +17,27 @@
 #ifndef Data_MySQL_MySQLException_INCLUDED
 #define Data_MySQL_MySQLException_INCLUDED
 
+
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/DataException.h"
 #include <typeinfo>
 #include <string>
+#include <mysql.h>
 
-#ifndef MYSQL
-typedef struct st_mysql MYSQL;
-#endif
-
-#ifndef MYSQL_STMT
-typedef struct st_mysql_stmt MYSQL_STMT;
-#endif
 
 namespace Poco {
 namespace Data {
 namespace MySQL {
 
+
 // End-user include this file and use in code ConnectionException/StatementException
 // So it need not know
 
+
 class MySQL_API MySQLException: public Poco::Data::DataException
 	/// Base class for all MySQL exceptions
 {
 public:
-
 	MySQLException(const std::string& msg);
 		/// Creates MySQLException.
 
@@ -79,7 +75,6 @@ class ConnectionException : public MySQLException
 	/// ConnectionException
 {
 public:
-
 	ConnectionException(const std::string& msg);
 		/// Creates ConnectionException from string.
 
@@ -87,9 +82,7 @@ public:
 		/// Creates ConnectionException from string and handle.
 
 private:
-
 	static std::string compose(const std::string& text, MYSQL* h);
-
 };
 
 
@@ -97,7 +90,6 @@ class TransactionException : public ConnectionException
 	/// TrabsactionException
 {
 public:
-
 	TransactionException(const std::string& msg);
 		/// Creates TransactionException from string.
 
@@ -110,7 +102,6 @@ class StatementException : public MySQLException
 	/// StatementException
 {
 public:
-
 	StatementException(const std::string& msg);
 		/// Creates StatementException from string.
 
@@ -118,7 +109,6 @@ public:
 		/// Creates StatementException from string and handle.
 
 private:
-
 	static std::string compose(const std::string& text, MYSQL_STMT* h, const std::string& stmt);
 };
 
@@ -127,6 +117,7 @@ private:
 // inlines
 //
 
+
 inline MySQLException& MySQLException::operator=(const MySQLException& exc)
 {
 	Poco::Data::DataException::operator=(exc);
@@ -156,4 +147,5 @@ inline void MySQLException::rethrow() const
 
 } } } // namespace Poco::Data::MySQL
 
+
 #endif //Data_MySQL_MySQLException_INCLUDED

Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h

@@ -17,6 +17,7 @@
 #ifndef Data_MySQL_MySQLStatementImpl_INCLUDED
 #define Data_MySQL_MySQLStatementImpl_INCLUDED
 
+
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/MySQL/SessionImpl.h"
 #include "Poco/Data/MySQL/Binder.h"
@@ -44,7 +45,6 @@ public:
 		/// Destroys the MySQLStatementImpl.
 		
 protected:
-
 	virtual std::size_t columnsReturned() const;
 		/// Returns number of columns returned by query.
 
@@ -93,7 +93,7 @@ private:
 	Binder::Ptr       _pBinder;
 	Extractor::Ptr    _pExtractor;
 	int               _hasNext;
-	};
+};
 
 
 } } } // namespace Poco::Data::MySQL

Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h

@@ -17,19 +17,29 @@
 #ifndef Data_MySQL_ResultMetadata_INCLUDED
 #define Data_MySQL_ResultMetadata_INCLUDED
 
+
 #include <mysql.h>
 #include <vector>
 #include "Poco/Data/MetaColumn.h"
 
+
+#if LIBMYSQL_VERSION_ID >= 80000
+typedef bool my_bool;  // Workaround to make library work with MySQL client 8.0 as well as earlier versions
+typedef char my_boolv; // Workaround for std::vector<bool>
+#else
+typedef my_bool my_boolv;
+#endif
+
+
 namespace Poco {
 namespace Data {
 namespace MySQL {
 
+
 class ResultMetadata
 	/// MySQL result metadata
 {
 public:
-
 	void reset();
 		/// Resets the metadata.
 
@@ -59,9 +69,11 @@ private:
 	std::vector<MYSQL_BIND>    _row;
 	std::vector<char>          _buffer;
 	std::vector<unsigned long> _lengths;
-	std::vector<my_bool>       _isNull;
+	std::vector<my_boolv>      _isNull; // using char instead of bool to avoid std::vector<bool> disaster
 };
 
-}}}
+
+} } } // namespace Poco::Data::MySQL
+
 
 #endif //Data_MySQL_ResultMetadata_INCLUDED

Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h

@@ -17,18 +17,20 @@
 #ifndef Data_MySQL_SessionHandle_INCLUDED
 #define Data_MySQL_SessionHandle_INCLUDED
 
+
 #include <mysql.h>
 #include "Poco/Data/MySQL/MySQLException.h"
 
+
 namespace Poco {
 namespace Data {
 namespace MySQL {
 
+
 class SessionHandle
 	/// MySQL session handle
 {
 public:
-
 	explicit SessionHandle(MYSQL* mysql);
 		/// Creates session handle
 
@@ -71,12 +73,10 @@ public:
 	operator MYSQL* ();
 
 private:
-
 	SessionHandle(const SessionHandle&);
 	SessionHandle& operator=(const SessionHandle&);
 
 private:
-
 	MYSQL* _pHandle;
 };
 
@@ -91,6 +91,7 @@ inline SessionHandle::operator MYSQL* ()
 }
 
 
-}}}
+} } } // namespace Poco::Data::MySQL
+
 
 #endif // Data_MySQL_SessionHandle_INCLUDED

Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h

@@ -127,7 +127,6 @@ public:
 		/// Returns the name of the connector.
 
 private:
-
 	template <typename T>
 	static inline T& getValue(MYSQL_BIND* pResult, T& val)
 	{

Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h

@@ -17,13 +17,16 @@
 #ifndef Data_MySQL_StatementHandle_INCLUDED
 #define Data_MySQL_StatementHandle_INCLUDED
 
+
 #include <mysql.h>
 #include "Poco/Data/MySQL/MySQLException.h"
 
+
 namespace Poco {
 namespace Data {
 namespace MySQL {
 
+
 class StatementExecutor
 	/// MySQL statement executor.
 {
@@ -68,7 +71,6 @@ public:
 		/// Cast operator to native handle type.
 
 private:
-
 	StatementExecutor(const StatementExecutor&);
 	StatementExecutor& operator=(const StatementExecutor&);
 
@@ -91,7 +93,7 @@ inline StatementExecutor::operator MYSQL_STMT* ()
 }
 
 
-}}}
+} } } // namespace Poco::Data::MySQL
 
 
 #endif // Data_MySQL_StatementHandle_INCLUDED

Data/MySQL/include/Poco/Data/MySQL/Utility.h

@@ -20,10 +20,7 @@
 
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/Session.h"
-
-
-struct st_mysql;
-typedef struct st_mysql MYSQL;
+#include <mysql.h>
 
 
 namespace Poco {
@@ -35,7 +32,6 @@ class MySQL_API Utility
 	/// Various utility functions for MySQL.
 {
 public:
-
 	static std::string serverInfo(MYSQL* pHandle);
 		/// Returns server info.
 

Data/MySQL/src/Extractor.cpp

@@ -13,10 +13,10 @@
 
 
 #include "Poco/Data/MySQL/Extractor.h"
-
 #include "Poco/Data/Date.h"
 #include "Poco/Data/Time.h"
 
+
 namespace Poco {
 namespace Data {
 namespace MySQL {
@@ -637,5 +637,4 @@ bool Extractor::extract(std::size_t , std::list<Dynamic::Var>& )
 }
 
 
-
 } } } // namespace Poco::Data::MySQL

Data/MySQL/src/MySQLStatementImpl.cpp

@@ -14,6 +14,7 @@
 
 #include "Poco/Data/MySQL/MySQLStatementImpl.h"
 
+
 namespace Poco {
 namespace Data {
 namespace MySQL {

Data/MySQL/src/ResultMetadata.cpp

@@ -16,13 +16,13 @@
 #include "Poco/Data/MySQL/MySQLException.h"
 #include <cstring>
 
+
 namespace
 {
 	class ResultMetadataHandle
 		/// Simple exception-safe wrapper
 	{
 	public:
-
 		explicit ResultMetadataHandle(MYSQL_STMT* stmt)
 		{
 			h = mysql_stmt_result_metadata(stmt);
@@ -42,7 +42,6 @@ namespace
 		}
 
 	private:
-
 		MYSQL_RES* h;
 	};
 
@@ -140,6 +139,7 @@ namespace Poco {
 namespace Data {
 namespace MySQL {
 
+
 void ResultMetadata::reset()
 {
 	_columns.resize(0);
@@ -149,6 +149,7 @@ void ResultMetadata::reset()
 	_isNull.resize(0);
 }
 
+
 void ResultMetadata::init(MYSQL_STMT* stmt)
 {
 	ResultMetadataHandle h(stmt);
@@ -199,41 +200,48 @@ void ResultMetadata::init(MYSQL_STMT* stmt)
 		_row[i].buffer_length = len;
 		_row[i].buffer        = (len > 0) ? (&_buffer[0] + offset) : 0;
 		_row[i].length        = &_lengths[i];
-		_row[i].is_null       = &_isNull[i];
+		_row[i].is_null       = reinterpret_cast<my_bool*>(&_isNull[i]); // workaround to make it work with both MySQL 8 and earlier
 		_row[i].is_unsigned   = (fields[i].flags & UNSIGNED_FLAG) > 0;
 		
 		offset += _row[i].buffer_length;
 	}
 }
 
+
 std::size_t ResultMetadata::columnsReturned() const
 {
 	return static_cast<std::size_t>(_columns.size());
 }
 
+
 const MetaColumn& ResultMetadata::metaColumn(std::size_t pos) const
 {
 	return _columns[pos];
 }
 
+
 MYSQL_BIND* ResultMetadata::row()
 {
 	return &_row[0];
 }
 
+
 std::size_t ResultMetadata::length(std::size_t pos) const
 {
 	return _lengths[pos];
 }
 
+
 const unsigned char* ResultMetadata::rawData(std::size_t pos) const 
 {
 	return reinterpret_cast<const unsigned char*>(_row[pos].buffer);
 }
 
+
 bool ResultMetadata::isNull(std::size_t pos) const 
 {
 	return (_isNull[pos] != 0);
 }
 
-}}} // namespace Poco::Data::MySQL
+
+} } } // namespace Poco::Data::MySQL

Data/MySQL/src/SessionHandle.cpp

@@ -20,6 +20,11 @@
 #endif
 
 
+#if LIBMYSQL_VERSION_ID >= 80000
+typedef bool my_bool; // Workaround to make library work with MySQL client 8.0 as well as earlier versions
+#endif
+
+
 #define POCO_MYSQL_VERSION_NUMBER ((NDB_VERSION_MAJOR<<16) | (NDB_VERSION_MINOR<<8) | (NDB_VERSION_BUILD&0xFF))
 
 
@@ -187,4 +192,4 @@ void SessionHandle::reset()
 }
 
 
-}}} // Poco::Data::MySQL
+} } } // namespace Poco::Data::MySQL

Data/MySQL/src/SessionImpl.cpp

@@ -129,12 +129,14 @@ void SessionImpl::open(const std::string& connect)
 	else if (!options["auto-reconnect"].empty())
 		throw MySQLException("create session: specify correct auto-reconnect option (true or false) or skip it");
 
+#ifdef MYSQL_SECURE_AUTH 
 	if (options["secure-auth"] == "true")
 		_handle.options(MYSQL_SECURE_AUTH, true);
 	else if (options["secure-auth"] == "false")
 		_handle.options(MYSQL_SECURE_AUTH, false);
 	else if (!options["secure-auth"].empty())
 		throw MySQLException("create session: specify correct secure-auth option (true or false) or skip it");
+#endif
 
 	if (!options["character-set"].empty())
 		_handle.options(MYSQL_SET_CHARSET_NAME, options["character-set"].c_str());
@@ -282,4 +284,4 @@ void SessionImpl::setConnectionTimeout(std::size_t timeout)
 }
 
 
-}}}
+} } } // namespace Poco::Data::MySQL

Data/MySQL/src/StatementExecutor.cpp

@@ -146,4 +146,4 @@ int StatementExecutor::getAffectedRowCount() const
 }
 
 
-}}}
+} } } // namespace Poco::Data::MySQL