Merge with tag 0.5

Signed-off-by: Richard Natal <bigous@gmail.com>

examples/webapp.js

@@ -126,7 +126,7 @@ oracledb.createPool (
       });
 
     hs.listen(portid, "localhost");
-    
+
     console.log("Server running at http://localhost:" + portid);
   });
 
@@ -135,7 +135,7 @@ oracledb.createPool (
 function handleError(response, text, err)
 {
   if (err) {
-    text += err.message
+    text += err.message;
   }
   console.error(text);
   response.write("<p>Error: " + text + "</p>");

src/njs/src/njsConnection.cpp

@@ -1048,7 +1048,14 @@ void Connection::Async_AfterExecute(uv_work_t *req)
       default :
         result->Set(NanNew<v8::String>("rowsAffected"),
                     NanNew<v8::Integer>((unsigned int) executeBaton->rowsAffected));//, v8::ReadOnly);
-        result->Set(NanNew<v8::String>("outBinds"),NanUndefined());
+        if( executeBaton->numOutBinds )
+        {
+          result->Set(NanNew<v8::String>("outBinds"), Connection::GetOutBinds(executeBaton));//, v8::ReadOnly);
+        }
+        else
+        {
+          result->Set(NanNew<v8::String>("outBinds"),NanUndefined());
+        }
         result->Set(NanNew<v8::String>("rows"), NanUndefined());
         result->Set(NanNew<v8::String>("metaData"), NanUndefined());
         break;
@@ -1177,8 +1184,9 @@ v8::Handle<v8::Value> Connection::GetRows (eBaton* executeBaton)
    RETURNS:
      Handle
 */
-v8::Handle<v8::Value> Connection::GetValue ( short ind, unsigned short type, void* val,
-                                     DPI_BUFLEN_TYPE len )
+v8::Handle<v8::Value> Connection::GetValue ( short ind, unsigned short type,
+                                             void* val, DPI_BUFLEN_TYPE len,
+                                             DPI_SZ_TYPE maxSize)
 {
   NanEscapableScope();
   Handle<Value> value;
@@ -1226,56 +1234,54 @@ v8::Handle<v8::Value> Connection::GetValue ( short ind, unsigned short type, voi
   Returns
     v8::Value  - this will be an array (even for 1 row, array or 1).
 */
-Handle<Value> Connection::GetArrayValue ( Bind *binds, unsigned long count )
+v8::Handle<v8::Value> Connection::GetArrayValue ( Bind *binds, unsigned long count )
 {
-  HandleScope scope;
+  NanEscapableScope();
   Local<Date> date;
   Local<Array> arrVal;
   unsigned long index = 0;
   Handle<Value> val;
 
   /* To return a value of array type, create one of specified size */
-  arrVal = v8::Array::New ( count ) ;
+  arrVal = NanNew<v8::Array>( count ) ;
 
   for ( index = 0 ; index < count ; index ++ )
   {
     switch ( binds->type )
     {
     case dpi::DpiVarChar:
       arrVal->Set ( index,
-                    ( binds->ind[index] == -1 ) ? Null () :
-                      String::New ((char *)binds->value +
+                    ( binds->ind[index] == -1 ) ? NanNull() :
+                      NanNew<v8::String> ((char *)binds->value +
                                    (index * binds->maxSize ),
                                    binds->len2[index]));
       break;
     case dpi::DpiInteger:
       arrVal->Set ( index,
-                    (binds->ind[index] == -1 ) ? Null () :
-                      Integer::New ( *((int *)binds->value + index )));
+                    (binds->ind[index] == -1 ) ? NanNull() :
+                      NanNew<v8::Integer> ( *((int *)binds->value + index )));
       break;
     case dpi::DpiDouble:
       arrVal->Set ( index,
-                    (binds->ind[index] == -1 ) ? Null () :
-                      Number::New ( *((double *)binds->value + index )));
+                    (binds->ind[index] == -1 ) ? NanNull() :
+                      NanNew<v8::Number> ( *((double *)binds->value + index )));
       break;
     case dpi::DpiTimestampLTZ:
       if ( binds->ind[index] != -1 )
       {
-        date = Date::Cast (*Date::New (*((long double *)binds->value +
-                                         index )));
-        val = date;
-        arrVal->Set ( index, val );
+        arrVal->Set ( index, 
+                      NanNew<v8::Date> (*((long double *)binds->value + index )) );
       }
       else
       {
-        arrVal->Set ( index, Null () );
+        arrVal->Set ( index, NanNull () );
       }
       break;
     default:
       break;
     }
   }
-  return scope.Close ( arrVal ) ;
+  return NanEscapeScope( arrVal ) ;
 }
 
 
@@ -1293,23 +1299,23 @@ Handle<Value> Connection::GetArrayValue ( Bind *binds, unsigned long count )
 v8::Handle<v8::Value> Connection::GetOutBinds (eBaton* executeBaton)
 {
   NanEscapableScope();
+
   if(!executeBaton->binds.empty())
   {
     if( executeBaton->binds[0]->key.empty() )
     {
       // Binds as JS array
-      unsigned int outCount = 0;
-      for(unsigned int index = 0; index < executeBaton->binds.size(); index++)
-      {
-        if(executeBaton->binds[index]->isOut)
-          outCount++;
-      }
-      return NanEscapeScope(GetOutBindArray( executeBaton->binds, outCount ));
+      return NanEscapeScope(GetOutBindArray( executeBaton->binds,
+                                             executeBaton->numOutBinds,
+                                             executeBaton->stmtIsReturning,
+                                             executeBaton->rowsAffected ));
     }
     else
     {
       // Binds as JS object 
-      return NanEscapeScope(GetOutBindObject( executeBaton->binds ));
+      return NanEscapeScope(GetOutBindObject( executeBaton->binds,
+                                              executeBaton->stmtIsReturning,
+                                              executeBaton->rowsAffected ));
     }
   }
   return NanUndefined();
@@ -1326,8 +1332,10 @@ v8::Handle<v8::Value> Connection::GetOutBinds (eBaton* executeBaton)
    RETURNS:
      Outbinds array
 */
-v8::Handle<v8::Value> Connection::GetOutBindArray ( std::vector<Bind*> binds,
-                                            unsigned int outCount )
+v8::Handle<v8::Value> Connection::GetOutBindArray ( std::vector<Bind*> &binds,
+                                                    unsigned int outCount,
+                                                    bool isDMLReturning,
+                                                    unsigned long rowcount )
 {
   NanEscapableScope();
 
@@ -1371,7 +1379,9 @@ v8::Handle<v8::Value> Connection::GetOutBindArray ( std::vector<Bind*> binds,
    RETURNS:
      Outbinds object
 */
-v8::Handle<v8::Value> Connection::GetOutBindObject ( std::vector<Bind*> binds )
+v8::Handle<v8::Value> Connection::GetOutBindObject ( std::vector<Bind*> &binds,
+                                                     bool isDMLReturning,
+                                                     unsigned long rowcount )
 {
   NanEscapableScope();
   Local<Object> objectBinds = NanNew<v8::Object>();
@@ -1382,8 +1392,24 @@ v8::Handle<v8::Value> Connection::GetOutBindObject ( std::vector<Bind*> binds )
       Handle<Value> val;
 
       binds[index]->key.erase(binds[index]->key.begin());
+
+      if ( !isDMLReturning )
+      {
+        val = Connection::GetValue (
+                                    binds[index]->ind[0],
+                                    binds[index]->type,
+                                    (binds[index]->type == DpiTimestampLTZ ) ?
+                                 binds[index]->extvalue : binds[index]->value,
+                                    binds[index]->len[0],
+                                    binds[index]->maxSize );
+      }
+      else
+      {
+        val = Connection::GetArrayValue ( binds[index], rowcount ) ;
+      }
+
       objectBinds->Set( NanNew<v8::String> ( binds[index]->key.c_str(),
-                                      (int) binds[index]->key.length() ),
+                        (int) binds[index]->key.length() ),
                         val );
     }
   }

src/njs/src/njsConnection.h

@@ -234,13 +234,20 @@ class Connection: public ObjectWrap
   static void GetOutBindParams (unsigned short dataType, Bind* bind,
                                 eBaton* executeBaton);
   static v8::Handle<v8::Value> GetOutBinds (eBaton* executeBaton);
-  static v8::Handle<v8::Value> GetOutBindArray ( std::vector<Bind*> binds, unsigned int outCount);
-  static v8::Handle<v8::Value> GetOutBindObject (std::vector<Bind*> binds);
+  static v8::Handle<v8::Value> GetOutBindArray ( std::vector<Bind*> &binds,
+                                                 unsigned int outCount,
+                                                 bool bDMLReturn = false,
+                                                 unsigned long rowcount = 1);
+  static v8::Handle<v8::Value> GetOutBindObject (std::vector<Bind*> &binds,
+                                                 bool bDMLReturn = false,
+                                                 unsigned long rowcount = 1);
   static v8::Handle<v8::Value> GetRows (eBaton* executeBaton);
   static v8::Handle<v8::Value> GetMetaData (std::string* columnNames,
-                                    unsigned int numCols);
+                                            unsigned int numCols);
+  static v8::Handle<v8::Value> GetArrayValue (Bind *bind, unsigned long count);
   static v8::Handle<v8::Value> GetValue (short ind, unsigned short type, void* val,
-                                 DPI_BUFLEN_TYPE len);
+                                         DPI_BUFLEN_TYPE len,
+                                         DPI_SZ_TYPE maxSize = -1);
   static void UpdateDateValue ( eBaton *executeBaton );
   static void v8Date2OraDate ( v8::Handle<v8::Value>, Bind *bind);
 

src/njs/src/njsOracle.cpp

@@ -112,9 +112,9 @@ void Oracledb::Init(Handle<Object> target)
                               Oracledb::GetStmtCacheSize,
                               Oracledb::SetStmtCacheSize );
   temp->InstanceTemplate()->SetAccessor(
-                              NanNew<v8::String>("isAutoCommit"),
-                              Oracledb::GetIsAutoCommit,
-                              Oracledb::SetIsAutoCommit );
+                              NanNew<v8::String>("autoCommit"),
+                              Oracledb::GetAutoCommit,
+                              Oracledb::SetAutoCommit );
   temp->InstanceTemplate()->SetAccessor(
                               NanNew<v8::String>("maxRows"),
                               Oracledb::GetMaxRows,
@@ -132,9 +132,9 @@ void Oracledb::Init(Handle<Object> target)
                               Oracledb::GetConnectionClass,
                               Oracledb::SetConnectionClass );
   temp->InstanceTemplate()->SetAccessor(
-                              NanNew<v8::String>("isExternalAuth"),
-                              Oracledb::GetIsExternalAuth,
-                              Oracledb::SetIsExternalAuth );
+                              NanNew<v8::String>("externalAuth"),
+                              Oracledb::GetExternalAuth,
+                              Oracledb::SetExternalAuth );
 
   NanAssignPersistent( oracledbTemplate_s, temp);
   target->Set(NanNew<v8::String>("Oracledb"),temp->GetFunction());
