Set the internal driver name

Author: cjbj

src/dpi/include/dpiEnv.h

@@ -66,7 +66,7 @@ class Env
  public:
                                 // creation/termination
 
-  static Env * createEnv();
+  static Env * createEnv( const string &drvName = "" );
 
   virtual void terminate() = 0;
 

src/dpi/src/dpiConnImpl.cpp

@@ -620,6 +620,17 @@ void ConnImpl::initConnImpl ( bool pool, bool externalAuth,
                            OCI_ATTR_CONNECTION_CLASS, errh_ ), errh_ );
   }
 
+  /* In case of Pool, we set the driver name on poolAuth_ handle in
+   * Pool implimentation. For non-pooled connections we set it here.
+   */
+  if ( !pool &&  !(env_->drvName()).empty() )
+  {
+    ociCall ( OCIAttrSet ( (void*) auth_, OCI_HTYPE_AUTHINFO,
+                           (OraText *) ( env_->drvName() ).data (),
+                           ( ub4 ) ( ( env_->drvName() ).length () ),
+                           OCI_ATTR_DRIVER_NAME, errh_ ), errh_);
+  }
+
   ociCall ( OCISessionGet ( envh_, errh_, &svch_, auth_, poolNmRconnStr,
                           ( ub4 ) nameLen, NULL, 0, NULL, NULL, NULL,
                           mode ), errh_ );

src/dpi/src/dpiEnv.cpp

@@ -86,9 +86,9 @@ Env::~Env()
      nothing
  */
 
-Env * Env::createEnv()
+Env * Env::createEnv( const string & drvName )
 {
-  return EnvImpl::createEnvImpl();
+  return EnvImpl::createEnvImpl( drvName );
 }
 
 

src/dpi/src/dpiEnvImpl.cpp

@@ -54,7 +54,6 @@
 #endif
 
 
-
 /*---------------------------------------------------------------------------
                      PRIVATE CONSTANTS
   ---------------------------------------------------------------------------*/
@@ -88,11 +87,12 @@ static const int kStmtCacheSize = 60;
 
  */
 
-EnvImpl::EnvImpl()
+EnvImpl::EnvImpl( const string & drvName )
 
 try : envh_(NULL), poolMax_(kPoolMax), poolMin_(kPoolMin),
       poolIncrement_(kPoolIncrement), poolTimeout_(kPoolTimeout),
