MySQL fixes/additions/improvements

aleks-f · aleks-f · commit b95ec4fe533e · 2013-06-09T12:33:57.000-05:00
- fixed GH pocoproject#187: MySQL: allow access to the underlying connection handle - added GH pocoproject#186: MySQL: support for MYSQL_SECURE_AUTH - fixed GH pocoproject#174: MySQL: 4GB allocated when reading any largetext or largeblob field
diff --git a/CHANGELOG b/CHANGELOG
@@ -80,6 +80,9 @@ Release 1.5.2 (2013-06-xx)
 - limited allowed types for JSON::Query to Object, Array, Object::Ptr, 
   Array::Ptr and empty
 - fixed GH #175: HTMLForm does not read URL parameters on POST or PUT
+- added GH #187: MySQL: allow access to the underlying connection handle
+- added GH #186: MySQL: support for MYSQL_SECURE_AUTH
+- fixed GH #174: MySQL: 4GB allocated when reading any largetext or largeblob field
 
 
 Release 1.5.1 (2013-01-11)
diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile
@@ -14,7 +14,7 @@ SYSFLAGS += -DTHREADSAFE -DNO_TCL
 
 objects = Binder Extractor SessionImpl Connector \
 	MySQLStatementImpl ResultMetadata MySQLException \
-	SessionHandle StatementExecutor
+	SessionHandle StatementExecutor Utility
 
 target         = PocoDataMySQL
 target_version = $(LIBVERSION)
diff --git a/Data/MySQL/MySQL_VS80.vcproj b/Data/MySQL/MySQL_VS80.vcproj
@@ -403,6 +403,8 @@
 				RelativePath=".\src\SessionImpl.cpp"/>
 			<File
 				RelativePath=".\src\StatementExecutor.cpp"/>
+			<File
+				RelativePath=".\src\Utility.cpp"/>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -428,6 +430,8 @@
 				RelativePath=".\include\Poco\Data\MySQL\SessionImpl.h"/>
 			<File
 				RelativePath=".\include\Poco\Data\MySQL\StatementExecutor.h"/>
+			<File
+				RelativePath=".\include\Poco\Data\MySQL\Utility.h"/>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/Data/MySQL/MySQL_VS90.vcproj b/Data/MySQL/MySQL_VS90.vcproj
@@ -402,6 +402,8 @@
 				RelativePath=".\src\SessionImpl.cpp"/>
 			<File
 				RelativePath=".\src\StatementExecutor.cpp"/>
+			<File
+				RelativePath=".\src\Utility.cpp"/>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -427,6 +429,8 @@
 				RelativePath=".\include\Poco\Data\MySQL\SessionImpl.h"/>
 			<File
 				RelativePath=".\include\Poco\Data\MySQL\StatementExecutor.h"/>
+			<File
+				RelativePath=".\include\Poco\Data\MySQL\Utility.h"/>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/Data/MySQL/MySQL_vs100.vcxproj b/Data/MySQL/MySQL_vs100.vcxproj
@@ -276,6 +276,7 @@
     <ClCompile Include="src\SessionHandle.cpp"/>
     <ClCompile Include="src\SessionImpl.cpp"/>
     <ClCompile Include="src\StatementExecutor.cpp"/>
+    <ClCompile Include="src\Utility.cpp"/>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Data\MySQL\Binder.h"/>
@@ -288,6 +289,7 @@
     <ClInclude Include="include\Poco\Data\MySQL\SessionHandle.h"/>
     <ClInclude Include="include\Poco\Data\MySQL\SessionImpl.h"/>
     <ClInclude Include="include\Poco\Data\MySQL\StatementExecutor.h"/>
+    <ClInclude Include="include\Poco\Data\MySQL\Utility.h"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/Data/MySQL/MySQL_vs100.vcxproj.filters b/Data/MySQL/MySQL_vs100.vcxproj.filters
@@ -42,6 +42,9 @@
     <ClCompile Include="src\StatementExecutor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Utility.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Data\MySQL\Binder.h">
@@ -74,5 +77,8 @@
     <ClInclude Include="include\Poco\Data\MySQL\StatementExecutor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\MySQL\Utility.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Data/MySQL/MySQL_vs110.vcxproj b/Data/MySQL/MySQL_vs110.vcxproj
@@ -286,6 +286,7 @@
     <ClCompile Include="src\SessionHandle.cpp" />
     <ClCompile Include="src\SessionImpl.cpp" />
     <ClCompile Include="src\StatementExecutor.cpp" />
+    <ClCompile Include="src\Utility.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Data\MySQL\Binder.h" />
@@ -298,6 +299,7 @@
     <ClInclude Include="include\Poco\Data\MySQL\SessionHandle.h" />
     <ClInclude Include="include\Poco\Data\MySQL\SessionImpl.h" />
     <ClInclude Include="include\Poco\Data\MySQL\StatementExecutor.h" />