@@ -336,11 +336,11 @@ NAN_SETTER(Oracledb::SetStmtCacheSize)
    DESCRIPTION
      Get Accessor of autoCommit property
 */
-NAN_PROPERTY_GETTER(Oracledb::GetIsAutoCommit)
+NAN_PROPERTY_GETTER(Oracledb::GetAutoCommit)
 {
   NanScope();
   Oracledb* oracledb = ObjectWrap::Unwrap<Oracledb>(args.Holder());
-  Handle<Boolean> value = NanNew<v8::Boolean>(oracledb->isAutoCommit_);
+  Handle<Boolean> value = NanNew<v8::Boolean>(oracledb->autoCommit_);
   NanReturnValue(value);
 }
 
@@ -349,11 +349,11 @@ NAN_PROPERTY_GETTER(Oracledb::GetIsAutoCommit)
    DESCRIPTION
      Set Accessor of autoCommit property
 */
-NAN_SETTER(Oracledb::SetIsAutoCommit)
+NAN_SETTER(Oracledb::SetAutoCommit)
 {
   NanScope();
   Oracledb* oracledb = ObjectWrap::Unwrap<Oracledb>(args.Holder());
-  oracledb->isAutoCommit_ = value->ToBoolean()->Value();
+  oracledb->autoCommit_ = value->ToBoolean()->Value();
 }
 
 /*****************************************************************************/
