Renamed isAutoCommit to autoCommit, and isExternalAuth to externalAuth.
This commit is contained in:
parent
c884855dc7
commit
d6dc629c85
|
@ -78,7 +78,7 @@ function insertTestData(err) {
|
|||
ts: date,
|
||||
td: date
|
||||
},
|
||||
{isAutoCommit : false},
|
||||
{autoCommit : false},
|
||||
selectData
|
||||
);
|
||||
}
|
||||
|
|
|
@ -56,7 +56,7 @@ oracledb.getConnection(
|
|||
connection1.execute(
|
||||
"INSERT INTO test VALUES (:id, :nm)",
|
||||
[1, 'Chris'], // Bind values
|
||||
{ isAutoCommit: true}, // Override the default non-autocommit behavior
|
||||
{ autoCommit: true}, // Override the default non-autocommit behavior
|
||||
function(err, result)
|
||||
{
|
||||
if (err) { console.error(err.message); return; }
|
||||
|
@ -65,7 +65,7 @@ oracledb.getConnection(
|
|||
connection1.execute(
|
||||
"INSERT INTO test VALUES (:id, :nm)",
|
||||
[2, 'Alison'], // Bind values
|
||||
// { isAutoCommit: true}, // Since this isn't set, operations using a second connection won't see this row
|
||||
// { autoCommit: true}, // Since this isn't set, operations using a second connection won't see this row
|
||||
function(err, result)
|
||||
{
|
||||
if (err) { console.error(err.message); return; }
|
||||
|
@ -93,7 +93,7 @@ oracledb.getConnection(
|
|||
return;
|
||||
}
|
||||
// This will only show 'Chris' because inserting 'Alison' is not commited by default.
|
||||
// Uncomment the isAutoCommit option above and you will see both rows
|
||||
// Uncomment the autoCommit option above and you will see both rows
|
||||
console.log(result.rows);
|
||||
|
||||
connection1.execute(
|
||||
|
|
|
@ -77,8 +77,8 @@ class Env
|
|||
virtual void poolTimeout(unsigned int poolTimeout) = 0;
|
||||
virtual unsigned int poolTimeout() const = 0;
|
||||
|
||||
virtual void isExternalAuth(bool isExternalAuth) = 0;
|
||||
virtual bool isExternalAuth() const = 0;
|
||||
virtual void externalAuth(bool externalAuth) = 0;
|
||||
virtual bool externalAuth() const = 0;
|
||||
|
||||
// methods
|
||||
virtual SPool * createPool(const string &user, const string &password,
|
||||
|
@ -87,13 +87,13 @@ class Env
|
|||
int poolIncrement = -1,
|
||||
int poolTimeout = -1,
|
||||
int stmtCacheSize = -1,
|
||||
bool isExternalAuth = false) = 0;
|
||||
bool externalAuth = false) = 0;
|
||||
|
||||
virtual Conn * getConnection(const string &user, const string &password,
|
||||
const string &connString,
|
||||
int stmtCacheSize,
|
||||
const string &connClass = "",
|
||||
bool isExternalAuth = false) = 0;
|
||||
bool externalAuth = false) = 0;
|
||||
|
||||
// DateTime array
|
||||
virtual DateTimeArray * getDateTimeArray( OCIError *errh ) const = 0;
|
||||
|
|
|
@ -164,7 +164,7 @@ public:
|
|||
short *ind, DPI_BUFLEN_TYPE *bufLen,
|
||||
void *data, cbtype cb = NULL ) = 0;
|
||||
|
||||
virtual void execute ( int numIterations, bool isAutoCommit = false) = 0;
|
||||
virtual void execute ( int numIterations, bool autoCommit = false) = 0;
|
||||
|
||||
virtual void define(unsigned int pos, unsigned short type, void *buf,
|
||||
DPI_SZ_TYPE bufSize, short *ind, DPI_BUFLEN_TYPE *bufLen) = 0;
|
||||
|
|
|
@ -75,7 +75,7 @@ using namespace std;
|
|||
nothing
|
||||
*/
|
||||
|
||||
ConnImpl::ConnImpl(EnvImpl *env, OCIEnv *envh, bool isExternalAuth,
|
||||
ConnImpl::ConnImpl(EnvImpl *env, OCIEnv *envh, bool externalAuth,
|
||||
unsigned int stmtCacheSize,
|
||||
const string &user, const string &password,
|
||||
const string &connString, const string &connClass)
|
||||
|
@ -84,7 +84,7 @@ try : env_(env), pool_(NULL),
|
|||
envh_(envh), errh_(NULL), auth_(NULL), svch_(NULL), sessh_(NULL),
|
||||
hasTxn_(false)
|
||||
{
|
||||
ub4 mode = isExternalAuth ? OCI_SESSGET_CREDEXT : OCI_DEFAULT;
|
||||
ub4 mode = externalAuth ? OCI_SESSGET_CREDEXT : OCI_DEFAULT;
|
||||
|
||||
ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&errh_,
|
||||
OCI_HTYPE_ERROR, 0, (dvoid **)0), envh_);
|
||||
|
@ -92,7 +92,7 @@ try : env_(env), pool_(NULL),
|
|||
ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&auth_,
|
||||
OCI_HTYPE_AUTHINFO, 0, (dvoid **)0), envh_);
|
||||
|
||||
if (isExternalAuth)
|
||||
if (externalAuth)
|
||||
{
|
||||
if (password.length() || user.length())
|
||||
throw ExceptionImpl(DpiErrExtAuth);
|
||||
|
@ -155,7 +155,7 @@ catch (...)
|
|||
This constructor to be used in session-pool scenarios.
|
||||
*/
|
||||
|
||||
ConnImpl::ConnImpl(PoolImpl *pool, OCIEnv *envh, bool isExternalAuth,
|
||||
ConnImpl::ConnImpl(PoolImpl *pool, OCIEnv *envh, bool externalAuth,
|
||||
OraText *poolName, ub4 poolNameLen, const string& connClass
|
||||
)
|
||||
|
||||
|
@ -163,7 +163,7 @@ try : env_(NULL), pool_(pool),
|
|||
envh_(envh), errh_(NULL), auth_(NULL),
|
||||
svch_(NULL), sessh_(NULL), hasTxn_(false)
|
||||
{
|
||||
ub4 mode = isExternalAuth ? (OCI_SESSGET_CREDEXT | OCI_SESSGET_SPOOL) :
|
||||
ub4 mode = externalAuth ? (OCI_SESSGET_CREDEXT | OCI_SESSGET_SPOOL) :
|
||||
OCI_SESSGET_SPOOL;
|
||||
ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&errh_,
|
||||
OCI_HTYPE_ERROR, 0, (dvoid **)0), envh_);
|
||||
|
|
|
@ -63,13 +63,13 @@ class ConnImpl : public Conn
|
|||
public:
|
||||
// creation/termination
|
||||
|
||||
ConnImpl(EnvImpl *env, OCIEnv *envh, bool isExternalAuth,
|
||||
ConnImpl(EnvImpl *env, OCIEnv *envh, bool externalAuth,
|
||||
unsigned int stmtCacheSize,
|
||||
const string &user, const string &password,
|
||||
const string &connString,
|
||||
const string &connClass);
|
||||
|
||||
ConnImpl(PoolImpl *pool, OCIEnv *envh, bool isExternalAuth,
|
||||
ConnImpl(PoolImpl *pool, OCIEnv *envh, bool externalAuth,
|
||||
OraText *poolName, ub4 poolNameLen, const string &connClass
|
||||
);
|
||||
|
||||
|
|
|
@ -97,7 +97,7 @@ EnvImpl::EnvImpl()
|
|||
|
||||
try : envh_(NULL), poolMax_(kPoolMax), poolMin_(kPoolMin),
|
||||
poolIncrement_(kPoolIncrement), poolTimeout_(kPoolTimeout),
|
||||
isExternalAuth_(false), stmtCacheSize_(kStmtCacheSize)
|
||||
externalAuth_(false), stmtCacheSize_(kStmtCacheSize)
|
||||
{
|
||||
|
||||
sword rc = OCIEnvCreate (&envh_, OCI_THREADED | OCI_OBJECT, NULL, NULL,
|
||||
|
@ -364,7 +364,7 @@ unsigned int EnvImpl::poolTimeout() const
|
|||
Specify external authentication.
|
||||
|
||||
PARAMETERS:
|
||||
isExternalAuth - true if using external authentication
|
||||
externalAuth - true if using external authentication
|
||||
false if not useing external authentication
|
||||
|
||||
RETURNS:
|
||||
|
@ -374,9 +374,9 @@ unsigned int EnvImpl::poolTimeout() const
|
|||
|
||||
*/
|
||||
|
||||
void EnvImpl::isExternalAuth(bool isExternalAuth)
|
||||
void EnvImpl::externalAuth(bool externalAuth)
|
||||
{
|
||||
isExternalAuth_ = isExternalAuth;
|
||||
externalAuth_ = externalAuth;
|
||||
}
|
||||
|
||||
|
||||
|
@ -397,9 +397,9 @@ void EnvImpl::isExternalAuth(bool isExternalAuth)
|
|||
|
||||
*/
|
||||
|
||||
bool EnvImpl::isExternalAuth() const
|
||||
bool EnvImpl::externalAuth() const
|
||||
{
|
||||
return isExternalAuth_;
|
||||
return externalAuth_;
|
||||
}
|
||||
|
||||
|
||||
|
@ -470,7 +470,7 @@ SPool * EnvImpl::createPool(const string &user, const string &password,
|
|||
const string &connString,
|
||||
int poolMax, int poolMin, int poolIncrement,
|
||||
int poolTimeout, int stmtCacheSize,
|
||||
bool isExternalAuth)
|
||||
bool externalAuth)
|
||||
{
|
||||
return new PoolImpl(this, envh_, user, password, connString,
|
||||
(poolMax == -1) ? poolMax_ : poolMax,
|
||||
|
@ -479,7 +479,7 @@ SPool * EnvImpl::createPool(const string &user, const string &password,
|
|||
poolIncrement,
|
||||
(poolTimeout == -1) ? poolTimeout_ :
|
||||
poolTimeout,
|
||||
isExternalAuth,
|
||||
externalAuth,
|
||||
(stmtCacheSize == -1) ? stmtCacheSize_ :
|
||||
stmtCacheSize);
|
||||
}
|
||||
|
@ -504,9 +504,9 @@ SPool * EnvImpl::createPool(const string &user, const string &password,
|
|||
Conn * EnvImpl::getConnection(const string &user, const string &password,
|
||||
const string &connString,
|
||||
int stmtCacheSize, const string &connClass,
|
||||
bool isExternalAuth)
|
||||
bool externalAuth)
|
||||
{
|
||||
return (Conn *)new ConnImpl(this, envh_, isExternalAuth,
|
||||
return (Conn *)new ConnImpl(this, envh_, externalAuth,
|
||||
(stmtCacheSize == -1) ? stmtCacheSize_ :
|
||||
stmtCacheSize,
|
||||
user, password,
|
||||
|
|
|
@ -83,8 +83,8 @@ class EnvImpl : public Env
|
|||
virtual void poolTimeout(unsigned int poolTimeout);
|
||||
virtual unsigned int poolTimeout() const;
|
||||
|
||||
virtual void isExternalAuth(bool isExternalAuth);
|
||||
virtual bool isExternalAuth() const;
|
||||
virtual void externalAuth(bool externalAuth);
|
||||
virtual bool externalAuth() const;
|
||||
|
||||
virtual void isEventEnabled(bool isEventEnabled);
|
||||
virtual bool isEventEnabled() const;
|
||||
|
@ -96,12 +96,12 @@ class EnvImpl : public Env
|
|||
int poolIncrement,
|
||||
int poolTimeout,
|
||||
int stmtCacheSize,
|
||||
bool isExternalAuth);
|
||||
bool externalAuth);
|
||||
|
||||
virtual Conn * getConnection(const string &user, const string &password,
|
||||
const string &connString, int stmtCacheSize,
|
||||
const string &connClass,
|
||||
bool isExternalAuth);
|
||||
bool externalAuth);
|
||||
|
||||
|
||||
// internal methods
|
||||
|
@ -125,7 +125,7 @@ private:
|
|||
unsigned int poolIncrement_; // pool increment
|
||||
unsigned int poolTimeout_; // pool timeout
|
||||
|
||||
bool isExternalAuth_; // doing external authentication
|
||||
bool externalAuth_; // doing external authentication
|
||||
bool isEventEnabled_; // EVENTS are enabled
|
||||
|
||||
unsigned int stmtCacheSize_; // statement cache size
|
||||
|
|
|
@ -87,15 +87,15 @@ PoolImpl::PoolImpl(EnvImpl *env, OCIEnv *envh,
|
|||
const string &user, const string &password,
|
||||
const string &connString, int poolMax,
|
||||
int poolMin, int poolIncrement,
|
||||
int poolTimeout, bool isExternalAuth, int stmtCacheSize)
|
||||
try : env_(env), isExternalAuth_(isExternalAuth), envh_(envh), errh_(NULL),
|
||||
int poolTimeout, bool externalAuth, int stmtCacheSize)
|
||||
try : env_(env), externalAuth_(externalAuth), envh_(envh), errh_(NULL),
|
||||
spoolh_(NULL), poolName_(NULL)
|
||||
{
|
||||
ub4 mode = isExternalAuth ? OCI_DEFAULT : OCI_SPC_HOMOGENEOUS;
|
||||
ub4 mode = externalAuth ? OCI_DEFAULT : OCI_SPC_HOMOGENEOUS;
|
||||
|
||||
unsigned char spoolMode = OCI_SPOOL_ATTRVAL_NOWAIT; // spoolMode is a ub1
|
||||
|
||||
if (isExternalAuth && (password.length() || user.length()))
|
||||
if (externalAuth && (password.length() || user.length()))
|
||||
throw ExceptionImpl(DpiErrExtAuth);
|
||||
|
||||
ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&errh_,
|
||||
|
@ -297,7 +297,7 @@ unsigned int PoolImpl::connectionsInUse() const
|
|||
|
||||
Conn * PoolImpl::getConnection ( const std::string& connClass)
|
||||
{
|
||||
Conn *conn = new ConnImpl(this, envh_, isExternalAuth_,
|
||||
Conn *conn = new ConnImpl(this, envh_, externalAuth_,
|
||||
poolName_, poolNameLen_, connClass
|
||||
);
|
||||
return conn;
|
||||
|
|
|
@ -62,7 +62,7 @@ class PoolImpl : public SPool
|
|||
const string &user, const string &password,
|
||||
const string &connString,
|
||||
int poolMax, int poolMin, int poolIncrement, int poolTimeout,
|
||||
bool isExternalAuth, int stmtCacheSize);
|
||||
bool externalAuth, int stmtCacheSize);
|
||||
|
||||
virtual ~PoolImpl();
|
||||
|
||||
|
@ -85,7 +85,7 @@ class PoolImpl : public SPool
|
|||
void cleanup();
|
||||
|
||||
EnvImpl *env_; // parent Env object
|
||||
bool isExternalAuth_; // doing external authentication
|
||||
bool externalAuth_; // doing external authentication
|
||||
OCIEnv *envh_; // OCI enviornment handle
|
||||
OCIError *errh_; // OCI error handle
|
||||
OCISPool *spoolh_; // OCI session pool handle
|
||||
|
|
|
@ -293,15 +293,15 @@ void StmtImpl::bind (const unsigned char *name, int nameLen,
|
|||
Execute the SQL statement.
|
||||
|
||||
PARAMETERS
|
||||
isAutoCommit - true/false - autocommit enabled or not
|
||||
autoCommit - true/false - autocommit enabled or not
|
||||
numIterations - iterations to repeat
|
||||
|
||||
RETURNS:
|
||||
-None-
|
||||
*/
|
||||
void StmtImpl::execute (int numIterations, bool isAutoCommit)
|
||||
void StmtImpl::execute (int numIterations, bool autoCommit)
|
||||
{
|
||||
ub4 mode = isAutoCommit ? OCI_COMMIT_ON_SUCCESS : OCI_DEFAULT;
|
||||
ub4 mode = autoCommit ? OCI_COMMIT_ON_SUCCESS : OCI_DEFAULT;
|
||||
|
||||
ociCall (OCIStmtExecute ( svch_, stmth_, errh_, (ub4)numIterations, (ub4)0,
|
||||
(OCISnapshot *)NULL, (OCISnapshot *)NULL, mode),
|
||||
|
|
|
@ -80,7 +80,7 @@ public:
|
|||
short *ind, DPI_BUFLEN_TYPE *bufLen,
|
||||
void *data, cbtype cb);
|
||||
|
||||
virtual void execute ( int numIterations, bool isAutoCommit );
|
||||
virtual void execute ( int numIterations, bool autoCommit );
|
||||
|
||||
virtual void define (unsigned int pos, unsigned short type, void *buf,
|
||||
DPI_SZ_TYPE bufSize, short *ind, DPI_BUFLEN_TYPE *bufLen);
|
||||
|
|
|
@ -325,7 +325,7 @@ Handle<Value> Connection::Execute(const Arguments& args)
|
|||
|
||||
executeBaton->maxRows = connection->oracledb_->getMaxRows();
|
||||
executeBaton->outFormat = connection->oracledb_->getOutFormat();
|
||||
executeBaton->isAutoCommit = connection->oracledb_->getIsAutoCommit();
|
||||
executeBaton->autoCommit = connection->oracledb_->getAutoCommit();
|
||||
executeBaton->dpienv = connection->oracledb_->getDpiEnv();
|
||||
executeBaton->dpiconn = connection->dpiconn_;
|
||||
|
||||
|
@ -397,8 +397,8 @@ void Connection::ProcessOptions (const Arguments& args, unsigned int index,
|
|||
options, "maxRows", 2, exitProcessOptions );
|
||||
NJS_GET_UINT_FROM_JSON ( executeBaton->outFormat, executeBaton->error,
|
||||
options, "outFormat", 2, exitProcessOptions );
|
||||
NJS_GET_BOOL_FROM_JSON ( executeBaton->isAutoCommit, executeBaton->error,
|
||||
options, "isAutoCommit", 2, exitProcessOptions );
|
||||
NJS_GET_BOOL_FROM_JSON ( executeBaton->autoCommit, executeBaton->error,
|
||||
options, "autoCommit", 2, exitProcessOptions );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -714,12 +714,12 @@ void Connection::Async_Execute (uv_work_t *req)
|
|||
|
||||
if (executeBaton->st == DpiStmtSelect)
|
||||
{
|
||||
executeBaton->dpistmt->execute(0, executeBaton->isAutoCommit);
|
||||
executeBaton->dpistmt->execute(0, executeBaton->autoCommit);
|
||||
Connection::GetDefines(executeBaton);
|
||||
}
|
||||
else
|
||||
{
|
||||
executeBaton->dpistmt->execute(1, executeBaton->isAutoCommit);
|
||||
executeBaton->dpistmt->execute(1, executeBaton->autoCommit);
|
||||
executeBaton->rowsAffected = executeBaton->dpistmt->rowsAffected();
|
||||
|
||||
/* Check to see if the string buffer size is good in case of
|
||||
|
|
|
@ -89,7 +89,7 @@ typedef struct eBaton
|
|||
dpi::Conn* dpiconn;
|
||||
DPI_SZ_TYPE rowsAffected;
|
||||
unsigned int maxRows;
|
||||
bool isAutoCommit;
|
||||
bool autoCommit;
|
||||
unsigned int rowsFetched;
|
||||
unsigned int outFormat;
|
||||
unsigned int numCols;
|
||||
|
@ -103,7 +103,7 @@ typedef struct eBaton
|
|||
Persistent<Function> cb;
|
||||
|
||||
eBaton() : sql(""), error(""), dpienv(NULL), dpiconn(NULL),
|
||||
rowsAffected(0), maxRows(0), isAutoCommit(false),
|
||||
rowsAffected(0), maxRows(0), autoCommit(false),
|
||||
rowsFetched(0), outFormat(0), numCols(0), dpistmt(NULL),
|
||||
st(DpiStmtUnknown), stmtIsReturning (false), numOutBinds(0),
|
||||
columnNames(NULL), defines(NULL)
|
||||
|
|
|
@ -49,14 +49,14 @@ Oracledb::Oracledb()
|
|||
dpienv_ = dpi::Env::createEnv();
|
||||
outFormat_ = ROWS_ARRAY;
|
||||
maxRows_ = MAX_ROWS;
|
||||
isAutoCommit_ = false;
|
||||
autoCommit_ = false;
|
||||
stmtCacheSize_ = STMT_CACHE_SIZE;
|
||||
poolMax_ = POOL_MAX;
|
||||
poolMin_ = POOL_MIN;
|
||||
poolIncrement_ = POOL_INCR;
|
||||
poolTimeout_ = POOL_TIMEOUT;
|
||||
connClass_ = "";
|
||||
isExternalAuth_ = false;
|
||||
externalAuth_ = false;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -112,9 +112,9 @@ void Oracledb::Init(Handle<Object> target)
|
|||
Oracledb::GetStmtCacheSize,
|
||||
Oracledb::SetStmtCacheSize );
|
||||
oracledbTemplate_s->InstanceTemplate()->SetAccessor(
|
||||
String::New("isAutoCommit"),
|
||||
Oracledb::GetIsAutoCommit,
|
||||
Oracledb::SetIsAutoCommit );
|
||||
String::New("autoCommit"),
|
||||
Oracledb::GetAutoCommit,
|
||||
Oracledb::SetAutoCommit );
|
||||
oracledbTemplate_s->InstanceTemplate()->SetAccessor(
|
||||
String::New("maxRows"),
|
||||
Oracledb::GetMaxRows,
|
||||
|
@ -132,9 +132,9 @@ void Oracledb::Init(Handle<Object> target)
|
|||
Oracledb::GetConnectionClass,
|
||||
Oracledb::SetConnectionClass );
|
||||
oracledbTemplate_s->InstanceTemplate()->SetAccessor(
|
||||
String::New("isExternalAuth"),
|
||||
Oracledb::GetIsExternalAuth,
|
||||
Oracledb::SetIsExternalAuth );
|
||||
String::New("externalAuth"),
|
||||
Oracledb::GetExternalAuth,
|
||||
Oracledb::SetExternalAuth );
|
||||
|
||||
|
||||
target->Set(String::New("Oracledb"),oracledbTemplate_s->GetFunction());
|
||||
|
@ -348,29 +348,29 @@ void Oracledb::SetStmtCacheSize ( Local<String> property, Local<Value> value,
|
|||
/*****************************************************************************/
|
||||
/*
|
||||
DESCRIPTION
|
||||
Get Accessor of isAutoCommit property
|
||||
Get Accessor of autoCommit property
|
||||
*/
|
||||
Handle<Value> Oracledb::GetIsAutoCommit ( Local<String> property,
|
||||
Handle<Value> Oracledb::GetAutoCommit ( Local<String> property,
|
||||
const AccessorInfo& info )
|
||||
{
|
||||
HandleScope scope;
|
||||
|
||||
Oracledb* oracledb = ObjectWrap::Unwrap<Oracledb>(info.Holder());
|
||||
Handle<Boolean> value = v8::Boolean::New(oracledb->isAutoCommit_);
|
||||
Handle<Boolean> value = v8::Boolean::New(oracledb->autoCommit_);
|
||||
return scope.Close(value);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*
|
||||
DESCRIPTION
|
||||
Set Accessor of isAutoCommit property
|
||||
Set Accessor of autoCommit property
|
||||
*/
|
||||
void Oracledb::SetIsAutoCommit ( Local<String> property, Local<Value> value,
|
||||
void Oracledb::SetAutoCommit ( Local<String> property, Local<Value> value,
|
||||
const AccessorInfo& info )
|
||||
{
|
||||
HandleScope scope;
|
||||
Oracledb* oracledb = ObjectWrap::Unwrap<Oracledb>(info.Holder());
|
||||
oracledb->isAutoCommit_ = value->ToBoolean()->Value();
|
||||
oracledb->autoCommit_ = value->ToBoolean()->Value();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -439,15 +439,15 @@ void Oracledb::SetConnectionClass (Local<String> property, Local<Value> value,
|
|||
/*****************************************************************************/
|
||||
/*
|
||||
DESCRIPTION
|
||||
Get Accessor of isExternalAuth property
|
||||
Get Accessor of externalAuth property
|
||||
*/
|
||||
Handle<Value> Oracledb::GetIsExternalAuth(Local<String> property,
|
||||
Handle<Value> Oracledb::GetExternalAuth(Local<String> property,
|
||||
const AccessorInfo& info )
|
||||
{
|
||||
HandleScope scope;
|
||||
|
||||
Oracledb* oracledb = ObjectWrap::Unwrap<Oracledb>(info.Holder());
|
||||
Handle<Boolean> value = v8::Boolean::New(oracledb->isExternalAuth_);
|
||||
Handle<Boolean> value = v8::Boolean::New(oracledb->externalAuth_);
|
||||
return scope.Close(value);
|
||||
}
|
||||
|
||||
|
@ -455,14 +455,14 @@ Handle<Value> Oracledb::GetIsExternalAuth(Local<String> property,
|
|||
/*****************************************************************************/
|
||||
/*
|
||||
DESCRIPTION
|
||||
Set Accessor of isExternalAuth property
|
||||
Set Accessor of externalAuth property
|
||||
*/
|
||||
void Oracledb::SetIsExternalAuth(Local<String> property, Local<Value> value,
|
||||
void Oracledb::SetExternalAuth(Local<String> property, Local<Value> value,
|
||||
const AccessorInfo& info )
|
||||
{
|
||||
HandleScope scope;
|
||||
Oracledb* oracledb = ObjectWrap::Unwrap<Oracledb>(info.Holder());
|
||||
oracledb->isExternalAuth_ = value->ToBoolean()->Value();
|
||||
oracledb->externalAuth_ = value->ToBoolean()->Value();
|
||||
}
|
||||
|
||||
|
||||
|
@ -502,12 +502,12 @@ Handle<Value> Oracledb::GetConnection(const Arguments& args)
|
|||
// the following properties will be overriden if provided as call parameters
|
||||
|
||||
connBaton->stmtCacheSize = oracledb->stmtCacheSize_;
|
||||
connBaton->isExternalAuth = oracledb->isExternalAuth_;
|
||||
connBaton->externalAuth = oracledb->externalAuth_;
|
||||
|
||||
NJS_GET_UINT_FROM_JSON ( connBaton->stmtCacheSize, connBaton->error,
|
||||
connProps, "stmtCacheSize", 0, exitGetConnection );
|
||||
NJS_GET_BOOL_FROM_JSON ( connBaton->isExternalAuth, connBaton->error,
|
||||
connProps, "isExternalAuth", 0, exitGetConnection );
|
||||
NJS_GET_BOOL_FROM_JSON ( connBaton->externalAuth, connBaton->error,
|
||||
connProps, "externalAuth", 0, exitGetConnection );
|
||||
|
||||
connBaton->oracledb = oracledb;
|
||||
connBaton->dpienv = oracledb->dpienv_;
|
||||
|
@ -546,7 +546,7 @@ void Oracledb::Async_GetConnection (uv_work_t *req)
|
|||
connBaton->connStr,
|
||||
connBaton->stmtCacheSize,
|
||||
connBaton->connClass,
|
||||
connBaton->isExternalAuth );
|
||||
connBaton->externalAuth );
|
||||
|
||||
}
|
||||
catch (dpi::Exception& e)
|
||||
|
@ -635,7 +635,7 @@ Handle<Value> Oracledb::CreatePool (const Arguments &args)
|
|||
poolBaton->poolIncrement = oracledb->poolIncrement_;
|
||||
poolBaton->poolTimeout = oracledb->poolTimeout_;
|
||||
poolBaton->stmtCacheSize = oracledb->stmtCacheSize_;
|
||||
poolBaton->isExternalAuth = oracledb->isExternalAuth_;
|
||||
poolBaton->externalAuth = oracledb->externalAuth_;
|
||||
|
||||
NJS_GET_UINT_FROM_JSON ( poolBaton->poolMax, poolBaton->error,
|
||||
poolProps, "poolMax", 0, exitCreatePool );
|
||||
|
@ -647,8 +647,8 @@ Handle<Value> Oracledb::CreatePool (const Arguments &args)
|
|||
poolProps, "poolTimeout", 0, exitCreatePool );
|
||||
NJS_GET_UINT_FROM_JSON ( poolBaton->stmtCacheSize, poolBaton->error,
|
||||
poolProps, "stmtCacheSize", 0, exitCreatePool );
|
||||
NJS_GET_BOOL_FROM_JSON ( poolBaton->isExternalAuth, poolBaton->error,
|
||||
poolProps, "isExternalAuth", 0, exitCreatePool );
|
||||
NJS_GET_BOOL_FROM_JSON ( poolBaton->externalAuth, poolBaton->error,
|
||||
poolProps, "externalAuth", 0, exitCreatePool );
|
||||
|
||||
poolBaton->oracledb = oracledb;
|
||||
poolBaton->dpienv = oracledb->dpienv_;
|
||||
|
@ -692,7 +692,7 @@ void Oracledb::Async_CreatePool (uv_work_t *req)
|
|||
poolBaton->poolIncrement,
|
||||
poolBaton->poolTimeout,
|
||||
poolBaton->stmtCacheSize,
|
||||
poolBaton->isExternalAuth );
|
||||
poolBaton->externalAuth );
|
||||
}
|
||||
catch (dpi::Exception &e)
|
||||
{
|
||||
|
|
|
@ -58,8 +58,8 @@ class Oracledb: public ObjectWrap
|
|||
// Oracledb class
|
||||
static void Init(Handle<Object> target);
|
||||
|
||||
dpi::Env* getDpiEnv () const { return dpienv_; }
|
||||
bool getIsAutoCommit () const { return isAutoCommit_; }
|
||||
dpi::Env* getDpiEnv () const { return dpienv_; }
|
||||
bool getAutoCommit () const { return autoCommit_; }
|
||||
unsigned int getOutFormat () const { return outFormat_; }
|
||||
unsigned int getMaxRows () const { return maxRows_; }
|
||||
unsigned int getStmtCacheSize () const { return stmtCacheSize_; }
|
||||
|
@ -98,7 +98,7 @@ private:
|
|||
const AccessorInfo& info);
|
||||
static Handle<Value> GetStmtCacheSize(Local<String> property,
|
||||
const AccessorInfo& info);
|
||||
static Handle<Value> GetIsAutoCommit(Local<String> property,
|
||||
static Handle<Value> GetAutoCommit(Local<String> property,
|
||||
const AccessorInfo& info);
|
||||
static Handle<Value> GetMaxRows(Local<String> property,
|
||||
const AccessorInfo& info);
|
||||
|
@ -108,7 +108,7 @@ private:
|
|||
const AccessorInfo& info);
|
||||
static Handle<Value> GetConnectionClass (Local<String> property,
|
||||
const AccessorInfo& info );
|
||||
static Handle<Value> GetIsExternalAuth(Local<String> property,
|
||||
static Handle<Value> GetExternalAuth(Local<String> property,
|
||||
const AccessorInfo& info);
|
||||
|
||||
// Define Setter Accessors to Properties
|
||||
|
@ -122,7 +122,7 @@ private:
|
|||
const AccessorInfo& info);
|
||||
static void SetStmtCacheSize(Local<String> property,Local<Value> value,
|
||||
const AccessorInfo& info);
|
||||
static void SetIsAutoCommit(Local<String> property,Local<Value> value,
|
||||
static void SetAutoCommit(Local<String> property,Local<Value> value,
|
||||
const AccessorInfo& info);
|
||||
static void SetMaxRows(Local<String> property,Local<Value> value,
|
||||
const AccessorInfo& info);
|
||||
|
@ -132,7 +132,7 @@ private:
|
|||
const AccessorInfo& info);
|
||||
static void SetConnectionClass (Local<String> property, Local<Value> value,
|
||||
const AccessorInfo& info );
|
||||
static void SetIsExternalAuth(Local<String> property,Local<Value> value,
|
||||
static void SetExternalAuth(Local<String> property,Local<Value> value,
|
||||
const AccessorInfo& info);
|
||||
|
||||
|
||||
|
@ -141,7 +141,7 @@ private:
|
|||
|
||||
dpi::Env* dpienv_;
|
||||
unsigned int outFormat_;
|
||||
bool isAutoCommit_;
|
||||
bool autoCommit_;
|
||||
unsigned int maxRows_;
|
||||
|
||||
unsigned int stmtCacheSize_;
|
||||
|
@ -152,7 +152,7 @@ private:
|
|||
unsigned int poolTimeout_;
|
||||
|
||||
std::string connClass_;
|
||||
bool isExternalAuth_;
|
||||
bool externalAuth_;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -167,7 +167,7 @@ typedef struct connectionBaton
|
|||
std::string pswrd;
|
||||
std::string connStr;
|
||||
std::string connClass;
|
||||
bool isExternalAuth;
|
||||
bool externalAuth;
|
||||
std::string error;
|
||||
|
||||
int poolMax;
|
||||
|
@ -186,7 +186,7 @@ typedef struct connectionBaton
|
|||
Oracledb *oracledb;
|
||||
|
||||
connectionBaton() : user(""), pswrd(""), connStr(""), connClass(""),
|
||||
isExternalAuth(false), error(""),
|
||||
externalAuth(false), error(""),
|
||||
poolMax(0), poolMin(0), poolIncrement(0),
|
||||
poolTimeout(0), stmtCacheSize(0), maxRows(0),
|
||||
outFormat(0), dpienv(NULL),
|
||||
|
|
Loading…
Reference in New Issue