Moved m_paramNameToIdx rdbms::Stmt

rdbms/OcciStmt.cpp

@@ -39,7 +39,6 @@ OcciStmt::OcciStmt(
   OcciConn &conn,
   oracle::occi::Statement *const stmt) :
   Stmt(sql, autocommitMode),
-  m_paramNameToIdx(sql),
   m_conn(conn),
   m_stmt(stmt) {
 

rdbms/OcciStmt.hpp

@@ -19,7 +19,6 @@
 #pragma once
 
 #include "rdbms/Stmt.hpp"
-#include "rdbms/ParamNameToIdx.hpp"
 
 #include <memory>
 #include <mutex>
@@ -158,11 +157,6 @@ private:
    */
   std::mutex m_mutex;
 
-  /**
-   * Map from SQL parameter name to parameter index.
-   */
-  ParamNameToIdx m_paramNameToIdx;
-
   /**
    * The database connection.
    */

rdbms/SqliteStmt.cpp

@@ -41,7 +41,6 @@ SqliteStmt::SqliteStmt(
   const std::string &sql):
   Stmt(sql, autocommitMode),
   m_conn(conn),
-  m_paramNameToIdx(sql),
   m_nbAffectedRows(0) {
   m_stmt = nullptr;
   const int nByte = -1; // Read SQL up to first null terminator

rdbms/SqliteStmt.hpp

@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "rdbms/ParamNameToIdx.hpp"
 #include "rdbms/Stmt.hpp"
 
 #include <map>
@@ -144,11 +143,6 @@ private:
    */
   SqliteConn &m_conn;
 
-  /**
-   * Map from SQL parameter name to parameter index.
-   */
-  ParamNameToIdx m_paramNameToIdx;
-
   /**
    * The prepared statement.
    */

rdbms/Stmt.cpp

@@ -26,6 +26,7 @@ namespace rdbms {
 //------------------------------------------------------------------------------
 Stmt::Stmt(const std::string &sql, const AutocommitMode autocommitMode):
   m_sql(sql),
+  m_paramNameToIdx(sql),
   m_autoCommitMode(autocommitMode) {
 }
 

rdbms/Stmt.hpp

@@ -19,6 +19,7 @@
 #pragma once
 
 #include "common/optional.hpp"
+#include "rdbms/ParamNameToIdx.hpp"
 #include "rdbms/Rset.hpp"
 
 #include <memory>
@@ -178,6 +179,11 @@ protected:
    */
   std::string m_sql;
 
+  /**
+   * Map from SQL parameter name to parameter index.
+   */
+  ParamNameToIdx m_paramNameToIdx;
+
   /**
    * The autocommit mode of the statement.
    */