+    <ClInclude Include="include\Poco\Data\MySQL\Utility.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
diff --git a/Data/MySQL/MySQL_vs110.vcxproj.filters b/Data/MySQL/MySQL_vs110.vcxproj.filters
@@ -42,6 +42,9 @@
     <ClCompile Include="src\StatementExecutor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Utility.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Data\MySQL\Binder.h">
@@ -74,5 +77,8 @@
     <ClInclude Include="include\Poco\Data\MySQL\StatementExecutor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\MySQL\Utility.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Data/MySQL/MySQL_vs71.vcproj b/Data/MySQL/MySQL_vs71.vcproj
@@ -382,6 +382,8 @@
 				RelativePath=".\src\SessionImpl.cpp"/>
 			<File
 				RelativePath=".\src\StatementExecutor.cpp"/>
+			<File
+				RelativePath=".\src\Utility.cpp"/>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -407,6 +409,8 @@
 				RelativePath=".\include\Poco\Data\MySQL\SessionImpl.h"/>
 			<File
 				RelativePath=".\include\Poco\Data\MySQL\StatementExecutor.h"/>
+			<File
+				RelativePath=".\include\Poco\Data\MySQL\Utility.h"/>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/Data/MySQL/MySQL_x64_vs100.vcxproj b/Data/MySQL/MySQL_x64_vs100.vcxproj
@@ -274,6 +274,7 @@
     <ClCompile Include="src\SessionHandle.cpp"/>
     <ClCompile Include="src\SessionImpl.cpp"/>
     <ClCompile Include="src\StatementExecutor.cpp"/>
+    <ClCompile Include="src\Utility.cpp"/>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Data\MySQL\Binder.h"/>
@@ -286,6 +287,7 @@
     <ClInclude Include="include\Poco\Data\MySQL\SessionHandle.h"/>
     <ClInclude Include="include\Poco\Data\MySQL\SessionImpl.h"/>
     <ClInclude Include="include\Poco\Data\MySQL\StatementExecutor.h"/>
+    <ClInclude Include="include\Poco\Data\MySQL\Utility.h"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/Data/MySQL/MySQL_x64_vs100.vcxproj.filters b/Data/MySQL/MySQL_x64_vs100.vcxproj.filters
@@ -42,6 +42,9 @@
     <ClCompile Include="src\StatementExecutor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Utility.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Data\MySQL\Binder.h">
@@ -74,5 +77,8 @@
     <ClInclude Include="include\Poco\Data\MySQL\StatementExecutor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\MySQL\Utility.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Data/MySQL/MySQL_x64_vs110.vcxproj b/Data/MySQL/MySQL_x64_vs110.vcxproj
@@ -280,6 +280,7 @@
     <ClCompile Include="src\SessionHandle.cpp"/>
     <ClCompile Include="src\SessionImpl.cpp"/>
     <ClCompile Include="src\StatementExecutor.cpp"/>
+    <ClCompile Include="src\Utility.cpp"/>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Data\MySQL\Binder.h"/>
@@ -292,6 +293,7 @@
     <ClInclude Include="include\Poco\Data\MySQL\SessionHandle.h"/>
     <ClInclude Include="include\Poco\Data\MySQL\SessionImpl.h"/>
     <ClInclude Include="include\Poco\Data\MySQL\StatementExecutor.h"/>
+    <ClInclude Include="include\Poco\Data\MySQL\Utility.h"/>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
   <ImportGroup Label="ExtensionTargets"/>
diff --git a/Data/MySQL/MySQL_x64_vs110.vcxproj.filters b/Data/MySQL/MySQL_x64_vs110.vcxproj.filters
@@ -42,6 +42,9 @@
     <ClCompile Include="src\StatementExecutor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Utility.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Poco\Data\MySQL\Binder.h">
@@ -74,5 +77,8 @@
     <ClInclude Include="include\Poco\Data\MySQL\StatementExecutor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Poco\Data\MySQL\Utility.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
@@ -97,9 +97,9 @@ class StatementExecutor
 	StatementExecutor& operator=(const StatementExecutor&);
 
 private:
-	MYSQL* _pSessionHandle;
+	MYSQL*      _pSessionHandle;
 	MYSQL_STMT* _pHandle;
