Skip to content

Commit d6dc629

Browse files
cjbjcjbj
committed
Renamed isAutoCommit to autoCommit, and isExternalAuth to externalAuth.
1 parent c884855 commit d6dc629

16 files changed

+87
-87
lines changed

‎examples/date.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function insertTestData(err) {
7878
ts: date,
7979
td: date
8080
},
81-
{isAutoCommit : false},
81+
{autoCommit : false},
8282
selectData
8383
);
8484
}

‎examples/insert2.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ oracledb.getConnection(
5656
connection1.execute(
5757
"INSERT INTO test VALUES (:id, :nm)",
5858
[1, 'Chris'], // Bind values
59-
{ isAutoCommit: true}, // Override the default non-autocommit behavior
59+
{ autoCommit: true}, // Override the default non-autocommit behavior
6060
function(err, result)
6161
{
6262
if (err) { console.error(err.message); return; }
@@ -65,7 +65,7 @@ oracledb.getConnection(
6565
connection1.execute(
6666
"INSERT INTO test VALUES (:id, :nm)",
6767
[2, 'Alison'], // Bind values
68-
// { isAutoCommit: true}, // Since this isn't set, operations using a second connection won't see this row
68+
// { autoCommit: true}, // Since this isn't set, operations using a second connection won't see this row
6969
function(err, result)
7070
{
7171
if (err) { console.error(err.message); return; }
@@ -93,7 +93,7 @@ oracledb.getConnection(
9393
return;
9494
}
9595
// This will only show 'Chris' because inserting 'Alison' is not commited by default.
96-
// Uncomment the isAutoCommit option above and you will see both rows
96+
// Uncomment the autoCommit option above and you will see both rows
9797
console.log(result.rows);
9898

9999
connection1.execute(

‎src/dpi/include/dpiEnv.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ class Env
7777
virtual void poolTimeout(unsigned int poolTimeout) = 0;
7878
virtual unsigned int poolTimeout() const = 0;
7979

80-
virtual void isExternalAuth(bool isExternalAuth) = 0;
81-
virtual bool isExternalAuth() const = 0;
80+
virtual void externalAuth(bool externalAuth) = 0;
81+
virtual bool externalAuth() const = 0;
8282

8383
// methods
8484
virtual SPool * createPool(const string &user, const string &password,
@@ -87,13 +87,13 @@ class Env
8787
int poolIncrement = -1,
8888
int poolTimeout = -1,
8989
int stmtCacheSize = -1,
90-
bool isExternalAuth = false) = 0;
90+
bool externalAuth = false) = 0;
9191

9292
virtual Conn * getConnection(const string &user, const string &password,
9393
const string &connString,
9494
int stmtCacheSize,
9595
const string &connClass = "",
96-
bool isExternalAuth = false) = 0;
96+
bool externalAuth = false) = 0;
9797

9898
// DateTime array
9999
virtual DateTimeArray * getDateTimeArray( OCIError *errh ) const = 0;

‎src/dpi/include/dpiStmt.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class Stmt
164164
short *ind, DPI_BUFLEN_TYPE *bufLen,
165165
void *data, cbtype cb = NULL ) = 0;
166166

167-
virtual void execute ( int numIterations, bool isAutoCommit = false) = 0;
167+
virtual void execute ( int numIterations, bool autoCommit = false) = 0;
168168

169169
virtual void define(unsigned int pos, unsigned short type, void *buf,
170170
DPI_SZ_TYPE bufSize, short *ind, DPI_BUFLEN_TYPE *bufLen) = 0;

‎src/dpi/src/dpiConnImpl.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ using namespace std;
7575
nothing
7676
*/
7777

78-
ConnImpl::ConnImpl(EnvImpl *env, OCIEnv *envh, bool isExternalAuth,
78+
ConnImpl::ConnImpl(EnvImpl *env, OCIEnv *envh, bool externalAuth,
7979
unsigned int stmtCacheSize,
8080
const string &user, const string &password,
8181
const string &connString, const string &connClass)
@@ -84,15 +84,15 @@ try : env_(env), pool_(NULL),
8484
envh_(envh), errh_(NULL), auth_(NULL), svch_(NULL), sessh_(NULL),
8585
hasTxn_(false)
8686
{
87-
ub4 mode = isExternalAuth ? OCI_SESSGET_CREDEXT : OCI_DEFAULT;
87+
ub4 mode = externalAuth ? OCI_SESSGET_CREDEXT : OCI_DEFAULT;
8888

8989
ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&errh_,
9090
OCI_HTYPE_ERROR, 0, (dvoid **)0), envh_);
9191

9292
ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&auth_,
9393
OCI_HTYPE_AUTHINFO, 0, (dvoid **)0), envh_);
9494

95-
if (isExternalAuth)
95+
if (externalAuth)
9696
{
9797
if (password.length() || user.length())
9898
throw ExceptionImpl(DpiErrExtAuth);
@@ -155,15 +155,15 @@ catch (...)
155155
This constructor to be used in session-pool scenarios.
156156
*/
157157

158-
ConnImpl::ConnImpl(PoolImpl *pool, OCIEnv *envh, bool isExternalAuth,
158+
ConnImpl::ConnImpl(PoolImpl *pool, OCIEnv *envh, bool externalAuth,
159159
OraText *poolName, ub4 poolNameLen, const string& connClass
160160
)
161161

162162
try : env_(NULL), pool_(pool),
163163
envh_(envh), errh_(NULL), auth_(NULL),
164164
svch_(NULL), sessh_(NULL), hasTxn_(false)
165165
{
166-
ub4 mode = isExternalAuth ? (OCI_SESSGET_CREDEXT | OCI_SESSGET_SPOOL) :
166+
ub4 mode = externalAuth ? (OCI_SESSGET_CREDEXT | OCI_SESSGET_SPOOL) :
167167
OCI_SESSGET_SPOOL;
168168
ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&errh_,
169169
OCI_HTYPE_ERROR, 0, (dvoid **)0), envh_);

‎src/dpi/src/dpiConnImpl.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ class ConnImpl : public Conn
6363
public:
6464
// creation/termination
6565

66-
ConnImpl(EnvImpl *env, OCIEnv *envh, bool isExternalAuth,
66+
ConnImpl(EnvImpl *env, OCIEnv *envh, bool externalAuth,
6767
unsigned int stmtCacheSize,
6868
const string &user, const string &password,
6969
const string &connString,
7070
const string &connClass);
7171

72-
ConnImpl(PoolImpl *pool, OCIEnv *envh, bool isExternalAuth,
72+
ConnImpl(PoolImpl *pool, OCIEnv *envh, bool externalAuth,
7373
OraText *poolName, ub4 poolNameLen, const string &connClass
7474
);
7575

‎src/dpi/src/dpiEnvImpl.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ EnvImpl::EnvImpl()
9797

9898
try : envh_(NULL), poolMax_(kPoolMax), poolMin_(kPoolMin),
9999
poolIncrement_(kPoolIncrement), poolTimeout_(kPoolTimeout),
100-
isExternalAuth_(false), stmtCacheSize_(kStmtCacheSize)
100+
externalAuth_(false), stmtCacheSize_(kStmtCacheSize)
101101
{
102102

103103
sword rc = OCIEnvCreate (&envh_, OCI_THREADED | OCI_OBJECT, NULL, NULL,
@@ -364,7 +364,7 @@ unsigned int EnvImpl::poolTimeout() const
364364
Specify external authentication.
365365
366366
PARAMETERS:
367-
isExternalAuth - true if using external authentication
367+
externalAuth - true if using external authentication
368368
false if not useing external authentication
369369
370370
RETURNS:
@@ -374,9 +374,9 @@ unsigned int EnvImpl::poolTimeout() const
374374
375375
*/
376376

377-
void EnvImpl::isExternalAuth(bool isExternalAuth)
377+
void EnvImpl::externalAuth(bool externalAuth)
378378
{
379-
isExternalAuth_ = isExternalAuth;
379+
externalAuth_ = externalAuth;
380380
}
381381

382382

@@ -397,9 +397,9 @@ void EnvImpl::isExternalAuth(bool isExternalAuth)
397397
398398
*/
399399

400-
bool EnvImpl::isExternalAuth() const
400+
bool EnvImpl::externalAuth() const
401401
{
402-
return isExternalAuth_;
402+
return externalAuth_;
403403
}
404404

405405

@@ -470,7 +470,7 @@ SPool * EnvImpl::createPool(const string &user, const string &password,
470470
const string &connString,
471471
int poolMax, int poolMin, int poolIncrement,
472472
int poolTimeout, int stmtCacheSize,
473-
bool isExternalAuth)
473+
bool externalAuth)
474474
{
475475
return new PoolImpl(this, envh_, user, password, connString,
476476
(poolMax == -1) ? poolMax_ : poolMax,
@@ -479,7 +479,7 @@ SPool * EnvImpl::createPool(const string &user, const string &password,
479479
poolIncrement,
480480
(poolTimeout == -1) ? poolTimeout_ :
481481
poolTimeout,
482-
isExternalAuth,
482+
externalAuth,
483483
(stmtCacheSize == -1) ? stmtCacheSize_ :
484484
stmtCacheSize);
485485
}
@@ -504,9 +504,9 @@ SPool * EnvImpl::createPool(const string &user, const string &password,
504504
Conn * EnvImpl::getConnection(const string &user, const string &password,
505505
const string &connString,
506506
int stmtCacheSize, const string &connClass,
507-
bool isExternalAuth)
507+
bool externalAuth)
508508
{
509-
return (Conn *)new ConnImpl(this, envh_, isExternalAuth,
509+
return (Conn *)new ConnImpl(this, envh_, externalAuth,
510510
(stmtCacheSize == -1) ? stmtCacheSize_ :
511511
stmtCacheSize,
512512
user, password,

‎src/dpi/src/dpiEnvImpl.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ class EnvImpl : public Env
8383
virtual void poolTimeout(unsigned int poolTimeout);
8484
virtual unsigned int poolTimeout() const;
8585

86-
virtual void isExternalAuth(bool isExternalAuth);
87-
virtual bool isExternalAuth() const;
86+
virtual void externalAuth(bool externalAuth);
87+
virtual bool externalAuth() const;
8888

8989
virtual void isEventEnabled(bool isEventEnabled);
9090
virtual bool isEventEnabled() const;
@@ -96,12 +96,12 @@ class EnvImpl : public Env
9696
int poolIncrement,
9797
int poolTimeout,
9898
int stmtCacheSize,
99-
bool isExternalAuth);
99+
bool externalAuth);
100100

101101
virtual Conn * getConnection(const string &user, const string &password,
102102
const string &connString, int stmtCacheSize,
103103
const string &connClass,
104-
bool isExternalAuth);
104+
bool externalAuth);
105105

106106

107107
// internal methods
@@ -125,7 +125,7 @@ class EnvImpl : public Env
125125
unsigned int poolIncrement_; // pool increment
126126
unsigned int poolTimeout_; // pool timeout
127127

128-
bool isExternalAuth_; // doing external authentication
128+
bool externalAuth_; // doing external authentication
129129
bool isEventEnabled_; // EVENTS are enabled
130130

131131
unsigned int stmtCacheSize_; // statement cache size

‎src/dpi/src/dpiPoolImpl.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ PoolImpl::PoolImpl(EnvImpl *env, OCIEnv *envh,
8787
const string &user, const string &password,
8888
const string &connString, int poolMax,
8989
int poolMin, int poolIncrement,
90-
int poolTimeout, bool isExternalAuth, int stmtCacheSize)
91-
try : env_(env), isExternalAuth_(isExternalAuth), envh_(envh), errh_(NULL),
90+
int poolTimeout, bool externalAuth, int stmtCacheSize)
91+
try : env_(env), externalAuth_(externalAuth), envh_(envh), errh_(NULL),
9292
spoolh_(NULL), poolName_(NULL)
9393
{
94-
ub4 mode = isExternalAuth ? OCI_DEFAULT : OCI_SPC_HOMOGENEOUS;
94+
ub4 mode = externalAuth ? OCI_DEFAULT : OCI_SPC_HOMOGENEOUS;
9595

9696
unsigned char spoolMode = OCI_SPOOL_ATTRVAL_NOWAIT; // spoolMode is a ub1
9797

98-
if (isExternalAuth && (password.length() || user.length()))
98+
if (externalAuth && (password.length() || user.length()))
9999
throw ExceptionImpl(DpiErrExtAuth);
100100

101101
ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&errh_,
@@ -297,7 +297,7 @@ unsigned int PoolImpl::connectionsInUse() const
297297

298298
Conn * PoolImpl::getConnection ( const std::string& connClass)
299299
{
300-
Conn *conn = new ConnImpl(this, envh_, isExternalAuth_,
300+
Conn *conn = new ConnImpl(this, envh_, externalAuth_,
301301
poolName_, poolNameLen_, connClass
302302
);
303303
return conn;

‎src/dpi/src/dpiPoolImpl.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class PoolImpl : public SPool
6262
const string &user, const string &password,
6363
const string &connString,
6464
int poolMax, int poolMin, int poolIncrement, int poolTimeout,
65-
bool isExternalAuth, int stmtCacheSize);
65+
bool externalAuth, int stmtCacheSize);
6666

6767
virtual ~PoolImpl();
6868

@@ -85,7 +85,7 @@ class PoolImpl : public SPool
8585
void cleanup();
8686

8787
EnvImpl *env_; // parent Env object
88-
bool isExternalAuth_; // doing external authentication
88+
bool externalAuth_; // doing external authentication
8989
OCIEnv *envh_; // OCI enviornment handle
9090
OCIError *errh_; // OCI error handle
9191
OCISPool *spoolh_; // OCI session pool handle

0 commit comments

Comments
 (0)