commit mysql-connector-c++ 1.1.9-1

3 files changed, 38 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77cc33cd3db1..6481eac15593 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Sep 26 06:24:08 UTC 2016
+# Mon Jun 26 13:13:57 UTC 2017
 pkgbase = mysql-connector-c++
 	pkgdesc = A MySQL database connector for C++
-	pkgver = 1.1.7
+	pkgver = 1.1.9
 	pkgrel = 1
 	url = http://dev.mysql.com/doc/connector-cpp/en/
 	arch = i686
@@ -11,14 +11,14 @@ pkgbase = mysql-connector-c++
 	makedepends = cmake
 	makedepends = boost
 	depends = libmariadbclient
-	source = http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-1.1.7.tar.gz
-	source = http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-1.1.7.tar.gz.asc
+	source = http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-1.1.9.tar.gz
+	source = http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-1.1.9.tar.gz.asc
 	source = 0001-mysql-connector-c++-mariadb-api.patch
 	source = 0002-mysql-connector-c++-no-JSON.patch
-	sha256sums = 5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763
+	sha256sums = 3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4
 	sha256sums = SKIP
 	sha256sums = 1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee
-	sha256sums = 6000a9a74fb65d5f4fb07b4560cd2021e662272405f02b079661495e8fdb0cb3
+	sha256sums = 92de10ee54cb8f8c5b98a85ce441372375a6056d7180f584aaa223a7513812e2
 
 pkgname = mysql-connector-c++
 
diff --git a/0002-mysql-connector-c++-no-JSON.patch b/0002-mysql-connector-c++-no-JSON.patch
index c2ce82d6f2e0..f6c9fbd35099 100644
--- a/0002-mysql-connector-c++-no-JSON.patch
+++ b/0002-mysql-connector-c++-no-JSON.patch
@@ -13,7 +13,7 @@ index 593ec02..63de3ec 100644
  };
  
 diff --git a/driver/mysql_ps_resultset.cpp b/driver/mysql_ps_resultset.cpp
-index 572beda..6f4cbca 100644
+index 6e9d373..9d35ef7 100644
 --- a/driver/mysql_ps_resultset.cpp
 +++ b/driver/mysql_ps_resultset.cpp
 @@ -446,7 +446,6 @@ MySQL_Prepared_ResultSet::getDouble(const uint32_t columnIndex) const
