#3317: Data::MySQL MySQL headers and library search paths

pocoproject · Jun 17, 2021 · 08ef4db · 08ef4db
1 parent 65fd5f8
commit 08ef4db
Show file tree

Hide file tree

Showing 17 changed files with 125 additions and 63 deletions.
diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile
@@ -6,8 +6,9 @@
 
 include $(POCO_BASE)/build/rules/global
 
-SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -L/usr/local/opt/mysql-client/lib -lmysqlclient
-INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include -I/usr/local/opt/mysql-client/include/mysql
+include MySQL.make
+
+SYSLIBS += -lmysqlclient
 SYSFLAGS += -DTHREADSAFE -DNO_TCL
 
 objects = Binder Extractor SessionImpl Connector \

diff --git a/Data/MySQL/MySQL.make b/Data/MySQL/MySQL.make
@@ -0,0 +1,40 @@
+#
+# MySQL.make
+#
+# Makefile fragment for finding MySQL library
+#
+
+ifndef POCO_MYSQL_INCLUDE
+ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?))
+POCO_MYSQL_INCLUDE = /usr/local/include
+else
+ifeq (0, $(shell test -d /usr/local/opt/mysql-client; echo $$?))
+POCO_MYSQL_INCLUDE = /usr/local/opt/mysql-client/include
+else
+ifeq (0, $(shell test -d /usr/local/opt/mysql; echo $$?))
+POCO_MYSQL_INCLUDE = /usr/local/opt/mysql/include
+endif
+endif
+endif
+endif
+
+ifndef POCO_MYSQL_LIB
+ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?))
+POCO_MYSQL_LIB = /usr/local/lib
+else
+ifeq (0, $(shell test -d /usr/local/opt/mysql-client/lib; echo $$?))
+POCO_MYSQL_INCLUDE = /usr/local/opt/mysql-client/lib
+else
+ifeq (0, $(shell test -d /usr/local/opt/mysql/lib; echo $$?))
+POCO_MYSQL_INCLUDE = /usr/local/opt/mysql/lib
+endif
+endif
+endif
+endif
+
+ifdef POCO_MYSQL_INCLUDE
+INCLUDE += -I$(POCO_MYSQL_INCLUDE)
+endif
+ifdef POCO_MYSQL_LIB
+SYSLIBS += -L$(POCO_MYSQL_LIB)
+endif
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Binder.h b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
@@ -22,7 +22,7 @@
 #include "Poco/Data/AbstractBinder.h"
 #include "Poco/Data/LOB.h"
 #include "Poco/Data/MySQL/MySQLException.h"