@@ -420,12 +420,12 @@ NAN_SETTER(Oracledb::SetConnectionClass)
    DESCRIPTION
      Get Accessor of externalAuth property
 */
-NAN_PROPERTY_GETTER(Oracledb::GetIsExternalAuth)
+NAN_PROPERTY_GETTER(Oracledb::GetExternalAuth)
 {
   NanScope();
 
   Oracledb* oracledb = ObjectWrap::Unwrap<Oracledb>(args.Holder());
-  Handle<Boolean> value = NanNew<v8::Boolean>(oracledb->isExternalAuth_);
+  Handle<Boolean> value = NanNew<v8::Boolean>(oracledb->externalAuth_);
 
   NanReturnValue(value);
 }
@@ -436,11 +436,11 @@ NAN_PROPERTY_GETTER(Oracledb::GetIsExternalAuth)
    DESCRIPTION
      Set Accessor of externalAuth property
 */
-NAN_SETTER(Oracledb::SetIsExternalAuth)
+NAN_SETTER(Oracledb::SetExternalAuth)
 {
   NanScope();
   Oracledb* oracledb = ObjectWrap::Unwrap<Oracledb>(args.Holder());
-  oracledb->isExternalAuth_ = value->ToBoolean()->Value();
+  oracledb->externalAuth_ = value->ToBoolean()->Value();
 }
 
 