-      externalAuth_(false),  stmtCacheSize_(kStmtCacheSize)
+      externalAuth_(false), stmtCacheSize_(kStmtCacheSize),
+      drvName_(drvName)
 {
 
   sword rc = OCIEnvNlsCreate (&envh_, OCI_THREADED | OCI_OBJECT, NULL, NULL,
@@ -151,9 +151,9 @@ EnvImpl::~EnvImpl()
      nothing
  */
 
-EnvImpl * EnvImpl::createEnvImpl()
+EnvImpl * EnvImpl::createEnvImpl( const string & drvName )
 {
-  return new EnvImpl();
+  return new EnvImpl( drvName );
 }
 
 
@@ -354,6 +354,27 @@ unsigned int EnvImpl::poolTimeout() const
 }
 
 
+
+/*****************************************************************************/
+/*
+   DESCRIPTION
+     Get the driver name
+
+   PARAMETERS:
+     none
+
+   RETURNS:
+     driver name
+
+   NOTES:
+
+ */
+
+const string & EnvImpl::drvName()
+{
+  return drvName_;
+}
+
 /*****************************************************************************/
 /*
    DESCRIPTION
@@ -759,7 +780,5 @@ DpiHandle * EnvImpl::envHandle() const
   return (DpiHandle *)envh_;
 }
 
-
-
 /* end of file dpiEnvImpl.cpp */
 

src/dpi/src/dpiEnvImpl.h

@@ -62,11 +62,11 @@ class EnvImpl : public Env
 {
  public:
                                // creation/termination
-  EnvImpl();
+  EnvImpl( const string & drvName = "" );
 
   virtual ~EnvImpl();
 
-  static EnvImpl * createEnvImpl();
+  static EnvImpl * createEnvImpl( const string & drvName = "" );
 
   virtual void terminate();
 
@@ -83,6 +83,8 @@ class EnvImpl : public Env
   virtual void poolTimeout(unsigned int poolTimeout);
   virtual unsigned int poolTimeout() const;
 
+  virtual const string & drvName();
+
   virtual void externalAuth(bool externalAuth);
   virtual bool externalAuth() const;
 
@@ -137,10 +139,11 @@ class EnvImpl : public Env
   unsigned int poolIncrement_;  // pool increment
   unsigned int poolTimeout_;    // pool timeout
 
-  bool         externalAuth_; // doing external authentication
+  bool         externalAuth_;   // doing external authentication
   bool         isEventEnabled_; // EVENTS are enabled
 
   unsigned int stmtCacheSize_;  // statement cache size
+  string       drvName_;        // driver name
 
  };
 

src/dpi/src/dpiPoolImpl.cpp

@@ -83,11 +83,12 @@ PoolImpl::PoolImpl(EnvImpl *env, OCIEnv *envh,
                    int poolMin, int poolIncrement,
                    int poolTimeout, bool externalAuth, int stmtCacheSize)
   try : env_(env), externalAuth_(externalAuth), envh_(envh), errh_(NULL),
-        spoolh_(NULL), poolName_(NULL)
+        spoolh_(NULL), poolName_(NULL), poolAuth_(NULL)
 {
   ub4 mode = externalAuth ? OCI_DEFAULT : OCI_SPC_HOMOGENEOUS;
   void *errh   = NULL;
   void *spoolh = NULL;
+  void *poolAuth = NULL;
 
   unsigned char spoolMode = OCI_SPOOL_ATTRVAL_NOWAIT; // spoolMode is a ub1
 
@@ -102,6 +103,22 @@ PoolImpl::PoolImpl(EnvImpl *env, OCIEnv *envh,
                          OCI_HTYPE_SPOOL, 0, (dvoid **)0), errh_);
   spoolh_ = ( OCISPool * ) spoolh;
 
+  ociCall ( OCIHandleAlloc ( ( void * ) envh_, ( dvoid ** ) &poolAuth,
+                             OCI_HTYPE_AUTHINFO, 0, ( dvoid ** ) 0 ), errh_ );
+
+  poolAuth_ = ( OCIAuthInfo *) poolAuth;
+
+  if ( !(env_->drvName()).empty() )
+  {
+    ociCall ( OCIAttrSet ( ( void * ) poolAuth_, OCI_HTYPE_AUTHINFO,
+                           ( OraText * ) ( env_->drvName() ).data (),
+                           ( ub4 ) ( ( env_->drvName() ).length () ),
+                           OCI_ATTR_DRIVER_NAME, errh_ ), errh_ );
+  }
+
+  ociCall ( OCIAttrSet ( spoolh_, OCI_HTYPE_SPOOL, poolAuth_, 0,
+                         OCI_ATTR_SPOOL_AUTH, errh_ ), errh_ );
+
   ociCall(OCISessionPoolCreate(envh_, errh_, spoolh_,
                                &poolName_, &poolNameLen_,
                                (OraText *)connString.data (),
@@ -120,6 +137,7 @@ PoolImpl::PoolImpl(EnvImpl *env, OCIEnv *envh,
   ociCall (OCIAttrSet (spoolh_, OCI_HTYPE_SPOOL, &spoolMode,
                        sizeof (spoolMode), OCI_ATTR_SPOOL_GETMODE, errh_ ),
            errh_ ) ;
+
 }
 
 catch (...)
@@ -349,6 +367,12 @@ void PoolImpl::releaseConnection(ConnImpl *conn)
 
 void PoolImpl::cleanup()
 {
+  if ( poolAuth_ )
+  {
+    OCIHandleFree (poolAuth_, OCI_HTYPE_AUTHINFO );
+    poolAuth_ = NULL;
+  }
+
   if (poolName_)
   {
     // Ignore errors thrown.

src/dpi/src/dpiPoolImpl.h

@@ -91,6 +91,7 @@ class PoolImpl : public SPool
   OCISPool    *spoolh_;         // OCI session pool handle
   OraText     *poolName_;       // pool name
   ub4          poolNameLen_;    // pool name length
+  OCIAuthInfo *poolAuth_;       // pool Auth handle
 };
 
 

src/njs/src/njsOracle.cpp

@@ -56,6 +56,7 @@
 #include "njsResultSet.h"
 #include "njsMessages.h"
 #include "njsIntLob.h"
+#include <sstream>
                                         //peristent Oracledb class handle
 Nan::Persistent<FunctionTemplate> Oracledb::oracledbTemplate_s;
 
@@ -68,14 +69,16 @@ Nan::Persistent<FunctionTemplate> Oracledb::oracledbTemplate_s;
 #define NJS_PREFETCH_ROWS       100
 #define NJS_LOB_PREFETCH_SIZE 16384
 
+#define NJS_DRIVERNAME_PREFIX "node-oracledb"
+
 /*****************************************************************************/
 /*
    DESCRIPTION
      Constructor for the Oracledb class.
  */
 Oracledb::Oracledb()
 {
-  dpienv_             = dpi::Env::createEnv();
+  dpienv_             = dpi::Env::createEnv( driverName() );
   outFormat_          = ROWS_ARRAY;
   maxRows_            = NJS_MAX_ROWS;
   autoCommit_         = false;
@@ -111,6 +114,26 @@ Oracledb::~Oracledb()
   }
 }
 
+/*
+ * DESCRIPTION
+ *   Compose the driver name using the constants NJS_DRIVERNAME_PREFIX,
+ *   NJS_NODE_ORACLEDB_MAJOR, NJS_NODE_ORACLEDB_MINOR and
+ *   NJS_NODE_ORACLEDB_PATCH
+ */
+const string Oracledb::driverName() const
+{
+  stringstream strm;
+
+  strm << NJS_DRIVERNAME_PREFIX << " : ";          //append prefix
+  strm << NJS_NODE_ORACLEDB_MAJOR;                 //append Mjor version
+  strm << ".";
+  strm << NJS_NODE_ORACLEDB_MINOR;                 //append Minor version
+  strm << ".";
+  strm << NJS_NODE_ORACLEDB_PATCH;                 //append Patch version
+
+  return strm.str();
+}
+
 /*****************************************************************************/
 /*
    DESCRIPTION

src/njs/src/njsOracle.h

@@ -77,6 +77,7 @@ using namespace v8;
                                       (NJS_NODE_ORACLEDB_MINOR * 100) +   \
                                       (NJS_NODE_ORACLEDB_PATCH) )
 
+
 class Oracledb: public Nan::ObjectWrap
 {
  public:
@@ -104,6 +105,8 @@ class Oracledb: public Nan::ObjectWrap
    {  return fetchAsStringTypesCount_ ;   }
 
 private:
+   const string driverName() const;
+
    // Define Oracledb Constructor
    static Nan::Persistent<FunctionTemplate> oracledbTemplate_s;