Date: Wednesday, December 20, 2006 @ 19:38:41
Author: gilles
Path: /cvsroot/carob/carob
Modified: src/Connection.cpp (1.100 -> 1.101) src/ControllerInfo.cpp (1.8
-> 1.9) src/ControllerPingSender.cpp (1.3 -> 1.4)
src/ControllerPool.cpp (1.16 -> 1.17)
src/ControllerStateChangedCallback.cpp (1.5 -> 1.6)
src/ControllerWatcher.cpp (1.7 -> 1.8) src/DriverResultSet.cpp
(1.59 -> 1.60) src/JavaSocket.cpp (1.63 -> 1.64)
src/Statement.cpp (1.31 -> 1.32) src/WatchedControllers.cpp (1.3
-> 1.4) test/10-Connection/TestBeginCommitRollback.cpp (1.3 ->
1.4) test/10-Connection/TestConnect.cpp (1.13 -> 1.14)
test/10-Connection/TestControllerPool.cpp (1.7 -> 1.8)
test/10-Connection/TestFailOver.cpp (1.8 -> 1.9)
test/20-Write/TestExecWriteRequest.cpp (1.5 -> 1.6)
test/30-ResultSet/TestBigDecimal.cpp (1.13 -> 1.14)
test/30-ResultSet/TestDriverResultSet.cpp (1.3 -> 1.4)
test/30-ResultSet/TestExecReadRequest.cpp (1.5 -> 1.6)
test/30-ResultSet/TestSimpleUnicode.cpp (1.9 -> 1.10)
test/35-ResultList/TestExec.cpp (1.3 -> 1.4)
test/40-Parameter-PreparedStatement/TestParameterStatement.cpp
(1.16 -> 1.17)
test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp
(1.6 -> 1.7)
Easy optimization: 'fctName' local variables are now all 'const', so the
compiler can optimize stack allocations (thanks Marc)
----------------------------------------------------------------+
src/Connection.cpp | 42
+++++-----
src/ControllerInfo.cpp | 6 -
src/ControllerPingSender.cpp | 2
src/ControllerPool.cpp | 4
src/ControllerStateChangedCallback.cpp | 2
src/ControllerWatcher.cpp | 6 -
src/DriverResultSet.cpp | 2
src/JavaSocket.cpp | 28 +++---
src/Statement.cpp | 6 -
src/WatchedControllers.cpp | 4
test/10-Connection/TestBeginCommitRollback.cpp | 8 -
test/10-Connection/TestConnect.cpp | 12 +-
test/10-Connection/TestControllerPool.cpp | 8 -
test/10-Connection/TestFailOver.cpp | 2
test/20-Write/TestExecWriteRequest.cpp | 20 ++--
test/30-ResultSet/TestBigDecimal.cpp | 12 +-
test/30-ResultSet/TestDriverResultSet.cpp | 4
test/30-ResultSet/TestExecReadRequest.cpp | 8 -
test/30-ResultSet/TestSimpleUnicode.cpp | 2
test/35-ResultList/TestExec.cpp | 8 -
test/40-Parameter-PreparedStatement/TestParameterStatement.cpp | 20 ++--
test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp | 20 ++--
22 files changed, 113 insertions(+), 113 deletions(-)
Index: carob/src/Connection.cpp
diff -u carob/src/Connection.cpp:1.100 carob/src/Connection.cpp:1.101
--- carob/src/Connection.cpp:1.100 Wed Dec 20 17:32:49 2006
+++ carob/src/Connection.cpp Wed Dec 20 19:38:41 2006
@@ -86,7 +86,7 @@
controller_pool(prms.getControllerPool()),
parameters(prms)
{
- wstring fctName(L"Connection::Connection");
+ const wstring fctName(L"Connection::Connection");
persistent_connection = parameters.getPersistentConnection();
retrieve_sql_warnings = parameters.getRetrieveSQLWarnings();
try
@@ -155,7 +155,7 @@
throw (AuthenticationException, NoMoreControllerException,
VirtualDatabaseUnavailableException, UnexpectedException)
{
- wstring fctName(L"Connection::initConnectionToNextController");
+ const wstring fctName(L"Connection::initConnectionToNextController");
try
{
// This must lock the pool synchro to avoid controller list operations
@@ -212,7 +212,7 @@
void Connection::finalizeConnect() throw (AuthenticationException,
SocketIOException, VirtualDatabaseUnavailableException,
UnexpectedException)
{
- wstring fctName(L"Connection::finalizeConnect");
+ const wstring fctName(L"Connection::finalizeConnect");
bool vdbFound = false,
authenticated = false;
*driverSocketPtr >> vdbFound;
@@ -267,7 +267,7 @@
bool Connection::close()
{
- wstring fctName(L"Connection::close");
+ const wstring fctName(L"Connection::close");
//Wait until other methods/Commands are done
LockScope ls(&connectionCS);
@@ -289,7 +289,7 @@
bool Connection::closeSocket()
{
- wstring fctName(L"Connection::closeSocket");
+ const wstring fctName(L"Connection::closeSocket");
bool closeOK = false;
if (driverSocketPtr == NULL)
@@ -321,7 +321,7 @@
throw (SocketIOException, BackendException, ControllerException,
ProtocolException, ConnectionException, UnexpectedException)
{
- wstring fctName(L"Connection::setAutoCommit");
+ const wstring fctName(L"Connection::setAutoCommit");
LockScope ls(&connectionCS);
@@ -365,7 +365,7 @@
BackendException, ControllerException, DriverException, ProtocolException,
ConnectionException, UnexpectedException)
{
- wstring fctName(L"Connection::beginTransactionIfNeeded");
+ const wstring fctName(L"Connection::beginTransactionIfNeeded");
if (mustBeginTransaction)
{
FO_TRY_NTIMES(RECONNECT_RETRIES)
@@ -393,7 +393,7 @@
void Connection::commit() throw (SocketIOException, DriverException,
ProtocolException, ConnectionException, UnexpectedException)
{
- wstring fctName(L"Connection::commit");
+ const wstring fctName(L"Connection::commit");
LockScope ls(&connectionCS);
checkIfConnected();
@@ -456,7 +456,7 @@
void Connection::rollback() throw (SocketIOException, DriverException,
ProtocolException, ConnectionException, UnexpectedException)
{
- wstring fctName(L"Connection::rollback");
+ const wstring fctName(L"Connection::rollback");
LockScope ls(&connectionCS);
@@ -539,7 +539,7 @@
UnexpectedException)
{
checkIfConnected();
- wstring fctName(L"Connection::PreparedStatementGetMetaData");
+ const wstring fctName(L"Connection::PreparedStatementGetMetaData");
LockScope ls(&connectionCS);
@@ -567,7 +567,7 @@
ConnectionException, UnexpectedException)
{
- wstring fctName(L"Connection::statementExecuteQuery");
+ const wstring fctName(L"Connection::statementExecuteQuery");
LockScope ls(&connectionCS);
@@ -599,7 +599,7 @@
throw (SocketIOException, BackendException, ControllerException,
DriverException, ProtocolException, ConnectionException,
UnexpectedException)
{
- wstring fctName(L"Connection::statementExecuteUpdate");
+ const wstring fctName(L"Connection::statementExecuteUpdate");
LockScope ls(&connectionCS);
@@ -655,7 +655,7 @@
BackendException, ControllerException, DriverException, ProtocolException,
ConnectionException, UnexpectedException)
{
- wstring fctName(L"Connection::statementExecute");
+ const wstring fctName(L"Connection::statementExecute");
LockScope ls(&connectionCS);
checkIfConnected();
@@ -715,7 +715,7 @@
ControllerException, DriverException, ProtocolException,
ConnectionException,
UnexpectedException)
{
- wstring fctName(L"Connection::statementExecuteUpdateWithKeys");
+ const wstring fctName(L"Connection::statementExecuteUpdateWithKeys");
LockScope ls(&connectionCS);
@@ -803,7 +803,7 @@
throw (SocketIOException, ControllerException, ProtocolException,
BackendException, UnexpectedException)
{
- wstring fctName(L"Connection::tryFetchNext");
+ const wstring fctName(L"Connection::tryFetchNext");
LockScope ls(&connectionCS);
@@ -829,7 +829,7 @@
throw (SocketIOException, BackendException, ControllerException,
ProtocolException, UnexpectedException)
{
- wstring fctName(L"Connection::closeRemoteResultSet");
+ const wstring fctName(L"Connection::closeRemoteResultSet");
LockScope ls(&connectionCS);
@@ -942,7 +942,7 @@
SQLWarning* Connection::getWarnings() throw (DriverException,
UnexpectedException)
{
- wstring fctName(L"Connection::getWarnings");
+ const wstring fctName(L"Connection::getWarnings");
throwExceptionIfClosed(L"Cannot getWarnings() on a closed connection");
if (!persistent_connection || !retrieve_sql_warnings)
@@ -961,7 +961,7 @@
void Connection::clearWarnings() throw (DriverException,
UnexpectedException)
{
- wstring fctName(L"Connection::clearWarnings");
+ const wstring fctName(L"Connection::clearWarnings");
if (!persistent_connection || !retrieve_sql_warnings)
return;
@@ -1051,7 +1051,7 @@
throw (SocketIOException, BackendException, ControllerException,
ProtocolException, UnexpectedException)
{
- wstring fctName(L"Connection::retrieveExecuteUpdateResult");
+ const wstring fctName(L"Connection::retrieveExecuteUpdateResult");
if (isDebugEnabled())
logDebug(fctName, L"Retrieving previous result of query "
+ toWString(request.getId()));
@@ -1137,7 +1137,7 @@
void Connection::reconnectOrDie() throw (ConnectionException,
DriverException, UnexpectedException)
{
- wstring fctName(L"Connection::reconnectOrDie");
+ const wstring fctName(L"Connection::reconnectOrDie");
bool reconnected = false;
while (!reconnected)
{
@@ -1164,7 +1164,7 @@
void Connection::tryToReconnect() throw (NoMoreControllerException,
DriverException, UnexpectedException)
{
- wstring fctName(L"Connection::tryToReconnect");
+ const wstring fctName(L"Connection::tryToReconnect");
//Wait until other methods/Commands are done
LockScope ls(&connectionCS);
Index: carob/src/ControllerInfo.cpp
diff -u carob/src/ControllerInfo.cpp:1.8 carob/src/ControllerInfo.cpp:1.9
--- carob/src/ControllerInfo.cpp:1.8 Mon Dec 18 17:14:04 2006
+++ carob/src/ControllerInfo.cpp Wed Dec 20 19:38:41 2006
@@ -136,7 +136,7 @@
struct addrinfo* ControllerInfo::getAddrs(const std::wstring& name, in_port_t
port, int socktype, int family)
throw (ConnectionException, UnexpectedException)
{
- wstring fctName(L"ControllerInfo::getAddrs");
+ const wstring fctName(L"ControllerInfo::getAddrs");
char service[NI_MAXSERV];
struct addrinfo* addressList = NULL;
struct addrinfo hint;
@@ -177,7 +177,7 @@
void ControllerInfo::getHostAddressFromUDPAddr() throw (ConnectionException,
UnexpectedException)
{
- wstring fctName(L"ControllerInfo::gethost_addressFromUDPAddr");
+ const wstring fctName(L"ControllerInfo::gethost_addressFromUDPAddr");
int error = getnameinfo(&UDP_addr, UDP_addr_len, host_address,
sizeof(host_address), NULL, 0, NI_NUMERICHOST);
if (error != 0)
{
@@ -195,7 +195,7 @@
DriverSocket* ControllerInfo::connect(AbstractControllerPool& pool)
throw (ConnectionException, UnexpectedException)
{
- wstring fctName(L"ControllerInfo::connect()");
+ const wstring fctName(L"ControllerInfo::connect()");
struct addrinfo* addr = getAddrs(fromString(host_address), host_port,
SOCK_STREAM, getFamily());
// to iterate on the returned list
Index: carob/src/ControllerPingSender.cpp
diff -u carob/src/ControllerPingSender.cpp:1.3
carob/src/ControllerPingSender.cpp:1.4
--- carob/src/ControllerPingSender.cpp:1.3 Tue Dec 5 12:06:10 2006
+++ carob/src/ControllerPingSender.cpp Wed Dec 20 19:38:41 2006
@@ -53,7 +53,7 @@
void ControllerPingSender::run()
{
- std::wstring fctName(L"ControllerPingSender::run");
+ const wstring fctName(L"ControllerPingSender::run");
if (isDebugEnabled())
logDebug(fctName, L"Pinger started");
java_byte packet[1];
Index: carob/src/ControllerPool.cpp
diff -u carob/src/ControllerPool.cpp:1.16 carob/src/ControllerPool.cpp:1.17
--- carob/src/ControllerPool.cpp:1.16 Wed Dec 20 17:32:49 2006
+++ carob/src/ControllerPool.cpp Wed Dec 20 19:38:41 2006
@@ -158,7 +158,7 @@
ControllerInfo RoundRobinControllerPool::getController()
throw (NoMoreControllerException, UnexpectedException)
{
- wstring fctName(L"RoundRobinControllerPool::getController");
+ const wstring fctName(L"RoundRobinControllerPool::getController");
LockScope ls(&pool_CS);
if (alive_controllers.empty())
throw NoMoreControllerException(L"All controllers down");
@@ -251,7 +251,7 @@
/*static*/
void ControllerPoolManager::freePool(AbstractControllerPool* pool)
{
- wstring fctName(L"ControllerPoolManager::freePool");
+ const wstring fctName(L"ControllerPoolManager::freePool");
if (pool == NULL)
{
if (isErrorEnabled())
Index: carob/src/ControllerStateChangedCallback.cpp
diff -u carob/src/ControllerStateChangedCallback.cpp:1.5
carob/src/ControllerStateChangedCallback.cpp:1.6
--- carob/src/ControllerStateChangedCallback.cpp:1.5 Mon Dec 11 19:14:45 2006
+++ carob/src/ControllerStateChangedCallback.cpp Wed Dec 20 19:38:41 2006
@@ -85,7 +85,7 @@
void SocketKillerCallback::onControllerDown(const ControllerInfo& ctrl)
{
- wstring fctName(L"SocketKillerCallback::OnControllerDown");
+ const wstring fctName(L"SocketKillerCallback::OnControllerDown");
// tell policy asap
policy.controllerDown(ctrl);
LockScope ls(&controllers_and_sockets_CS);
Index: carob/src/ControllerWatcher.cpp
diff -u carob/src/ControllerWatcher.cpp:1.7 carob/src/ControllerWatcher.cpp:1.8
--- carob/src/ControllerWatcher.cpp:1.7 Tue Dec 5 12:06:10 2006
+++ carob/src/ControllerWatcher.cpp Wed Dec 20 19:38:41 2006
@@ -67,7 +67,7 @@
is_stopped(false)
{
- wstring fctName(L"ControllerWatcher::ControllerWatcher");
+ const wstring fctName(L"ControllerWatcher::ControllerWatcher");
controllers_ptr = new WatchedControllers(controllerList,
getCurrentTimeInMs(),
controllerTimeout, callbackPtr);
@@ -113,7 +113,7 @@
void ControllerWatcher::processAnswers()
{
- wstring fctName(L"ControllerWatcher::processAnswers");
+ const wstring fctName(L"ControllerWatcher::processAnswers");
java_byte buf[1];
struct sockaddr respondingCtrlAddr;
socklen_t respondingCtrlAddrLength = sizeof(respondingCtrlAddr);
@@ -148,7 +148,7 @@
void ControllerWatcher::run()
{
- wstring fctName(L"ControllerWatcher::run");
+ const wstring fctName(L"ControllerWatcher::run");
if (isDebugEnabled())
{
logDebug(fctName, L"Watcher started");
Index: carob/src/DriverResultSet.cpp
diff -u carob/src/DriverResultSet.cpp:1.59 carob/src/DriverResultSet.cpp:1.60
--- carob/src/DriverResultSet.cpp:1.59 Thu Jul 27 17:10:42 2006
+++ carob/src/DriverResultSet.cpp Wed Dec 20 19:38:41 2006
@@ -144,7 +144,7 @@
owningStatementPtr(NULL),
isClosed(true)
{
- wstring fctName(L"DriverResultSet::DriverResultSet");
+ const wstring fctName(L"DriverResultSet::DriverResultSet");
connectionPtr = conPtr;
const DriverSocket& socket = conPtr->getDriverSocket();
bool hasWarnings = false;
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.63 carob/src/JavaSocket.cpp:1.64
--- carob/src/JavaSocket.cpp:1.63 Tue Dec 19 12:14:15 2006
+++ carob/src/JavaSocket.cpp Wed Dec 20 19:38:41 2006
@@ -56,7 +56,7 @@
JavaSocket::~JavaSocket()
{
- wstring fctName(L"JavaSocket::~JavaSocket");
+ const wstring fctName(L"JavaSocket::~JavaSocket");
if (isDebugEnabled())
logDebug(fctName, L"About to close socket...");
try
@@ -73,7 +73,7 @@
void JavaSocket::create(int domain)
throw (ConnectionException, UnexpectedException)
{
- wstring fctName(L"JavaSocket::Create");
+ const wstring fctName(L"JavaSocket::Create");
if (isDebugEnabled())
logDebug(fctName, L"Creating socket...");
@@ -114,7 +114,7 @@
bool JavaSocket::connectTo(struct addrinfo* ai, in_port_t port)
throw (ConnectionException, UnexpectedException)
{
- wstring fctName(L"JavaSocket::connectTo");
+ const wstring fctName(L"JavaSocket::connectTo");
connected = false;
if (!isValid())
{
@@ -189,7 +189,7 @@
bool JavaSocket::closeSocket() throw (SocketIOException, UnexpectedException)
{
- wstring fctName(L"closeSocket");
+ const wstring fctName(L"closeSocket");
if (isValid())
{
#ifdef __MINGW32__
@@ -221,7 +221,7 @@
size_t JavaSocket::writeJavaUTF(const wstring& str) const
throw (SocketIOException, CodecException, UnexpectedException)
{
- wstring fctName(L"JavaSocket::writeJavaUTF");
+ const wstring fctName(L"JavaSocket::writeJavaUTF");
std::string utf8str(toUTF8(str));
@@ -237,7 +237,7 @@
size_t JavaSocket::readJavaUTF(wstring& s) const
throw (SocketIOException, CodecException, UnexpectedException)
{
- wstring fctName(L"JavaSocket::readJavaUTF");
+ const wstring fctName(L"JavaSocket::readJavaUTF");
int32_t lenRecNet;
//the converted size
@@ -265,7 +265,7 @@
void JavaSocket::writeJavaInt(int32_t i) const throw (SocketIOException,
UnexpectedException)
{
- wstring fctName(L"JavaSocket::WriteInt32");
+ const wstring fctName(L"JavaSocket::WriteInt32");
// we have to convert the byte order
int32_t conv = htonl(i);
sendToSocket(fctName, L"Int32", &conv, sizeof(conv), SOCKET_SEND_FLAGS);
@@ -274,7 +274,7 @@
void JavaSocket::readJavaInt(int32_t& i) const throw (SocketIOException,
UnexpectedException)
{
- wstring fctName(L"Socket::ReadInt32");
+ const wstring fctName(L"Socket::ReadInt32");
// the data will be received with network byte order.
// so we must convert it after reception
int32_t rec = 0;
@@ -286,7 +286,7 @@
void JavaSocket::writeJavaLong(int64_t i) const throw (SocketIOException,
UnexpectedException)
{
- wstring fctName(L"JavaSocket::writeJavaLong");
+ const wstring fctName(L"JavaSocket::writeJavaLong");
// we have to convert the byte order
int64_t conv = htonll(i);
sendToSocket(fctName, L"Int64", &conv, sizeof(conv), SOCKET_SEND_FLAGS);
@@ -295,7 +295,7 @@
void JavaSocket::readJavaLong(int64_t& i) const throw (SocketIOException,
UnexpectedException)
{
- wstring fctName(L"Socket::readJavaLong");
+ const wstring fctName(L"Socket::readJavaLong");
// the data will be received with network byte order.
// so we must convert it after reception
int64_t rec = 0;
@@ -307,7 +307,7 @@
void JavaSocket::writeJavaBool(bool b) const throw (SocketIOException,
UnexpectedException)
{
- wstring fctName(L"JavaSocket::writeJavaBool");
+ const wstring fctName(L"JavaSocket::writeJavaBool");
uint8_t byteToSend = b; // the implicit casts do it right
//No byte order problem here: the only value read is '0' for false
//all other values are true
@@ -317,7 +317,7 @@
void JavaSocket::readJavaBool(bool& b) const throw (SocketIOException,
UnexpectedException)
{
- wstring fctName(L"JavaSocket::readJavaBool");
+ const wstring fctName(L"JavaSocket::readJavaBool");
uint8_t rec;
receiveFromSocket(fctName, L"Boolean", &rec, sizeof(rec), 0);
@@ -327,14 +327,14 @@
void JavaSocket::readJavaBytes(int32_t length, java_byte* data) const
throw (SocketIOException, UnexpectedException)
{
- wstring fctName(L"JavaSocket::readJavaBytes");
+ const wstring fctName(L"JavaSocket::readJavaBytes");
receiveFromSocket(fctName, L"JavaBytes", data, length, 0);
}
void JavaSocket::writeJavaBytes(int32_t length, java_byte* data) const
throw (SocketIOException, UnexpectedException)
{
- wstring fctName(L"JavaSocket::writeJavaBytes");
+ const wstring fctName(L"JavaSocket::writeJavaBytes");
sendToSocket(fctName, L"JavaBytes", data, length, SOCKET_SEND_FLAGS);
}
Index: carob/src/Statement.cpp
diff -u carob/src/Statement.cpp:1.31 carob/src/Statement.cpp:1.32
--- carob/src/Statement.cpp:1.31 Thu Jul 27 17:10:42 2006
+++ carob/src/Statement.cpp Wed Dec 20 19:38:41 2006
@@ -101,7 +101,7 @@
throw (DriverException, SocketIOException, BackendException,
ControllerException, ProtocolException,
NotImplementedException, UnexpectedException)
{
- wstring fctName(L"Statement::execute");
+ const wstring fctName(L"Statement::execute");
if (isClosed())
{
throw DriverException(L"Unable to execute query on a closed statement");
@@ -126,7 +126,7 @@
ControllerException, ProtocolException, NotImplementedException,
UnexpectedException)
{
- wstring fctName(L"Statement::executeQuery");
+ const wstring fctName(L"Statement::executeQuery");
if (isClosed())
{
throw DriverException(L"Unable to execute query on a closed statement");
@@ -156,7 +156,7 @@
throw (DriverException, SocketIOException, BackendException,
ControllerException, ProtocolException, UnexpectedException)
{
- wstring fctName(L"Statement::executeUpdate");
+ const wstring fctName(L"Statement::executeUpdate");
if (isClosed())
{
throw DriverException(L"Unable to execute query on a closed statement");
Index: carob/src/WatchedControllers.cpp
diff -u carob/src/WatchedControllers.cpp:1.3
carob/src/WatchedControllers.cpp:1.4
--- carob/src/WatchedControllers.cpp:1.3 Tue Dec 5 16:18:40 2006
+++ carob/src/WatchedControllers.cpp Wed Dec 20 19:38:41 2006
@@ -88,7 +88,7 @@
void WatchedControllers::setControllerResponsed(const ControllerInfo& ctrl,
long newTime)
{
- wstring fctName(L"WatchedControllers::setControllerResponsed");
+ const wstring fctName(L"WatchedControllers::setControllerResponsed");
LockScope ls(&controllers_CS);
ControllerState& state = controllers[ctrl];
// Set the new time
@@ -106,7 +106,7 @@
void WatchedControllers::lookForDeadControllers(long currentTime)
{
- wstring fctName(L"WatchedControllers::lookForDeadControllers");
+ const wstring fctName(L"WatchedControllers::lookForDeadControllers");
LockScope ls(&controllers_CS);
for (map<ControllerInfo, ControllerState>::iterator iter =
controllers.begin();
iter != controllers.end(); iter++)
Index: carob/test/10-Connection/TestBeginCommitRollback.cpp
diff -u carob/test/10-Connection/TestBeginCommitRollback.cpp:1.3
carob/test/10-Connection/TestBeginCommitRollback.cpp:1.4
--- carob/test/10-Connection/TestBeginCommitRollback.cpp:1.3 Wed Dec 20
17:42:11 2006
+++ carob/test/10-Connection/TestBeginCommitRollback.cpp Wed Dec 20
19:38:41 2006
@@ -40,7 +40,7 @@
void TestBeginCommitRollback::testReadRequestAndCommit()
{
- wstring fctName(L"TestBeginCommitRollback::testReadRequestAndCommit");
+ const wstring fctName(L"TestBeginCommitRollback::testReadRequestAndCommit");
Statement* stPtr = connectionPtr->createStatement();
stPtr->executeQuery(L"SELECT * FROM address");
connectionPtr->commit();
@@ -52,7 +52,7 @@
void TestBeginCommitRollback::testReadRequestAndRollback()
{
- wstring fctName(L"TestBeginCommitRollback::testReadRequestAndRollback");
+ const wstring
fctName(L"TestBeginCommitRollback::testReadRequestAndRollback");
Statement* stPtr = connectionPtr->createStatement();
stPtr->executeQuery(L"SELECT * FROM address");
connectionPtr->rollback();
@@ -64,7 +64,7 @@
void TestBeginCommitRollback::testWriteRequestAndCommit()
{
- wstring fctName(L"TestBeginCommitRollback::testWriteRequestAndCommit");
+ const wstring fctName(L"TestBeginCommitRollback::testWriteRequestAndCommit");
Statement* stPtr = connectionPtr->createStatement();
stPtr->executeUpdate(L"UPDATE product SET name='commited' WHERE id=0");
connectionPtr->commit();
@@ -81,7 +81,7 @@
void TestBeginCommitRollback::testWriteRequestAndRollback()
{
- wstring fctName(L"TestBeginCommitRollback::testWriteRequestAndRollback");
+ const wstring
fctName(L"TestBeginCommitRollback::testWriteRequestAndRollback");
Statement* stPtr = connectionPtr->createStatement();
stPtr->executeUpdate(L"UPDATE product SET name='rollbacked' WHERE id=0");
connectionPtr->rollback();
Index: carob/test/10-Connection/TestConnect.cpp
diff -u carob/test/10-Connection/TestConnect.cpp:1.13
carob/test/10-Connection/TestConnect.cpp:1.14
--- carob/test/10-Connection/TestConnect.cpp:1.13 Wed Dec 20 17:42:11 2006
+++ carob/test/10-Connection/TestConnect.cpp Wed Dec 20 19:38:41 2006
@@ -43,7 +43,7 @@
void TestConnect::testConnectBadAddress()
{
- wstring fctName(L"TestConnect::testConnectBadAddress");
+ const wstring fctName(L"TestConnect::testConnectBadAddress");
std::vector<ControllerInfo> ctrls;
try
{
@@ -66,7 +66,7 @@
void TestConnect::testConnectBadPort()
{
- wstring fctName(L"TestConnect::testConnectBadPort");
+ const wstring fctName(L"TestConnect::testConnectBadPort");
std::vector<ControllerInfo> ctrls;
ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST1, 12345));
ConnectionParameters connectionPrms(ctrls,
@@ -94,7 +94,7 @@
}
void TestConnect::testConnectBadDB()
{
- wstring fctName(L"TestConnect::testConnectBadDB");
+ const wstring fctName(L"TestConnect::testConnectBadDB");
std::vector<ControllerInfo> ctrls;
ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST1,
ConnectionSetup::DEFAULT_PORT1));
ConnectionParameters connectionPrms(ctrls,
@@ -124,7 +124,7 @@
void TestConnect::testConnectBadUser()
{
- wstring fctName(L"TestConnect::testConnectBadUser");
+ const wstring fctName(L"TestConnect::testConnectBadUser");
std::vector<ControllerInfo> ctrls;
ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST1,
ConnectionSetup::DEFAULT_PORT1));
ConnectionParameters connectionPrms(ctrls,
@@ -154,7 +154,7 @@
void TestConnect::testConnectBadPass()
{
- wstring fctName(L"TestConnect::testConnectBadPass");
+ const wstring fctName(L"TestConnect::testConnectBadPass");
std::vector<ControllerInfo> ctrls;
ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST1,
ConnectionSetup::DEFAULT_PORT1));
ConnectionParameters connectionPrms(ctrls,
@@ -184,7 +184,7 @@
void TestConnect::testConnectGood()
{
- wstring fctName(L"TestConnect::testConnectGood");
+ const wstring fctName(L"TestConnect::testConnectGood");
std::vector<ControllerInfo> ctrls;
ctrls.push_back(ControllerInfo(ConnectionSetup::DEFAULT_HOST1,
ConnectionSetup::DEFAULT_PORT1));
ConnectionParameters connectionPrms(ctrls,
Index: carob/test/10-Connection/TestControllerPool.cpp
diff -u carob/test/10-Connection/TestControllerPool.cpp:1.7
carob/test/10-Connection/TestControllerPool.cpp:1.8
--- carob/test/10-Connection/TestControllerPool.cpp:1.7 Wed Dec 20 17:42:11 2006
+++ carob/test/10-Connection/TestControllerPool.cpp Wed Dec 20 19:38:41 2006
@@ -47,7 +47,7 @@
void TestControllerPool::testRoundRobinSequence()
{
- wstring fctName(L"TestControllerPool::testRoundRobinSequence");
+ const wstring fctName(L"TestControllerPool::testRoundRobinSequence");
ControllerInfo c1(ConnectionSetup::DEFAULT_HOST1, 4000);
ControllerInfo c2(ConnectionSetup::DEFAULT_HOST1, 4001);
@@ -72,7 +72,7 @@
void TestControllerPool::testNoMoreController()
{
- wstring fctName(L"TestControllerPool::testNoMoreController");
+ const wstring fctName(L"TestControllerPool::testNoMoreController");
ControllerInfo c1(ConnectionSetup::DEFAULT_HOST1, 4000);
ControllerInfo c2(ConnectionSetup::DEFAULT_HOST1, 4001);
@@ -110,7 +110,7 @@
void TestControllerPool::testPoolManager()
{
- wstring fctName(L"TestControllerPool::testPoolManager");
+ const wstring fctName(L"TestControllerPool::testPoolManager");
ControllerInfo c1(ConnectionSetup::DEFAULT_HOST1, 4000);
ControllerInfo c2(ConnectionSetup::DEFAULT_HOST1, 4001);
@@ -153,7 +153,7 @@
void TestControllerPool::testSuspectListUpdate()
{
- wstring fctName(L"TestControllerPool::testSuspectListUpdate");
+ const wstring fctName(L"TestControllerPool::testSuspectListUpdate");
std::wcerr<<L"Launch 4 servers on localhost:4000-4003 and press
<return>"<<std::endl;
std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
Index: carob/test/10-Connection/TestFailOver.cpp
diff -u carob/test/10-Connection/TestFailOver.cpp:1.8
carob/test/10-Connection/TestFailOver.cpp:1.9
--- carob/test/10-Connection/TestFailOver.cpp:1.8 Wed Dec 20 17:42:11 2006
+++ carob/test/10-Connection/TestFailOver.cpp Wed Dec 20 19:38:41 2006
@@ -126,7 +126,7 @@
Connection* connectionPtr = new Connection(connectionPrms);
Statement* statementPtr = connectionPtr->createStatement();
- wstring fctName(L"TestExecWriteRequest::testReconnect");
+ const wstring fctName(L"TestExecWriteRequest::testReconnect");
wstring requestBegin = L"UPDATE product SET cost=";
wstring requestEnd = L" where id=";
Index: carob/test/20-Write/TestExecWriteRequest.cpp
diff -u carob/test/20-Write/TestExecWriteRequest.cpp:1.5
carob/test/20-Write/TestExecWriteRequest.cpp:1.6
--- carob/test/20-Write/TestExecWriteRequest.cpp:1.5 Wed Dec 20 17:42:11 2006
+++ carob/test/20-Write/TestExecWriteRequest.cpp Wed Dec 20 19:38:41 2006
@@ -35,7 +35,7 @@
void TestExecWriteRequest::testWriteBadRequest()
{
- wstring fctName(L"TestExecWriteRequest::testWriteBadRequest");
+ const wstring fctName(L"TestExecWriteRequest::testWriteBadRequest");
try
{
Statement* statementPtr = connectionPtr->createStatement();
@@ -59,7 +59,7 @@
void TestExecWriteRequest::testWriteBadTable()
{
- wstring fctName(L"TestExecWriteRequest::testWriteBadTable");
+ const wstring fctName(L"TestExecWriteRequest::testWriteBadTable");
try
{
Statement* statementPtr = connectionPtr->createStatement();
@@ -83,7 +83,7 @@
void TestExecWriteRequest::testWriteGood()
{
- wstring fctName(L"TestExecWriteRequest::testWriteGood");
+ const wstring fctName(L"TestExecWriteRequest::testWriteGood");
Statement* statementPtr = connectionPtr->createStatement();
if (isInfoEnabled())
{
@@ -101,8 +101,8 @@
void *doThreadedWrites(void *arg)
{
- wstring fctName(L"TestExecWriteRequest::testThreadedWrite thread#");
- fctName += toWString((uint64_t)pthread_self());
+ const wstring fctName(L"TestExecWriteRequest::testThreadedWrite thread#"
+ + toWString((uint64_t)pthread_self()));
TestExecWriteRequest* instance = (TestExecWriteRequest*) arg;
instance->doNWrites(fctName, 10);
pthread_exit(0);
@@ -113,7 +113,7 @@
void TestExecWriteRequest::testThreadedWrite()
{
- wstring fctName(L"TestExecWriteRequest::testThreadedWrite");
+ const wstring fctName(L"TestExecWriteRequest::testThreadedWrite");
pthread_t threads[NB_THREADS];
int retCode[NB_THREADS];
@@ -131,13 +131,13 @@
#ifndef CAROB_TEST_USE_MYSQL
void TestExecWriteRequest::testWriteThousandGood()
{
- wstring fctName(L"TestExecWriteRequest::testWriteThousandGood");
+ const wstring fctName(L"TestExecWriteRequest::testWriteThousandGood");
doNWrites(fctName, 1000);
}
#else
void TestExecWriteRequest::testWriteThousandGood()
{
- wstring fctName(L"TestExecWriteRequest::testWriteThousandGoodMySQL");
+ const wstring fctName(L"TestExecWriteRequest::testWriteThousandGoodMySQL");
if (isInfoEnabled())
{
@@ -151,7 +151,7 @@
doNWrites(fctName, 1000);
}
#endif
-void TestExecWriteRequest::doNWrites(wstring fctName, int nbWrites)
+void TestExecWriteRequest::doNWrites(const wstring fctName, int nbWrites)
{
wstring requestBegin = L"UPDATE product SET cost=";
wstring requestEnd = L" WHERE id=";
@@ -172,7 +172,7 @@
void TestExecWriteRequest::testLongWriteMySQL()
{
- wstring fctName(L"TestExecWriteRequest::testLongWriteMySQL");
+ const wstring fctName(L"TestExecWriteRequest::testLongWriteMySQL");
Statement* statementPtr = connectionPtr->createStatement();
statementPtr->executeUpdate(L"DROP TABLE IF EXISTS A");
Index: carob/test/30-ResultSet/TestBigDecimal.cpp
diff -u carob/test/30-ResultSet/TestBigDecimal.cpp:1.13
carob/test/30-ResultSet/TestBigDecimal.cpp:1.14
--- carob/test/30-ResultSet/TestBigDecimal.cpp:1.13 Wed Dec 20 17:42:11 2006
+++ carob/test/30-ResultSet/TestBigDecimal.cpp Wed Dec 20 19:38:41 2006
@@ -132,7 +132,7 @@
if (groupIt)
thousandsSep += std::use_facet< std::numpunct<wchar_t>
>(loc).thousands_sep();
wchar_t decimalSep = std::use_facet<std::numpunct<wchar_t>
>(loc).decimal_point();
- wstring fctName(L"TestBigDecimal::testGetAsString");
+ const wstring fctName(L"TestBigDecimal::testGetAsString");
Statement* statementPtr = NULL;
statementPtr = connectionPtr->createStatement();
DriverResultSet* drsPtr = statementPtr->executeQuery(L"SELECT * FROM
product");
@@ -194,7 +194,7 @@
void TestBigDecimal::testGetAsInt()
{
- wstring fctName(L"TestBigDecimal::testGetAsInt");
+ const wstring fctName(L"TestBigDecimal::testGetAsInt");
Statement* statementPtr = NULL;
statementPtr = connectionPtr->createStatement();
DriverResultSet* drsPtr = statementPtr->executeQuery(L"SELECT * FROM
product");
@@ -243,7 +243,7 @@
void TestBigDecimal::testGetAsInt64()
{
- wstring fctName(L"TestBigDecimal::testGetAsInt64");
+ const wstring fctName(L"TestBigDecimal::testGetAsInt64");
Statement* statementPtr = NULL;
statementPtr = connectionPtr->createStatement();
DriverResultSet* drsPtr = statementPtr->executeQuery(L"SELECT * FROM
product");
@@ -337,7 +337,7 @@
void TestBigDecimal::testGetAsUInt64()
{
- wstring fctName(L"TestBigDecimal::testGetAsUInt64");
+ const wstring fctName(L"TestBigDecimal::testGetAsUInt64");
Statement* statementPtr = NULL;
statementPtr = connectionPtr->createStatement();
DriverResultSet* drsPtr = statementPtr->executeQuery(L"SELECT * FROM
product");
@@ -418,7 +418,7 @@
//TODO test this deeper
void TestBigDecimal::testGetAsFloat()
{
- wstring fctName(L"TestBigDecimal::testGetAsFloat");
+ const wstring fctName(L"TestBigDecimal::testGetAsFloat");
Statement* statementPtr = NULL;
statementPtr = connectionPtr->createStatement();
DriverResultSet* drsPtr = statementPtr->executeQuery(L"SELECT * FROM
product");
@@ -457,7 +457,7 @@
//TODO test this deeper
void TestBigDecimal::testGetAsDouble()
{
- wstring fctName(L"TestBigDecimal::testGetAsDouble");
+ const wstring fctName(L"TestBigDecimal::testGetAsDouble");
Statement* statementPtr = NULL;
statementPtr = connectionPtr->createStatement();
DriverResultSet* drsPtr = statementPtr->executeQuery(L"SELECT * FROM
product");
Index: carob/test/30-ResultSet/TestDriverResultSet.cpp
diff -u carob/test/30-ResultSet/TestDriverResultSet.cpp:1.3
carob/test/30-ResultSet/TestDriverResultSet.cpp:1.4
--- carob/test/30-ResultSet/TestDriverResultSet.cpp:1.3 Fri Mar 3 18:21:58 2006
+++ carob/test/30-ResultSet/TestDriverResultSet.cpp Wed Dec 20 19:38:41 2006
@@ -37,7 +37,7 @@
void TestDriverResultSet::testNullValueRetrieval()
{
- wstring fctName(L"TestDriverResultSet::testNullValueRetrieval");
+ const wstring fctName(L"TestDriverResultSet::testNullValueRetrieval");
Statement* statementPtr = NULL;
//1. Update table: set a value to null
statementPtr = connectionPtr->createStatement();
@@ -83,7 +83,7 @@
void TestDriverResultSet::testGetAsIntOnString()
{
- wstring fctName(L"TestDriverResultSet::testGetAsIntOnString");
+ const wstring fctName(L"TestDriverResultSet::testGetAsIntOnString");
Statement* statementPtr = NULL;
//1. Set a string to an int an read it
statementPtr = connectionPtr->createStatement();
Index: carob/test/30-ResultSet/TestExecReadRequest.cpp
diff -u carob/test/30-ResultSet/TestExecReadRequest.cpp:1.5
carob/test/30-ResultSet/TestExecReadRequest.cpp:1.6
--- carob/test/30-ResultSet/TestExecReadRequest.cpp:1.5 Wed Dec 20 17:42:11 2006
+++ carob/test/30-ResultSet/TestExecReadRequest.cpp Wed Dec 20 19:38:41 2006
@@ -37,7 +37,7 @@
void TestExecReadRequest::testReadBadRequest()
{
- wstring fctName(L"TestExecReadRequest::testReadBadRequest");
+ const wstring fctName(L"TestExecReadRequest::testReadBadRequest");
try
{
Statement* statementPtr = connectionPtr->createStatement();
@@ -61,7 +61,7 @@
void TestExecReadRequest::testReadBadTable()
{
- wstring fctName(L"TestExecReadRequest::testReadBadTable");
+ const wstring fctName(L"TestExecReadRequest::testReadBadTable");
try
{
Statement* statementPtr = connectionPtr->createStatement();
@@ -85,7 +85,7 @@
void TestExecReadRequest::testReadGood()
{
- wstring fctName(L"TestExecReadRequest::testReadGood");
+ const wstring fctName(L"TestExecReadRequest::testReadGood");
Statement* statementPtr = connectionPtr->createStatement();
@@ -126,7 +126,7 @@
void TestExecReadRequest::testReadWithMaxRows()
{
- wstring fctName(L"TestStatement::testReadWithMaxRows");
+ const wstring fctName(L"TestStatement::testReadWithMaxRows");
Statement* statementPtr = NULL;
statementPtr = connectionPtr->createStatement();
if (isInfoEnabled())
Index: carob/test/30-ResultSet/TestSimpleUnicode.cpp
diff -u carob/test/30-ResultSet/TestSimpleUnicode.cpp:1.9
carob/test/30-ResultSet/TestSimpleUnicode.cpp:1.10
--- carob/test/30-ResultSet/TestSimpleUnicode.cpp:1.9 Wed Dec 20 17:42:11 2006
+++ carob/test/30-ResultSet/TestSimpleUnicode.cpp Wed Dec 20 19:38:41 2006
@@ -55,7 +55,7 @@
void TestSimpleUnicode::testBasic()
{
- std::wstring fctName(L"TestSimpleUnicode::testBasic");
+ const wstring fctName(L"TestSimpleUnicode::testBasic");
if (isInfoEnabled())
{
Index: carob/test/35-ResultList/TestExec.cpp
diff -u carob/test/35-ResultList/TestExec.cpp:1.3
carob/test/35-ResultList/TestExec.cpp:1.4
--- carob/test/35-ResultList/TestExec.cpp:1.3 Thu Jul 27 17:10:42 2006
+++ carob/test/35-ResultList/TestExec.cpp Wed Dec 20 19:38:41 2006
@@ -37,7 +37,7 @@
void TestExec::testExecuteBadRequests()
{
- wstring fctName(L"TestStatement::testExecuteBadRequests");
+ const wstring fctName(L"TestStatement::testExecuteBadRequests");
Statement* statementPtr = NULL;
if (isInfoEnabled())
{
@@ -80,7 +80,7 @@
void TestExec::testExecuteWithSelect()
{
- wstring fctName(L"TestExec::testExecuteWithSelect");
+ const wstring fctName(L"TestExec::testExecuteWithSelect");
Statement* statementPtr = NULL;
statementPtr = connectionPtr->createStatement();
if (isInfoEnabled())
@@ -113,7 +113,7 @@
}
void TestExec::testExecuteWithUpdate()
{
- wstring fctName(L"TestExec::testExecuteWithUpdate");
+ const wstring fctName(L"TestExec::testExecuteWithUpdate");
Statement* statementPtr = NULL;
statementPtr = connectionPtr->createStatement();
if (isInfoEnabled())
@@ -132,7 +132,7 @@
void TestExec::testExecuteWithSelectStreamed()
{
- wstring fctName(L"TestExec::testExecuteWithSelectStreamed");
+ const wstring fctName(L"TestExec::testExecuteWithSelectStreamed");
Statement* statementPtr = NULL;
statementPtr = connectionPtr->createStatement();
if (isInfoEnabled())
Index: carob/test/40-Parameter-PreparedStatement/TestParameterStatement.cpp
diff -u
carob/test/40-Parameter-PreparedStatement/TestParameterStatement.cpp:1.16
carob/test/40-Parameter-PreparedStatement/TestParameterStatement.cpp:1.17
--- carob/test/40-Parameter-PreparedStatement/TestParameterStatement.cpp:1.16
Wed Dec 20 17:42:11 2006
+++ carob/test/40-Parameter-PreparedStatement/TestParameterStatement.cpp
Wed Dec 20 19:38:41 2006
@@ -43,7 +43,7 @@
void TestParameterStatement::testExecuteQueryLessParams()
{
- wstring fctName(L"testExecuteQueryLessParams");
+ const wstring fctName(L"testExecuteQueryLessParams");
ParameterStatement* statementPtr = NULL;
try
{
@@ -68,7 +68,7 @@
void TestParameterStatement::testExecuteQueryGood()
{
- wstring fctName(L"TestParameterStatement::testExecuteQueryGood");
+ const wstring fctName(L"TestParameterStatement::testExecuteQueryGood");
ParameterStatement* statementPtr = NULL;
statementPtr = connectionPtr->createParameterStatement(L"select * from
address where id < ?");
if (isInfoEnabled())
@@ -101,7 +101,7 @@
void TestParameterStatement::testExecuteUpdateBadParams()
{
- wstring fctName(L"testExecuteUpdateBadTable");
+ const wstring fctName(L"testExecuteUpdateBadTable");
ParameterStatement* statementPtr = NULL;
try
{
@@ -127,7 +127,7 @@
void TestParameterStatement::testExecuteUpdateGood()
{
- wstring fctName(L"TestParameterStatement::testExecuteUpdateGood");
+ const wstring fctName(L"TestParameterStatement::testExecuteUpdateGood");
ParameterStatement* statementPtr = NULL;
statementPtr = connectionPtr->createParameterStatement(L"update product set
name=? where id=?");
if (isInfoEnabled())
@@ -147,7 +147,7 @@
void TestParameterStatement::testExecuteWithSelect()
{
- wstring fctName(L"TestParameterStatement::testExecuteWithSelect");
+ const wstring fctName(L"TestParameterStatement::testExecuteWithSelect");
ParameterStatement* statementPtr = NULL;
statementPtr = connectionPtr->createParameterStatement(L"select * from
address where id < ?");
if (isInfoEnabled())
@@ -181,7 +181,7 @@
void TestParameterStatement::testExecuteWithUpdate()
{
- wstring fctName(L"TestParameterStatement::testExecuteWithUpdate");
+ const wstring fctName(L"TestParameterStatement::testExecuteWithUpdate");
ParameterStatement* statementPtr = NULL;
statementPtr = connectionPtr->createParameterStatement(L"UPDATE product SET
name=? WHERE id=?");
if (isInfoEnabled())
@@ -216,7 +216,7 @@
const std::wstring TABLE_TYPE(L"(b1 boolean, b2 boolean)");
const std::wstring TABLE_NAME(L"booltable");
- wstring fctName(L"TestParameterStatement::testBoolean");
+ const wstring fctName(L"TestParameterStatement::testBoolean");
createOrReplaceTable(connectionPtr, TABLE_NAME, TABLE_TYPE);
@@ -251,7 +251,7 @@
const std::wstring TABLE_TYPE(L"(str varchar(100))");
const std::wstring TABLE_NAME(L"stringtable");
- wstring fctName(L"TestParameterStatement::testStrings");
+ const wstring fctName(L"TestParameterStatement::testStrings");
createOrReplaceTable(connectionPtr, TABLE_NAME, TABLE_TYPE);
@@ -276,7 +276,7 @@
const std::wstring TABLE_TYPE(L"(bd DECIMAL(128))");
const std::wstring TABLE_NAME(L"bigdecimaltest");
- wstring fctName(L"TestParameterStatement::testBigDecimal");
+ const wstring fctName(L"TestParameterStatement::testBigDecimal");
createOrReplaceTable(connectionPtr, TABLE_NAME, TABLE_TYPE);
@@ -324,7 +324,7 @@
const std::wstring TABLE_TYPE(L"(c1 smallint, c2 smallint)");
const std::wstring TABLE_NAME(L"testSetNull");
- wstring fctName(L"TestParameterStatement::testSetNull");
+ const wstring fctName(L"TestParameterStatement::testSetNull");
createOrReplaceTable(connectionPtr, TABLE_NAME, TABLE_TYPE);
Index: carob/test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp
diff -u carob/test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp:1.6
carob/test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp:1.7
--- carob/test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp:1.6
Fri Mar 3 16:54:13 2006
+++ carob/test/40-Parameter-PreparedStatement/TestPreparedStatement.cpp Wed Dec
20 19:38:41 2006
@@ -33,7 +33,7 @@
void TestPreparedStatement::testPrepareEmptyStatement()
{
- wstring fctName(L"testPrepareEmptyStatement");
+ const wstring fctName(L"testPrepareEmptyStatement");
Statement* statementPtr = NULL;
try
{
@@ -56,7 +56,7 @@
}
void TestPreparedStatement::testPrepareEmptyParameterStatement()
{
- wstring fctName(L"testPrepareEmptyParameterStatement");
+ const wstring fctName(L"testPrepareEmptyParameterStatement");
ParameterStatement* psPtr = NULL;
try
{
@@ -80,7 +80,7 @@
void TestPreparedStatement::testPrepareUpdateStatement()
{
- wstring fctName(L"testPrepareUpdateStatement");
+ const wstring fctName(L"testPrepareUpdateStatement");
Statement* statementPtr = NULL;
try
{
@@ -106,7 +106,7 @@
void TestPreparedStatement::testPrepareUpdateParameterStatement()
{
- wstring fctName(L"testPrepareUpdateParameterStatement");
+ const wstring fctName(L"testPrepareUpdateParameterStatement");
ParameterStatement* psPtr = connectionPtr->createParameterStatement(L"update
address set name='changed by testPrepareUpdateParameterStatement' where id=?");
psPtr->setInt(1,0);
psPtr->executeUpdate();
@@ -120,7 +120,7 @@
void TestPreparedStatement::testPrepareExecuteQueryStatement()
{
- wstring fctName(L"testPrepareExecuteQueryStatement");
+ const wstring fctName(L"testPrepareExecuteQueryStatement");
Statement* statementPtr = connectionPtr->createStatement();
statementPtr->executeQuery(L"SELECT * FROM address");
if (isInfoEnabled())
@@ -134,7 +134,7 @@
void TestPreparedStatement::testPrepareExecuteQueryParameterStatement()
{
- wstring fctName(L"testPrepareExecuteQueryParameterStatement");
+ const wstring fctName(L"testPrepareExecuteQueryParameterStatement");
ParameterStatement* psPtr = connectionPtr->createParameterStatement(L"SELECT
* FROM address where id=?");
psPtr->setInt(1,0);
psPtr->executeQuery();
@@ -149,7 +149,7 @@
void TestPreparedStatement::testPrepareExecuteStatement()
{
- wstring fctName(L"testPrepareExecuteStatement");
+ const wstring fctName(L"testPrepareExecuteStatement");
Statement* statementPtr = connectionPtr->createStatement();
statementPtr->execute(L"SELECT * FROM address");
if (isInfoEnabled())
@@ -163,7 +163,7 @@
void TestPreparedStatement::testPrepareExecuteParameterStatement()
{
- wstring fctName(L"testPrepareExecuteParameterStatement");
+ const wstring fctName(L"testPrepareExecuteParameterStatement");
ParameterStatement* psPtr = connectionPtr->createParameterStatement(L"SELECT
* FROM address where id=?");
psPtr->setInt(1,0);
psPtr->execute();
@@ -178,7 +178,7 @@
void TestPreparedStatement::testPrepareStatement()
{
- wstring fctName(L"testPrepareStatement");
+ const wstring fctName(L"testPrepareStatement");
Statement* statementPtr = connectionPtr->createStatement();
statementPtr->setRequest(L"SELECT * FROM address");
if (isInfoEnabled())
@@ -192,7 +192,7 @@
void TestPreparedStatement::testPrepareParameterStatement()
{
- wstring fctName(L"testPrepareParameterStatement");
+ const wstring fctName(L"testPrepareParameterStatement");
ParameterStatement* psPtr = connectionPtr->createParameterStatement(L"SELECT
* FROM address where id=?");
psPtr->setInt(1,0);
if (isInfoEnabled())
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
