Fix bug#22292073 when getting INT from JSON_EXTRACT.

Author: silvakid

driver/mysql_ps_resultset.cpp

@@ -446,6 +446,7 @@ 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);
@@ -614,6 +615,7 @@ 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:
@@ -761,6 +763,7 @@ 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:

test/unit/bugs/bugs.cpp

@@ -982,5 +982,55 @@ void bugs::bug21152054()
 
 }
 
+void bugs::bug22292073()
+{
+
+  stmt->execute("DROP TABLE IF EXISTS bug22292073");
+  stmt->execute("create table bug22292073 (jdoc JSON);" );
+  stmt->execute("insert into bug22292073 values('{ \"name\": \"abc\", \"age\": 1 , \"misc\":\
+                1.2}'), ('{ \"name\": \"abcdef\", \"age\": 31 , \"misc\": 1.237843}');" );
+  pstmt.reset( con->prepareStatement("select JSON_EXTRACT(jdoc, '$.age') from bug22292073;") );
+  res.reset( pstmt->executeQuery() );
+
+  res->next();
+
+  ASSERT_EQUALS(true, res->getBoolean(1));
+  ASSERT_EQUALS(1, res->getInt(1));
+  ASSERT_EQUALS(1L, res->getInt64(1));
+  ASSERT_EQUALS(1, res->getUInt(1));
+  ASSERT_EQUALS(1UL, res->getUInt64(1));
+  ASSERT_EQUALS(1.0, res->getDouble(1));
+
+  res->next();
+
+  ASSERT_EQUALS(true, res->getBoolean(1));
+  ASSERT_EQUALS(31, res->getInt(1));
+  ASSERT_EQUALS(31L, res->getInt64(1));
+  ASSERT_EQUALS(31, res->getUInt(1));
+  ASSERT_EQUALS(31UL, res->getUInt64(1));
+  ASSERT_EQUALS(31.0, res->getDouble(1));
+
+  stmt.reset(con->createStatement());
+  res.reset(stmt->executeQuery("select JSON_EXTRACT(jdoc, '$.age') from bug22292073;"));
+
+  res->next();
+
+  ASSERT_EQUALS(true, res->getBoolean(1));
+  ASSERT_EQUALS(1, res->getInt(1));
+  ASSERT_EQUALS(1L, res->getInt64(1));
+  ASSERT_EQUALS(1, res->getUInt(1));
+  ASSERT_EQUALS(1UL, res->getUInt64(1));
+  ASSERT_EQUALS(1.0, res->getDouble(1));
+
+  res->next();
+
+  ASSERT_EQUALS(true, res->getBoolean(1));
+  ASSERT_EQUALS(31, res->getInt(1));
+  ASSERT_EQUALS(31L, res->getInt64(1));
+  ASSERT_EQUALS(31, res->getUInt(1));
+  ASSERT_EQUALS(31UL, res->getUInt64(1));
+  ASSERT_EQUALS(31.0, res->getDouble(1));
+}
+
 } /* namespace regression */
 } /* namespace testsuite */

test/unit/bugs/bugs.h

@@ -67,6 +67,7 @@ class bugs : public unit_fixture
     TEST_CASE(bug21067193);
     TEST_CASE(bug21066575);
     TEST_CASE(bug21152054);
+    TEST_CASE(bug22292073);
   }
 
   /**
@@ -122,6 +123,8 @@ class bugs : public unit_fixture
 
   void bug21152054();
 
+  void bug22292073();
+
 };
 
 REGISTER_FIXTURE(bugs);