-#include <mysql.h>
+#include <mysql/mysql.h>
 
 
 namespace Poco {
@@ -72,7 +72,7 @@ class MySQL_API Binder: public Poco::Data::AbstractBinder
 
 	virtual void bind(std::size_t pos, const unsigned long& val, Direction dir = PD_IN);
 		/// Binds an unsigned long.
-#endif 
+#endif
 
 	virtual void bind(std::size_t pos, const bool& val, Direction dir);
 		/// Binds a boolean.

diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
@@ -20,9 +20,9 @@
 
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/DataException.h"
+#include <mysql/mysql.h>
 #include <typeinfo>
 #include <string>
-#include <mysql.h>
 
 
 namespace Poco {

diff --git a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
@@ -18,9 +18,9 @@
 #define Data_MySQL_ResultMetadata_INCLUDED
 
 
-#include <mysql.h>
-#include <vector>
 #include "Poco/Data/MetaColumn.h"
+#include <mysql/mysql.h>
+#include <vector>
 
 
 #if LIBMYSQL_VERSION_ID >= 80000

diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
@@ -18,8 +18,8 @@
 #define Data_MySQL_SessionHandle_INCLUDED
 
 
-#include <mysql.h>
 #include "Poco/Data/MySQL/MySQLException.h"
+#include <mysql/mysql.h>
 
 
 namespace Poco {

diff --git a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
@@ -18,8 +18,8 @@
 #define Data_MySQL_StatementHandle_INCLUDED
 
 
-#include <mysql.h>
 #include "Poco/Data/MySQL/MySQLException.h"
+#include <mysql/mysql.h>
 
 
 namespace Poco {
@@ -66,7 +66,7 @@ class StatementExecutor
 		/// Fetches the column.
 
 	int getAffectedRowCount() const;
-		
+
 	operator MYSQL_STMT* ();
 		/// Cast operator to native handle type.
 

diff --git a/Data/MySQL/include/Poco/Data/MySQL/Utility.h b/Data/MySQL/include/Poco/Data/MySQL/Utility.h
@@ -20,7 +20,7 @@
 
 #include "Poco/Data/MySQL/MySQL.h"
 #include "Poco/Data/Session.h"
-#include <mysql.h>
+#include <mysql/mysql.h>
 
 
 namespace Poco {

diff --git a/Data/MySQL/src/Connector.cpp b/Data/MySQL/src/Connector.cpp
@@ -16,7 +16,7 @@
 #include "Poco/Data/MySQL/SessionImpl.h"
 #include "Poco/Data/SessionFactory.h"
 #include "Poco/Exception.h"
-#include <mysql.h>
+#include <mysql/mysql.h>
 
 
 namespace Poco {
@@ -46,7 +46,7 @@ const std::string& Connector::name() const
 Poco::AutoPtr<Poco::Data::SessionImpl> Connector::createSession(const std::string& connectionString,
 	std::size_t timeout)
 {
-	return Poco::AutoPtr<Poco::Data::SessionImpl>(new SessionImpl(connectionString, timeout));	
+	return Poco::AutoPtr<Poco::Data::SessionImpl>(new SessionImpl(connectionString, timeout));
 }
 
 

diff --git a/Data/MySQL/src/MySQLException.cpp b/Data/MySQL/src/MySQLException.cpp
@@ -13,7 +13,7 @@
 
 
 #include "Poco/Data/MySQL/MySQLException.h"
-#include <mysql.h>
+#include <mysql/mysql.h>
 #include <stdio.h>
 
 

diff --git a/Data/MySQL/src/StatementExecutor.cpp b/Data/MySQL/src/StatementExecutor.cpp
@@ -12,9 +12,9 @@
 //
 
 
-#include <mysql.h>
 #include "Poco/Data/MySQL/StatementExecutor.h"
 #include "Poco/Format.h"
+#include <mysql/mysql.h>
 
 
 namespace Poco {
@@ -52,7 +52,7 @@ void StatementExecutor::prepare(const std::string& query)
 		_state = STMT_COMPILED;
 		return;
 	}
-	
+
 	int rc = mysql_stmt_prepare(_pHandle, query.c_str(), static_cast<unsigned int>(query.length()));
 	if (rc != 0)
 	{
@@ -119,7 +119,7 @@ bool StatementExecutor::fetch()
 	int res = mysql_stmt_fetch(_pHandle);
 
 	// we have specified zero buffers for BLOBs, so DATA_TRUNCATED is normal in this case
-	if ((res != 0) && (res != MYSQL_NO_DATA) && (res != MYSQL_DATA_TRUNCATED)) 
+	if ((res != 0) && (res != MYSQL_NO_DATA) && (res != MYSQL_DATA_TRUNCATED))
 		throw StatementException("mysql_stmt_fetch error", _pHandle, _query);
 
 	return (res == 0) || (res == MYSQL_DATA_TRUNCATED);

diff --git a/Data/MySQL/src/Utility.cpp b/Data/MySQL/src/Utility.cpp
@@ -15,7 +15,7 @@
 
 
 #include "Poco/Data/MySQL/Utility.h"
-#include <mysql.h>
+#include <mysql/mysql.h>
 
 
 namespace Poco {

diff --git a/Data/MySQL/testsuite/Makefile b/Data/MySQL/testsuite/Makefile
@@ -6,10 +6,10 @@
 
 include $(POCO_BASE)/build/rules/global
 
-INCLUDE += -I./../include -I/usr/local/include/mysql -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include  -I/usr/local/opt/mysql-client/include/mysql
+include $(POCO_BASE)/Data/MySQL/MySQL.make
 
 # Note: linking order is important, do not change it.
-SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -L/usr/local/opt/mysql-client/lib -lmysqlclient -lz -lpthread -ldl
+SYSLIBS += -lmysqlclient -lz -lpthread -ldl
 
 objects = MySQLTestSuite Driver MySQLTest SQLExecutor
 

diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp
@@ -45,7 +45,9 @@ Poco::SharedPtr<SQLExecutor> MySQLTest::_pExecutor = 0;
 #define MYSQL_USER "pocotest"
 #define MYSQL_PWD  "pocotest"
 #define MYSQL_HOST "127.0.0.1"
+#ifndef MYSQL_PORT
 #define MYSQL_PORT 3306
+#endif
 #define MYSQL_DB   "pocotest"
 
 //

diff --git a/Data/MySQL/testsuite/src/MySQLTestSuite.cpp b/Data/MySQL/testsuite/src/MySQLTestSuite.cpp
@@ -11,6 +11,7 @@
 #include "MySQLTestSuite.h"
 #include "MySQLTest.h"
 
+
 CppUnit::Test* MySQLTestSuite::suite()
 {
 	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("MySQLTestSuite");