<pre style='margin:0'>
Bradley Giesbrecht (pixilla) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/01b2ce0aea11b55dd9e07a90751ca423dcb69fe3">https://github.com/macports/macports-ports/commit/01b2ce0aea11b55dd9e07a90751ca423dcb69fe3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 01b2ce0 mysql55-connector-cpp: Update version to 1.1.9 and add additional mysql56 and mysql57 subports.
</span>01b2ce0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 01b2ce0aea11b55dd9e07a90751ca423dcb69fe3
</span>Author: Bradley Giesbrecht <brad@databoost.com>
AuthorDate: Fri Mar 23 19:30:58 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> mysql55-connector-cpp: Update version to 1.1.9 and add additional mysql56 and mysql57 subports.
</span>---
databases/mysql55-connector-cpp/Portfile | 42 +++---
.../files/examples-CMakeLists.txt | 55 ++++++++
.../files/patch-CMakeLists.txt.diff | 41 ++++--
.../files/patch-cppconn-CMakeLists.txt.diff | 14 +-
.../files/patch-driver-CMakeLists.txt.diff | 64 ++++-----
.../files/patch-examples-examples.h.diff | 24 ++--
.../files/patch-examples-pthreads.cpp.diff | 4 +-
.../patch-examples-standalone_example.cpp.diff | 6 +-
...atch-examples-standalone_example_docs1.cpp.diff | 123 ++++-------------
...atch-examples-standalone_example_docs2.cpp.diff | 153 ++++-----------------
10 files changed, 197 insertions(+), 329 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-connector-cpp/Portfile b/databases/mysql55-connector-cpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f2b360e..3402574 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55-connector-cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-connector-cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,10 +3,10 @@
</span> PortSystem 1.0
PortGroup cmake 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name mysql55-connector-cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name mysql57-connector-cpp
</span> set name_package mysql-connector-c++
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +22,8 @@ master_sites http://mysql.mirrors.pair.com/${mirror_dir} \
</span> http://ftp.plusline.de/mysql/${mirror_dir}
distname ${name_package}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6415ae385effabb482b12cb9e39186d838d70d74 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 31c3e4f637153bd270812dffc6a50708dfc686a8afa7ea1c88a9dfda0d8af52e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2445b7c3aab96e459bf8726963fbc7e203af7e6e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4
</span>
depends_build-append \
port:boost
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,11 +38,24 @@ patchfiles patch-CMakeLists.txt.diff \
</span> patch-examples-standalone_example_docs1.cpp.diff \
patch-examples-standalone_example_docs2.cpp.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy -force ${filespath}/examples-CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/examples/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span> reinplace "s,@NAME@,/${subport},g" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CMakeLists.txt \
</span> ${worksrcpath}/cppconn/CMakeLists.txt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/driver/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/driver/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/examples/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@DBPORT@,/${mp.port},g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/examples/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/examples/examples.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@PREFIX@,/${prefix},g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/examples/CMakeLists.txt
</span> }
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,31 +67,28 @@ post-destroot {
</span> ${destroot}${prefix}/share/${subport}/
foreach lib [glob -directory ${destroot}${prefix}/lib/${subport} -type f *.dylib] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> system "install_name_tool -id ${prefix}/lib/${subport}/[strsed ${lib} /^.*\\///] ${lib}"
}
}
set mp.ports {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mysql5
</span> mysql51
mysql55
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ mysql56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mysql57
</span> mariadb
percona
}
set mp.names {}
foreach mp.port ${mp.ports} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> lappend mp.names "${mp.port}-connector-cpp"
}
foreach mp.name ${mp.names} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set idx [lsearch ${mp.names} ${mp.name}]
set mp.port [lindex ${mp.ports} $idx]
set mp.conflicts [lreplace ${mp.names} $idx $idx]
if {[string compare ${mp.name} ${name}] == 0 && [string compare ${mp.name} ${subport}] == 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> description The MySQL Connector/C++ for ${mp.port}.
long_description ${description} \
Standardized MySQL database driver for C++ development.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,9 +97,7 @@ foreach mp.name ${mp.names} {
</span> -DMYSQLCPPCONN_DYNLOAD_MYSQL_LIB:FILEPATH=${prefix}/lib/${mp.port}/mysql/libmysqlclient.dylib \
-DMYSQL_CONFIG_EXECUTABLE:FILEPATH=${prefix}/lib/${mp.port}/bin/mysql_config
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport ${mp.name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> description The MySQL Connector/C++ for ${mp.port}.
long_description ${description} \
Standardized MySQL database driver for C++ development.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,12 +109,6 @@ foreach mp.name ${mp.names} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport mysql-connector-cpp {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by mysql5-connector-cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
livecheck.regex "\"mysql-connector-c\\+\\+-(\\d\[\\d\\.\]*)\\${extract.suffix}\""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-connector-cpp/files/examples-CMakeLists.txt b/databases/mysql55-connector-cpp/files/examples-CMakeLists.txt
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..97d8821
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-connector-cpp/files/examples-CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MacPorts MySQL Connector/C++ examples CMake build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Written in 2018 by Jeffrey Dvornek
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# To the extent possible under law, the author(s) have dedicated all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# copyright and related and neighboring rights to this software to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# public domain worldwide. This software is distributed without any warranty.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# You should have received a copy of the CC0 Public Domain Dedication along
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# with this software. If not, see
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# <http://creativecommons.org/publicdomain/zero/1.0/>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake_minimum_required(VERSION 3.10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SET(CMAKE_VERBOSE_MAKEFILE 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+FIND_PACKAGE(Boost COMPONENTS system thread REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+INCLUDE_DIRECTORIES(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @PREFIX@/include@NAME@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @PREFIX@/include@DBPORT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LINK_DIRECTORIES(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @PREFIX@/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @PREFIX@/lib@NAME@/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @PREFIX@/lib@DBPORT@/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LINK_LIBRARIES(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mysqlcppconn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${Boost_SYSTEM_LIBRARY}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${Boost_THREAD_LIBRARY}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+FIND_LIBRARY(MYSQLCLIENT_LIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NAMES libmysqlclient.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATHS @PREFIX@/lib@NAME@ NO_DEFAULT_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_DEFINITIONS(-DDYNLOAD_MYSQL_LIB="${MYSQLCLIENT_LIB}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(connect connect.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(connection_meta_schemaobj connection_meta_schemaobj.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(debug_output debug_output.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(exceptions exceptions.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(prepared_statement prepared_statement.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(resultset resultset.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(resultset_binary resultset_binary.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(resultset_meta resultset_meta.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(resultset_types resultset_types.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(statement statement.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ADD_EXECUTABLE(dynamic_load dynamic_load.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-connector-cpp/files/patch-CMakeLists.txt.diff b/databases/mysql55-connector-cpp/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f069ae..fea167d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55-connector-cpp/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-connector-cpp/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt 2012-08-16 12:15:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMakeLists.txt 2012-08-23 08:36:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -252,14 +252,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/CMakeLists.txt 2017-05-10 12:14:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports/CMakeLists.txt 2018-03-03 01:54:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,10 +37,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTION(RPM_LAYOUT "Use directory layout for an RPM install")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(TAR_LAYOUT OR NOT CMAKE_VERSION OR CMAKE_VERSION VERSION_LESS "2.8.5")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(INSTALL_LIBDIR lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(INSTALL_LIBDIR lib@NAME@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE(GNUInstallDirs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}@NAME@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(EDIT_WARNING_MESSAGE "Please do not edit this file - it is generated by cmake. Edit its source file instead.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -354,12 +354,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span>
-INSTALL(FILES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CPACK_RESOURCE_FILE_README}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CPACK_RESOURCE_FILE_INSTALL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CPACK_RESOURCE_FILE_LICENSE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION "." OPTIONAL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CPACK_RESOURCE_FILE_README}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CPACK_RESOURCE_FILE_LICENSE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${DOC_DESTINATION} OPTIONAL)
</span> -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_manifest.txt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -291,7 +283,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(COMMON_IGNORE_FILES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/CMakeFiles/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/Testing/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -419,7 +413,6 @@
</span>
ADD_SUBDIRECTORY(cppconn)
ADD_SUBDIRECTORY(driver)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-connector-cpp/files/patch-cppconn-CMakeLists.txt.diff b/databases/mysql55-connector-cpp/files/patch-cppconn-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e6bcdc8..2d02a1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55-connector-cpp/files/patch-cppconn-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-connector-cpp/files/patch-cppconn-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cppconn/CMakeLists.txt 2012-08-16 12:15:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cppconn/CMakeLists.txt 2012-08-23 07:14:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/cppconn/CMakeLists.txt 2017-05-10 12:14:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports/cppconn/CMakeLists.txt 2018-03-02 23:39:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,6 @@
</span>
SET(MYSQLCPPCONN_INSTALL_HEADERS
build_config.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_CURRENT_BINARY_DIR}/config.h
</span> connection.h
datatype.h
driver.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,4 +71,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sqlstring.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- warning.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,4 +74,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_BINARY_DIR}/version_info.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant.h)
</span>
-INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/cppconn)
+INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include@NAME@/cppconn)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-connector-cpp/files/patch-driver-CMakeLists.txt.diff b/databases/mysql55-connector-cpp/files/patch-driver-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 666024d..0cf2f70 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55-connector-cpp/files/patch-driver-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-connector-cpp/files/patch-driver-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +1,33 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/driver/CMakeLists.txt 2012-08-16 12:15:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/driver/CMakeLists.txt 2012-08-23 07:20:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -275,18 +275,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSE(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBRARY DESTINATION lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCHIVE DESTINATION lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBRARY DESTINATION lib@NAME@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ARCHIVE DESTINATION lib@NAME@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install some MySQL specific headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/driver/CMakeLists.txt 2017-05-10 12:14:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports/driver/CMakeLists.txt 2018-03-03 00:54:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -343,9 +343,29 @@
</span> SET(MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_art_resultset.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_art_rset_metadata.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mysql_connection.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mysql_driver.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_connection_data.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_connection_options.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_debug.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_driver.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_metadata.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_parameter_metadata.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_prepared_statement.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_ps_resultset.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_ps_resultset_metadata.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_public_iface.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_resultbind.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_resultset.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_resultset_metadata.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_statement.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_statement_options.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_uri.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_util.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mysql_warning.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mysql_connection.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mysql_driver.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mysql_error.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_error.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_art_resultset.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_art_rset_metadata.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_connection_data.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_connection_options.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_debug.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_metadata.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_parameter_metadata.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_prepared_statement.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_ps_resultset.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_ps_resultset_metadata.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_public_iface.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_resultbind.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_resultset.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_resultset_metadata.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_statement.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_statement_options.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_uri.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_util.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mysql_warning.h)
</span>
-INSTALL(FILES ${MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS} DESTINATION include)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +INSTALL(FILES ${MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS} DESTINATION include@NAME@/driver)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-connector-cpp/files/patch-examples-examples.h.diff b/databases/mysql55-connector-cpp/files/patch-examples-examples.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bd4123c..24ce3fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55-connector-cpp/files/patch-examples-examples.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-connector-cpp/files/patch-examples-examples.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/examples/examples.h 2012-08-16 12:15:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/examples/examples.h 2012-08-23 10:05:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,10 +23,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/examples/examples.h 2017-05-10 12:14:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports/examples/examples.h 2018-03-03 00:57:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
</span> */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> +// Connection properties
+#ifndef EXAMPLE_DB
+# define EXAMPLE_DB "test"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,21 +18,13 @@
</span> +# define EXAMPLE_PASS "root"
+#endif /* EXAMPLE_PASS */
+#ifndef DYNLOAD_MYSQL_LIB
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define DYNLOAD_MYSQL_LIB "/opt/local/lib/mysql55/mysql/libmysqlclient_r.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define DYNLOAD_MYSQL_LIB "/opt/local/lib@DBPORT@/mysql/libmysqlclient.dylib"
</span> +#endif /* DYNLOAD_MYSQL_LIB */
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #ifndef _EXAMPLES_H
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _EXAMPLES_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __FUNCTION__/__func__ is not portable. We do not promise
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- that our example definition covers each and every compiler.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,15 +72,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- works for you or you have to find your own.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __LINE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #define __LINE__ "(line number n/a)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __LINE__ "(line number n/a)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,12 +76,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __LINE__ "(line number n/a)"
</span> #endif
-// Connection properties
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-connector-cpp/files/patch-examples-pthreads.cpp.diff b/databases/mysql55-connector-cpp/files/patch-examples-pthreads.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fa2957..596d83f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55-connector-cpp/files/patch-examples-pthreads.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-connector-cpp/files/patch-examples-pthreads.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/examples/pthreads.cpp 2012-08-16 12:15:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/examples/pthreads.cpp 2012-08-23 10:05:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/examples/pthreads.cpp 2017-05-10 12:14:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports/examples/pthreads.cpp 2018-03-03 00:59:58.000000000 -0500
</span> @@ -69,17 +69,13 @@
*/
#include "mysql_connection.h"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-connector-cpp/files/patch-examples-standalone_example.cpp.diff b/databases/mysql55-connector-cpp/files/patch-examples-standalone_example.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f8eee6..d4b4587 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55-connector-cpp/files/patch-examples-standalone_example.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-connector-cpp/files/patch-examples-standalone_example.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/examples/standalone_example.cpp 2012-08-16 12:15:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/examples/standalone_example.cpp 2012-08-23 10:05:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,17 +64,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/examples/standalone_example.cpp 2017-05-10 12:14:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports/examples/standalone_example.cpp 2018-03-03 01:00:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,17 +66,13 @@
</span> */
#include "mysql_connection.h"
#include "mysql_driver.h"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-connector-cpp/files/patch-examples-standalone_example_docs1.cpp.diff b/databases/mysql55-connector-cpp/files/patch-examples-standalone_example_docs1.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 66d465c..ee02836 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55-connector-cpp/files/patch-examples-standalone_example_docs1.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-connector-cpp/files/patch-examples-standalone_example_docs1.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,115 +1,38 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/examples/standalone_example_docs1.cpp 2012-08-16 12:15:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/examples/standalone_example_docs1.cpp 2012-08-23 10:05:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- You should have received a copy of the GNU General Public License along
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with this program; if not, write to the Free Software Foundation, Inc.,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +35,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/examples/standalone_example_docs1.cpp 2017-05-10 12:14:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports/examples/standalone_example_docs1.cpp 2018-03-03 01:05:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (and mysql_connection.h). This will reduce your build time!
</span> */
#include "mysql_connection.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Public interface of the MySQL Connector/C++ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <driver/mysql_public_iface.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Connection parameter and sample data */
</span> +#include "examples.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #include <cppconn/driver.h>
#include <cppconn/exception.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cppconn/resultset.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,46 +47,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,8 +43,14 @@
</span>
using namespace std;
-int main(void)
+int main(int argc, const char **argv)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>--cout << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cout << "Running 'SELECT 'Hello World!' AS _message'..." << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sql::Driver *driver;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sql::Connection *con;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sql::Statement *stmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sql::ResultSet *res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Create a connection */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- driver = sql::mysql::get_driver_instance();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- con = driver->connect("tcp://127.0.0.1:3306", "root", "root");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Connect to the MySQL test database */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- con->setSchema("test");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stmt = con->createStatement();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- res = stmt->executeQuery("SELECT 'Hello World!' AS _message");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while (res->next()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << "\t... MySQL replies: ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Access column data by alias or column name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << res->getString("_message") << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << "\t... MySQL says it again: ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Access column fata by numeric offset, 1 is the first column */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << res->getString(1) << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete stmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete con;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--} catch (sql::SQLException &e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << "# ERR: SQLException in " << __FILE__;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << "(" << EXAMPLE_FUNCTION << ") on line " << __LINE__ << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << "# ERR: " << e.what();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << " (MySQL error code: " << e.getErrorCode();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << ", SQLState: " << e.getSQLState() << " )" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const string url(argc >= 2 ? argv[1] : EXAMPLE_HOST);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const string user(argc >= 3 ? argv[2] : EXAMPLE_USER);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const string pass(argc >= 4 ? argv[3] : EXAMPLE_PASS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const string database(argc >= 5 ? argv[4] : EXAMPLE_DB);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const string url(argc >= 2 ? argv[1] : EXAMPLE_HOST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const string user(argc >= 3 ? argv[2] : EXAMPLE_USER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const string pass(argc >= 4 ? argv[3] : EXAMPLE_PASS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const string database(argc >= 5 ? argv[4] : EXAMPLE_DB);
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "Running 'SELECT 'Hello World!' AS _message'..." << endl;
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sql::Driver *driver;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sql::Connection *con;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sql::Statement *stmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sql::ResultSet *res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Create a connection */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ driver = sql::mysql::get_driver_instance();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ con = driver->connect(url, user, pass);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Connect to the MySQL test database */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ con->setSchema(database);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stmt = con->createStatement();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ res = stmt->executeQuery("SELECT 'Hello World!' AS _message");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (res->next()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "\t... MySQL replies: ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Access column data by alias or column name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << res->getString("_message") << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "\t... MySQL says it again: ";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Access column fata by numeric offset, 1 is the first column */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << res->getString(1) << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete stmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete con;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } catch (sql::SQLException &e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "# ERR: SQLException in " << __FILE__;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "(" << EXAMPLE_FUNCTION << ") on line " << __LINE__ << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "# ERR: " << e.what();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << " (MySQL error code: " << e.getErrorCode();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << ", SQLState: " << e.getSQLState() << " )" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cout << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cout << "Running 'SELECT 'Hello World!' AS _message'..." << endl;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--cout << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,9 +62,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Create a connection */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ driver = sql::mysql::get_driver_instance();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- con = driver->connect("tcp://127.0.0.1:3306", "root", "root");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ con = driver->connect(url, user, pass);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Connect to the MySQL test database */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- con->setSchema("test");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ con->setSchema(database);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--return EXIT_SUCCESS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return EXIT_SUCCESS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stmt = con->createStatement();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ res = stmt->executeQuery("SELECT 'Hello World!' AS _message");
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-connector-cpp/files/patch-examples-standalone_example_docs2.cpp.diff b/databases/mysql55-connector-cpp/files/patch-examples-standalone_example_docs2.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7143d70..9b87f59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55-connector-cpp/files/patch-examples-standalone_example_docs2.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-connector-cpp/files/patch-examples-standalone_example_docs2.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,142 +1,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/examples/standalone_example_docs2.cpp 2012-08-16 12:15:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/examples/standalone_example_docs2.cpp 2012-08-23 10:05:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- You should have received a copy of the GNU General Public License along
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with this program; if not, write to the Free Software Foundation, Inc.,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +35,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dist/examples/standalone_example_docs2.cpp 2017-05-10 12:14:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports/examples/standalone_example_docs2.cpp 2018-03-03 01:08:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (and mysql_connection.h). This will reduce your build time!
</span> */
#include "mysql_connection.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Public interface of the MySQL Connector/C++ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <driver/mysql_public_iface.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Connection parameter and sample data */
</span> +#include "examples.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #include <cppconn/driver.h>
#include <cppconn/exception.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cppconn/resultset.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,59 +48,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,8 +44,13 @@
</span>
using namespace std;
-int main(void)
+int main(int argc, const char **argv)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>--cout << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cout << "Let's have MySQL count from 10 to 1..." << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sql::Driver *driver;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sql::Connection *con;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sql::Statement *stmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sql::ResultSet *res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sql::PreparedStatement *pstmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Create a connection */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- driver = sql::mysql::get_driver_instance();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const string url(argc >= 2 ? argv[1] : EXAMPLE_HOST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const string user(argc >= 3 ? argv[2] : EXAMPLE_USER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const string pass(argc >= 4 ? argv[3] : EXAMPLE_PASS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const string database(argc >= 5 ? argv[4] : EXAMPLE_DB);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cout << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cout << "Let's have MySQL count from 10 to 1..." << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,9 +63,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Create a connection */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ driver = sql::mysql::get_driver_instance();
</span> - con = driver->connect("tcp://127.0.0.1:3306", "root", "root");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Connect to the MySQL test database */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ con = driver->connect(url, user, pass);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Connect to the MySQL test database */
</span> - con->setSchema("test");
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stmt = con->createStatement();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stmt->execute("DROP TABLE IF EXISTS test");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stmt->execute("CREATE TABLE test(id INT)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete stmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* '?' is the supported placeholder syntax */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pstmt = con->prepareStatement("INSERT INTO test(id) VALUES (?)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (int i = 1; i <= 10; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pstmt->setInt(1, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pstmt->executeUpdate();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete pstmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Select in ascending order */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pstmt = con->prepareStatement("SELECT id FROM test ORDER BY id ASC");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- res = pstmt->executeQuery();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Fetch in reverse = descending order! */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- res->afterLast();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while (res->previous())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << "\t... MySQL counts: " << res->getInt("id") << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete pstmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete con;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--} catch (sql::SQLException &e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << "# ERR: SQLException in " << __FILE__;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << "(" << EXAMPLE_FUNCTION << ") on line " << __LINE__ << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << "# ERR: " << e.what();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << " (MySQL error code: " << e.getErrorCode();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cout << ", SQLState: " << e.getSQLState() << " )" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cout << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--return EXIT_SUCCESS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const string url(argc >= 2 ? argv[1] : EXAMPLE_HOST);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const string user(argc >= 3 ? argv[2] : EXAMPLE_USER);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const string pass(argc >= 4 ? argv[3] : EXAMPLE_PASS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const string database(argc >= 5 ? argv[4] : EXAMPLE_DB);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "Let's have MySQL count from 10 to 1..." << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sql::Driver *driver;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sql::Connection *con;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sql::Statement *stmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sql::ResultSet *res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sql::PreparedStatement *pstmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Create a connection */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ driver = sql::mysql::get_driver_instance();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ con = driver->connect(url, user, pass);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Connect to the MySQL test database */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ con->setSchema(database);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stmt = con->createStatement();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stmt->execute("DROP TABLE IF EXISTS test");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stmt->execute("CREATE TABLE test(id INT)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete stmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* '?' is the supported placeholder syntax */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pstmt = con->prepareStatement("INSERT INTO test(id) VALUES (?)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (int i = 1; i <= 10; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pstmt->setInt(1, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pstmt->executeUpdate();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete pstmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Select in ascending order */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pstmt = con->prepareStatement("SELECT id FROM test ORDER BY id ASC");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ res = pstmt->executeQuery();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Fetch in reverse = descending order! */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ res->afterLast();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (res->previous())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "\t... MySQL counts: " << res->getInt("id") << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete pstmt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete con;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } catch (sql::SQLException &e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "# ERR: SQLException in " << __FILE__;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "(" << EXAMPLE_FUNCTION << ") on line " << __LINE__ << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << "# ERR: " << e.what();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << " (MySQL error code: " << e.getErrorCode();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << ", SQLState: " << e.getSQLState() << " )" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cout << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return EXIT_SUCCESS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ con->setSchema(database);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stmt = con->createStatement();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stmt->execute("DROP TABLE IF EXISTS test");
</span></pre><pre style='margin:0'>
</pre>