@@ -23,7 +23,7 @@ index 572beda..6f4cbca 100644
 -        case sql::DataType::JSON:
          {
              CPP_INFO("It's a string");
-             long double ret = sql::mysql::util::strtold(getString(columnIndex).c_str(), NULL);
+             long double ret = sql::mysql::util::strtonum(getString(columnIndex).c_str());
 @@ -615,7 +614,6 @@ MySQL_Prepared_ResultSet::getInt64_intern(const uint32_t columnIndex, bool /* cu
          case sql::DataType::LONGVARBINARY:
          case sql::DataType::SET:
@@ -49,31 +49,32 @@ index 572beda..6f4cbca 100644
              return  sql::SQLString(static_cast<char *>(result_bind->rbind[columnIndex - 1].buffer), *result_bind->rbind[columnIndex - 1].length);
          default:
 diff --git a/driver/mysql_resultbind.cpp b/driver/mysql_resultbind.cpp
-index 003b44b..e597ac6 100644
+index 8acc7ba..ba3c408 100644
 --- a/driver/mysql_resultbind.cpp
 +++ b/driver/mysql_resultbind.cpp
-@@ -86,7 +86,6 @@ static struct st_buffer_size_type
+@@ -86,7 +86,7 @@ static struct st_buffer_size_type
      case MYSQL_TYPE_BLOB:
      case MYSQL_TYPE_STRING:
      case MYSQL_TYPE_VAR_STRING:
--    case MYSQL_TYPE_JSON:
+-#if LIBMYSQL_VERSION_ID > 50700
++#if not defined MARIADB_BASE_VERSION && LIBMYSQL_VERSION_ID > 50700
+     case MYSQL_TYPE_JSON:
        return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
- 
-     case MYSQL_TYPE_DECIMAL:
+ #endif //LIBMYSQL_VERSION_ID > 50700
 diff --git a/driver/mysql_util.cpp b/driver/mysql_util.cpp
-index e4aaa6c..81af5c4 100644
+index afdc904..04f60d3 100644
 --- a/driver/mysql_util.cpp
 +++ b/driver/mysql_util.cpp
-@@ -431,8 +431,6 @@ mysql_type_to_datatype(const MYSQL_FIELD * const field)
+@@ -431,7 +431,7 @@ mysql_type_to_datatype(const MYSQL_FIELD * const field)
        return sql::DataType::SET;
      case MYSQL_TYPE_GEOMETRY:
        return sql::DataType::GEOMETRY;
--    case MYSQL_TYPE_JSON:
--      return sql::DataType::JSON;
-     default:
-       return sql::DataType::UNKNOWN;
-   }
-@@ -498,8 +496,6 @@ mysql_string_type_to_datatype(const sql::SQLString & name)
+-#if LIBMYSQL_VERSION_ID > 50700
++#if not defined MARIADB_BASE_VERSION && LIBMYSQL_VERSION_ID > 50700
+     case MYSQL_TYPE_JSON:
+       return sql::DataType::JSON;
+ #endif //LIBMYSQL_VERSION_ID > 50700
+@@ -500,8 +500,6 @@ mysql_string_type_to_datatype(const sql::SQLString & name)
      return sql::DataType::SET;
    } else if (!name.compare("geometry")) {
      return sql::DataType::GEOMETRY;
@@ -82,12 +83,12 @@ index e4aaa6c..81af5c4 100644
    } else {
      return sql::DataType::UNKNOWN;
    }
-@@ -645,8 +641,6 @@ mysql_type_to_string(const MYSQL_FIELD * const field, boost::shared_ptr< sql::my
+@@ -647,7 +645,7 @@ mysql_type_to_string(const MYSQL_FIELD * const field, boost::shared_ptr< sql::my
        return "SET";
      case MYSQL_TYPE_GEOMETRY:
        return "GEOMETRY";
--    case MYSQL_TYPE_JSON:
--      return "JSON";
-     default:
-       return "UNKNOWN";
-   }
+-#if LIBMYSQL_VERSION_ID > 50700
++#if not defined MARIADB_BASE_VERSION && LIBMYSQL_VERSION_ID > 50700
+     case MYSQL_TYPE_JSON:
+       return "JSON";
+ #endif //LIBMYSQL_VERSION_ID > 50700
diff --git a/PKGBUILD b/PKGBUILD
index b0c23df5ab0b..e2d8885efe0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Christian Hesse <mail@eworm.de>
 
 pkgname=mysql-connector-c++
-pkgver=1.1.7
+pkgver=1.1.9
 pkgrel=1
 pkgdesc='A MySQL database connector for C++'
 arch=('i686' 'x86_64')
@@ -13,14 +13,14 @@ url='http://dev.mysql.com/doc/connector-cpp/en/'
 license=('GPL')
 depends=('libmariadbclient')
 makedepends=('cmake' 'boost')
-validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
+validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5') # MySQL Release Engineering <mysql-build@oss.oracle.com>
 source=("http://cdn.mysql.com/Downloads/Connector-C++/${pkgname}-${pkgver}.tar.gz"{,.asc}
 	'0001-mysql-connector-c++-mariadb-api.patch'
 	'0002-mysql-connector-c++-no-JSON.patch')
-sha256sums=('5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763'
+sha256sums=('3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4'
             'SKIP'
             '1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee'
-            '6000a9a74fb65d5f4fb07b4560cd2021e662272405f02b079661495e8fdb0cb3')
+            '92de10ee54cb8f8c5b98a85ce441372375a6056d7180f584aaa223a7513812e2')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}/"
@@ -33,9 +33,11 @@ prepare() {
 }
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}/"
+	mkdir build/
+	cd build/
 
-	cmake . -Wno-dev \
+	cmake "../${pkgname}-${pkgver}/" \
+		 -Wno-dev \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
@@ -45,10 +47,10 @@ build() {
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}/"
+	cd build/
 
 	make DESTDIR="${pkgdir}" install
 
-	rm "${pkgdir}"/usr/{ANNOUNCEMENT,COPYING,README,INSTALL,Licenses_for_Third-Party_Components.txt,lib/libmysqlcppconn-static.a}
+	rm "${pkgdir}"/usr/{COPYING,README,Licenses_for_Third-Party_Components.txt,lib/libmysqlcppconn-static.a}
 }