Add support for SQL statement tracing

1 files changed, 4 insertions, 148 deletions

diff --git a/odb/oracle/connection.cxx b/odb/oracle/connection.cxx
index dc37a07..c0eae59 100644
--- a/odb/oracle/connection.cxx
+++ b/odb/oracle/connection.cxx
@@ -4,12 +4,14 @@
 // license   : ODB NCUEL; see accompanying LICENSE file
 
 #include <string>
+#include <sstream>
 
 #include <oci.h>
 
 #include <odb/oracle/database.hxx>
 #include <odb/oracle/connection.hxx>
 #include <odb/oracle/transaction.hxx>
+#include <odb/oracle/statement.hxx>
 #include <odb/oracle/error.hxx>
 #include <odb/oracle/exceptions.hxx>
 #include <odb/oracle/auto-descriptor.hxx>
@@ -149,154 +151,8 @@ namespace odb
     unsigned long long connection::
     execute (const char* s, std::size_t n)
     {
-      sword r (0);
-
-      // OCI requires statement text to be NULL terminated.
-      //
-      string sql (s, n);
-
-      auto_handle<OCIStmt> stmt;
-      {
-        OCIStmt* s (0);
-        r = OCIStmtPrepare2 (handle_,
-                             &s,
-                             error_,
-                             reinterpret_cast<const OraText*> (sql.c_str ()),
-                             static_cast<ub4> (sql.size ()),
-                             0,
-                             0,
-                             OCI_NTV_SYNTAX,
-                             OCI_DEFAULT);
-
-        if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
-          translate_error (error_, r);
-
-        stmt.reset (s, OCI_STRLS_CACHE_DELETE, error_);
-      }
-
-      ub2 stmt_type;
-      r = OCIAttrGet (stmt,
-                      OCI_HTYPE_STMT,
-                      &stmt_type,
-                      0,
-                      OCI_ATTR_STMT_TYPE,
-                      error_);
-
-      if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
-        translate_error (error_, r);
-
-      ub4 row_count (0);
-
-      if (stmt_type == OCI_STMT_SELECT)
-      {
-        // Do not prefetch any rows.
-        //
-        r = OCIStmtExecute (handle_, stmt, error_, 0, 0, 0, 0, OCI_DEFAULT);
-
-        if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
-          translate_error (error_, r);
-
-        // In order to succesfully execute a select statement, OCI/Oracle
-        // requires that there be OCIDefine handles provided for all select
-        // list columns. Since we are not interested in any data returned by
-        // the select statement, all buffer pointers, indication variable
-        // pointers, and data length pointers are specified as NULL (we still
-        // specify a valid data type identifier as not doing so results in
-        // undefined behaviour). This action results in truncation errors
-        // being returned for all attempted row fetches. However, cursor
-        // behaviour is normal, thus allowing us to return the row count for
-        // a select statement.
-        //
-        for (ub4 i (1); ; ++i)
-        {
-          auto_descriptor<OCIParam> param;
-          {
-            OCIParam* p (0);
-            r = OCIParamGet (stmt,
-                             OCI_HTYPE_STMT,
-                             error_,
-                             reinterpret_cast<void**> (&p),
-                             i);
-
-            if (r == OCI_ERROR)
-              break;
-
-            param.reset (p);
-          }
-
-          ub2 data_type;
-          r = OCIAttrGet (param,
-                          OCI_DTYPE_PARAM,
-                          &data_type,
-                          0,
-                          OCI_ATTR_DATA_TYPE,
-                          error_);
-
-          if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
-            translate_error (error_, r);
-
-          // No need to keep track of the OCIDefine handles - these will
-          // be deallocated with the statement.
-          //
-          OCIDefine* define (0);
-          r = OCIDefineByPos (stmt,
-                              &define,
-                              error_,
-                              i,
-                              0,    // NULL value buffer pointer
-                              0,    // zero length value buffer
-                              data_type,
-                              0,    // NULL indicator pointer
-                              0,    // NULL length data pointer
-                              0,    // NULL column level return code pointer
-                              OCI_DEFAULT);
-
-          if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
-            translate_error (error_, r);
-        }
-
-        while (1)
-        {
-          r = OCIStmtFetch2 (stmt, error_, 1, OCI_FETCH_NEXT, 0, OCI_DEFAULT);
-
-          if (r == OCI_NO_DATA)
-            break;
-          else if (r == OCI_ERROR)
-          {
-            sb4 e;
-            r = OCIErrorGet (error_, 1, 0, &e, 0, 0, OCI_HTYPE_ERROR);
-
-            // ORA-01406 is returned if there is a truncation error. We expect
-            // and ignore all truncation errors.
-            //
-            if (e != 1406)
-              translate_error (error_, r);
-          }
-          else if (r ==  OCI_INVALID_HANDLE)
-            translate_error (error_, r);
-        }
-      }
-      else
-      {
-        // OCIStmtExecute requires a non-zero iters param for DML statements.
-        //
-        r = OCIStmtExecute (handle_, stmt, error_, 1, 0, 0, 0, OCI_DEFAULT);
-
-        if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
-          translate_error (error_, r);
-      }
-
-      r = OCIAttrGet (stmt,
-                      OCI_HTYPE_STMT,
-                      &row_count,
-                      0,
-                      OCI_ATTR_ROW_COUNT,
-                      error_);
-
-      if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
-        translate_error (error_, r);
-
-      return row_count;
+      generic_statement st (*this, string (s, n));
+      return st.execute ();
     }
   }
 }