-	int _state;
+	int         _state;
 	std::size_t _affectedRowCount;
 	std::string _query;
 };
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Utility.h b/Data/MySQL/include/Poco/Data/MySQL/Utility.h
@@ -0,0 +1,101 @@
+//
+// Utility.h
+//
+// $Id: //poco/Main/Data/MySQL/include/Poco/Data/MySQL/Utility.h#2 $
+//
+// Library: MySQL
+// Package: MySQL
+// Module:  Utility
+//
+// Definition of Utility.
+//
+// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+// 
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+
+
+#ifndef MySQL_Utility_INCLUDED
+#define MySQL_Utility_INCLUDED
+
+
+#include "Poco/Data/MySQL/MySQL.h"
+#include "Poco/Data/Session.h"
+
+
+struct st_mysql;
+typedef struct st_mysql MYSQL;
+
+
+namespace Poco {
+namespace Data {
+namespace MySQL {
+
+
+class MySQL_API Utility
+	/// Various utility functions for MySQL.
+{
+public:
+
+	static std::string serverInfo(MYSQL* pHandle);
+		/// Returns server info.
+
+	static std::string serverInfo(Poco::Data::Session& session);
+		/// Returns server info.
+
+	static unsigned long serverVersion(MYSQL* pHandle);
+		/// Returns server version.
+
+	static unsigned long serverVersion(Poco::Data::Session& session);
+		/// Returns server version.
+
+	static std::string hostInfo(MYSQL* pHandle);
+		/// Returns host info.
+
+	static std::string hostInfo(Poco::Data::Session& session);
+		/// Returns host info.
+
+	static bool hasMicrosecond();
+		/// Rturns true if microseconds are suported.
+
+	static MYSQL* handle(Poco::Data::Session& session);
+		/// Returns native MySQL handle for the session.
+};
+
+
+//
+// inlines
+//
+
+
+inline MYSQL* Utility::handle(Session& session)
+{
+	return Poco::AnyCast<MYSQL*>(session.getProperty("handle"));
+}
+
+
+} } } // namespace Poco::Data::MySQL
+
+
+#endif // MySQL_Utility_INCLUDED
diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp
@@ -189,11 +189,15 @@ void ResultMetadata::init(MYSQL_STMT* stmt)
 
 	{for (std::size_t i = 0; i < count; i++)
 	{
+		unsigned long size = fieldSize(fields[i]);
+		unsigned long zero = 0;
+		if (size == ~zero) size = 0;
+
 		_columns.push_back(MetaColumn(
 			i,                               // position
 			fields[i].name,                  // name
 			fieldType(fields[i]),            // type
-			fieldSize(fields[i]),            // length
+			size,                            // length
 			0,                               // TODO: precision
 			!IS_NOT_NULL(fields[i].flags)    // nullable
 			));
@@ -208,19 +212,19 @@ void ResultMetadata::init(MYSQL_STMT* stmt)
 
 	std::size_t offset = 0;
 
-	{for (std::size_t i = 0; i < count; i++)
+	for (std::size_t i = 0; i < count; i++)
 	{
 		std::memset(&_row[i], 0, sizeof(MYSQL_BIND));
-
+		unsigned int len = static_cast<unsigned int>(_columns[i].length());
 		_row[i].buffer_type   = fields[i].type;
-		_row[i].buffer_length = static_cast<unsigned int>(_columns[i].length());
-		_row[i].buffer        = &_buffer[0] + offset;
+		_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_unsigned   = (fields[i].flags & UNSIGNED_FLAG) > 0;
 		
 		offset += _row[i].buffer_length;
-	}}
+	}
 }
 
 std::size_t ResultMetadata::columnsReturned() const
diff --git a/Data/MySQL/src/SessionHandle.cpp b/Data/MySQL/src/SessionHandle.cpp
@@ -95,8 +95,13 @@ void SessionHandle::options(mysql_option opt, unsigned int i)
 
 void SessionHandle::connect(const char* host, const char* user, const char* password, const char* db, unsigned int port)
 {
+#ifdef HAVE_MYSQL_REAL_CONNECT
 	if (!mysql_real_connect(_pHandle, host, user, password, db, port, 0, 0))
 		throw ConnectionFailedException(mysql_error(_pHandle));
+#else
+	if (!mysql_connect(_pHandle, host, user, password))
+		throw ConnectionFailedException(mysql_error(_pHandle))
+#endif
 }
 
 
diff --git a/Data/MySQL/src/SessionImpl.cpp b/Data/MySQL/src/SessionImpl.cpp
diff --git a/Data/MySQL/src/StatementExecutor.cpp b/Data/MySQL/src/StatementExecutor.cpp
diff --git a/Data/MySQL/src/Utility.cpp b/Data/MySQL/src/Utility.cpp
diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp
diff --git a/Data/MySQL/testsuite/src/MySQLTest.h b/Data/MySQL/testsuite/src/MySQLTest.h
diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp
diff --git a/Data/MySQL/testsuite/src/SQLExecutor.h b/Data/MySQL/testsuite/src/SQLExecutor.h