src/njs/src/njsOracle.h

@@ -95,25 +95,25 @@ class Oracledb: public ObjectWrap
    static NAN_PROPERTY_GETTER(GetPoolIncrement);
    static NAN_PROPERTY_GETTER(GetPoolTimeout);
    static NAN_PROPERTY_GETTER(GetStmtCacheSize);
-   static NAN_PROPERTY_GETTER(GetIsAutoCommit);
+   static NAN_PROPERTY_GETTER(GetAutoCommit);
    static NAN_PROPERTY_GETTER(GetMaxRows);
    static NAN_PROPERTY_GETTER(GetOutFormat);
    static NAN_PROPERTY_GETTER(GetVersion);
    static NAN_PROPERTY_GETTER(GetConnectionClass);
-   static NAN_PROPERTY_GETTER(GetIsExternalAuth);
+   static NAN_PROPERTY_GETTER(GetExternalAuth);
 
    // Define Setter Accessors to Properties
    static NAN_SETTER(SetPoolMin);
    static NAN_SETTER(SetPoolMax);
    static NAN_SETTER(SetPoolIncrement);
    static NAN_SETTER(SetPoolTimeout);
    static NAN_SETTER(SetStmtCacheSize);
-   static NAN_SETTER(SetIsAutoCommit);
+   static NAN_SETTER(SetAutoCommit);
    static NAN_SETTER(SetMaxRows);
    static NAN_SETTER(SetOutFormat);
    static NAN_SETTER(SetVersion);
    static NAN_SETTER(SetConnectionClass);
-   static NAN_SETTER(SetIsExternalAuth);
+   static NAN_SETTER(SetExternalAuth);
 
    Oracledb();
    ~Oracledb();