Bug #19192707 PREPARE/EXECUTE FOR SELECT OF GEOMETRY FIELD RETURNS ERROR

Allow getting GEOMETRY fields on prepared statmens

Change-Id: I0680a07218863408596e1f9ac95dc4aa6f437a10

Author: silvakid

driver/mysql_ps_resultset.cpp

@@ -1053,11 +1053,11 @@ MySQL_Prepared_ResultSet::getString(const uint32_t columnIndex) const
         case sql::DataType::SET:
         case sql::DataType::ENUM:
         case sql::DataType::JSON:
+        case sql::DataType::GEOMETRY:
             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:
             break;
-        // ToDo : Geometry? default ?
     }
 
     CPP_ERR("MySQL_Prepared_ResultSet::getString: unhandled type. Please, report");

driver/mysql_resultbind.cpp

@@ -113,6 +113,7 @@ static struct st_buffer_size_type
     case MYSQL_TYPE_BIT:
       return st_buffer_size_type(new char[8], 8, MYSQL_TYPE_BIT);
     case MYSQL_TYPE_GEOMETRY:
+      return st_buffer_size_type(new char[field->max_length], field->max_length, MYSQL_TYPE_BIT);
     default:
       // TODO: Andrey, there can be crashes when we go through this. Please fix.
       throw sql::InvalidArgumentException("allocate_buffer_for_field: invalid rbind data type");

test/unit/bugs/bugs.cpp

@@ -1270,6 +1270,39 @@ void bugs::bug23235968()
 
 }
 
+void bugs::bug19192707()
+{
+  logMsg("bugs::bug19192707");
+
+  sql::SQLString direct, ps;
+
+  stmt->executeUpdate("drop table if exists bug19192707");
+  stmt->executeUpdate("create table bug19192707 (i1 point)");
+
+  pstmt.reset(con->prepareStatement("insert into bug19192707 (i1) values(ST_PointFromText('POINT(1 2)',4326))"));
+  pstmt->executeUpdate();
+
+  logMsg("Select with Direct execute : ");
+
+  res.reset(stmt->executeQuery("select i1 from bug19192707"));
+
+  res->next();
+  direct = res->getString(1);
+
+  logMsg("Select with Prepare/execute : ");
+
+  pstmt.reset(con->prepareStatement("select i1 from bug19192707"));
+
+  res.reset(pstmt->executeQuery());
+
+  res->next();
+  ps = res->getString(1);
+
+  ASSERT_EQUALS(direct, ps);
+
+  stmt->executeUpdate("drop table if exists bug19192707");
+
+}
 
 } /* namespace regression */
 } /* namespace testsuite */

test/unit/bugs/bugs.h

@@ -80,6 +80,7 @@ class bugs : public unit_fixture
     TEST_CASE(bug30126457);
     TEST_CASE(bug32695580);
     TEST_CASE(bug23235968);
+    TEST_CASE(bug19192707);
   }
 
   /**
@@ -151,6 +152,7 @@ class bugs : public unit_fixture
 
   void bug23235968();
 
+  void bug19192707();
 };
 
 REGISTER_FIXTURE(bugs);