commit mysql-connector-c++ 1.1.7-1

3 files changed, 112 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac07365e747f..70866b15f6ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Jan 20 11:53:52 UTC 2016
+# Sun Sep 25 18:53:14 UTC 2016
 pkgbase = mysql-connector-c++
 	pkgdesc = A MySQL database connector for C++
-	pkgver = 1.1.6
-	pkgrel = 4
+	pkgver = 1.1.7
+	pkgrel = 1
 	url = http://dev.mysql.com/doc/connector-cpp/en/
 	arch = i686
 	arch = x86_64
@@ -11,12 +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.6.tar.gz
-	source = http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-1.1.6.tar.gz.asc
+	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 = 0001-mysql-connector-c++-mariadb-api.patch
-	sha256sums = ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447
+	source = 0002-mysql-connector-c++-no-JSON.patch
+	sha256sums = 5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763
 	sha256sums = SKIP
 	sha256sums = 1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee
+	sha256sums = 6000a9a74fb65d5f4fb07b4560cd2021e662272405f02b079661495e8fdb0cb3
 
 pkgname = mysql-connector-c++
 
diff --git a/0002-mysql-connector-c++-no-JSON.patch b/0002-mysql-connector-c++-no-JSON.patch
new file mode 100644
index 000000000000..c2ce82d6f2e0
--- /dev/null
+++ b/0002-mysql-connector-c++-no-JSON.patch
@@ -0,0 +1,93 @@
+diff --git a/cppconn/datatype.h b/cppconn/datatype.h
+index 593ec02..63de3ec 100644
+--- a/cppconn/datatype.h
++++ b/cppconn/datatype.h
+@@ -59,8 +59,7 @@ public:
+     GEOMETRY,
+     ENUM,
+     SET,
+-    SQLNULL,
+-    JSON
++    SQLNULL
+   };
+ };
+ 
+diff --git a/driver/mysql_ps_resultset.cpp b/driver/mysql_ps_resultset.cpp
+index 572beda..6f4cbca 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
+         case sql::DataType::LONGVARBINARY:
+         case sql::DataType::SET:
+         case sql::DataType::ENUM:
+-        case sql::DataType::JSON:
+         {
+             CPP_INFO("It's a string");
+             long double ret = sql::mysql::util::strtold(getString(columnIndex).c_str(), NULL);
+@@ -615,7 +614,6 @@ MySQL_Prepared_ResultSet::getInt64_intern(const uint32_t columnIndex, bool /* cu
+         case sql::DataType::LONGVARBINARY:
+         case sql::DataType::SET:
+         case sql::DataType::ENUM:
+-        case sql::DataType::JSON:
+             CPP_INFO("It's a string");
+             return strtoll(getString(columnIndex).c_str(), NULL, 10);
+         case sql::DataType::BIT:
+@@ -763,7 +761,6 @@ MySQL_Prepared_ResultSet::getUInt64_intern(const uint32_t columnIndex, bool /* c
+         case sql::DataType::LONGVARBINARY:
+         case sql::DataType::SET:
+         case sql::DataType::ENUM:
+-        case sql::DataType::JSON:
+             CPP_INFO("It's a string");
+             return strtoull(getString(columnIndex).c_str(), NULL, 10);
+         case sql::DataType::BIT:
+@@ -1038,7 +1035,6 @@ MySQL_Prepared_ResultSet::getString(const uint32_t columnIndex) const
+         case sql::DataType::LONGVARBINARY:
+         case sql::DataType::SET:
+         case sql::DataType::ENUM:
+-        case sql::DataType::JSON:
+             CPP_INFO("It's a string");
+             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
+--- a/driver/mysql_resultbind.cpp
++++ b/driver/mysql_resultbind.cpp
+@@ -86,7 +86,6 @@ static struct st_buffer_size_type
+     case MYSQL_TYPE_BLOB:
+     case MYSQL_TYPE_STRING:
+     case MYSQL_TYPE_VAR_STRING:
+-    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:
+diff --git a/driver/mysql_util.cpp b/driver/mysql_util.cpp
+index e4aaa6c..81af5c4 100644
+--- a/driver/mysql_util.cpp
++++ b/driver/mysql_util.cpp
+@@ -431,8 +431,6 @@ 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)
+     return sql::DataType::SET;
+   } else if (!name.compare("geometry")) {
+     return sql::DataType::GEOMETRY;
+-  } else if (!name.compare("json")) {
+-    return sql::DataType::JSON;
+   } else {
+     return sql::DataType::UNKNOWN;
+   }
+@@ -645,8 +641,6 @@ 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";
+   }
diff --git a/PKGBUILD b/PKGBUILD
index a44da45225cb..135ef94e5aea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Christian Hesse <mail@eworm.de>
 
 pkgname=mysql-connector-c++
-pkgver=1.1.6
-pkgrel=4
+pkgver=1.1.7
+pkgrel=1
 pkgdesc='A MySQL database connector for C++'
 arch=('i686' 'x86_64')
 url='http://dev.mysql.com/doc/connector-cpp/en/'
@@ -15,15 +15,21 @@ depends=('libmariadbclient')
 makedepends=('cmake' 'boost')
 validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
 source=("http://cdn.mysql.com/Downloads/Connector-C++/${pkgname}-${pkgver}.tar.gz"{,.asc}
-	'0001-mysql-connector-c++-mariadb-api.patch')
-sha256sums=('ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447'
+	'0001-mysql-connector-c++-mariadb-api.patch'
+	'0002-mysql-connector-c++-no-JSON.patch')
+sha256sums=('5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763'
             'SKIP'
-            '1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee')
+            '1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee'
+            '6000a9a74fb65d5f4fb07b4560cd2021e662272405f02b079661495e8fdb0cb3')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}/"
 
+	# MariaDB does not have this, but it is optional
 	patch -Np1 < "${srcdir}/0001-mysql-connector-c++-mariadb-api.patch"
+
+	# MariaDB will add JSON support in 10.2... No JSON for now.
+	patch -Np1 < "${srcdir}/no-JSON.patch"
 }
 
 build() {