Put new Vector methods at the end of classes.

Author: rsomla1

jdbc/cppconn/prepared_statement.h

@@ -90,9 +90,10 @@ class PreparedStatement : public Statement
 
   virtual void setString(unsigned int parameterIndex, const sql::SQLString& value) = 0;
 
+  virtual PreparedStatement * setResultSetType(sql::ResultSet::enum_type type) = 0;
+
   virtual void setVector(unsigned int parameterIndex, const std::vector<float>& value) = 0;
 
-  virtual PreparedStatement * setResultSetType(sql::ResultSet::enum_type type) = 0;
 };
 
 

jdbc/cppconn/resultset.h

@@ -138,9 +138,6 @@ class ResultSet
   virtual SQLString getString(uint32_t columnIndex)  const = 0;
   virtual SQLString getString(const sql::SQLString& columnLabel) const = 0;
 
-  virtual std::vector<float> getVector(uint32_t columnIndex) const = 0;
-  virtual std::vector<float> getVector(const sql::SQLString &columnLabel) const = 0;
-
   virtual enum_type getType() const = 0;
 
   virtual void getWarnings() = 0;
@@ -185,6 +182,9 @@ class ResultSet
   virtual size_t rowsCount() const = 0;
 
   virtual bool wasNull() const = 0;
+
+  virtual std::vector<float> getVector(uint32_t columnIndex) const = 0;
+  virtual std::vector<float> getVector(const sql::SQLString &columnLabel) const = 0;
 };
 
 } /* namespace sql */

jdbc/driver/mysql_prepared_statement.h

@@ -194,9 +194,6 @@ class MySQL_Prepared_Statement : public sql::PreparedStatement
  void setString(unsigned int parameterIndex,
                 const sql::SQLString &value) override;
 
- void setVector(unsigned int parameterIndex,
-                const std::vector<float> &vec) override;
-
  void setQueryTimeout(unsigned int seconds) override;
 
  sql::PreparedStatement *setResultSetType(
@@ -225,6 +222,12 @@ class MySQL_Prepared_Statement : public sql::PreparedStatement
 
   // For internal use
   sql::ResultSet *_getResultSet();
+
+public:
+
+ void setVector(unsigned int parameterIndex,
+                const std::vector<float> &vec) override;
+
 };
 
 } /* namespace mysql */

jdbc/driver/mysql_ps_resultset.h

@@ -158,9 +158,6 @@ class MySQL_Prepared_ResultSet : public sql::ResultSet
  SQLString getString(uint32_t columnIndex) const;
  SQLString getString(const sql::SQLString &columnLabel) const;
 
- std::vector<float> getVector(uint32_t columnIndex) const;
- std::vector<float> getVector(const sql::SQLString &columnLabel) const;
-
  sql::ResultSet::enum_type getType() const;
 
  void getWarnings();
@@ -206,6 +203,9 @@ class MySQL_Prepared_ResultSet : public sql::ResultSet
  void setFetchSize(size_t rows);
 
  bool wasNull() const;
+
+ std::vector<float> getVector(uint32_t columnIndex) const;
+ std::vector<float> getVector(const sql::SQLString &columnLabel) const;
 };
 
 } /* namespace mysql*/

jdbc/driver/mysql_resultset.h

@@ -157,9 +157,6 @@ class MySQL_ResultSet : public sql::ResultSet
  SQLString getString(uint32_t columnIndex) const;
  SQLString getString(const sql::SQLString &columnLabel) const;
 
- std::vector<float> getVector(uint32_t columnIndex) const;
- std::vector<float> getVector(const sql::SQLString &columnLabel) const;
-
  sql::ResultSet::enum_type getType() const;
 
  void getWarnings();
@@ -205,10 +202,17 @@ class MySQL_ResultSet : public sql::ResultSet
  void setFetchSize(size_t rows);
 
  bool wasNull() const;
+
 private:
   /* Prevent use of these */
   MySQL_ResultSet(const MySQL_ResultSet &);
   void operator=(MySQL_ResultSet &);
+
+public:
+
+ std::vector<float> getVector(uint32_t columnIndex) const;
+ std::vector<float> getVector(const sql::SQLString &columnLabel) const;
+
 };
 
 } /* namespace mysql */