Date: Thursday, November 24, 2005 @ 15:54:47
Author: marc
Path: /cvsroot/carob/carob
Modified: src/RequestWithResultSetParameters.cpp (1.2 -> 1.3)
src/Statement.cpp (1.7 -> 1.8) test/TestBeginCommitRollback.cpp
(1.4 -> 1.5) test/TestExecReadRequest.cpp (1.7 -> 1.8)
test/TestExecWriteRequest.cpp (1.8 -> 1.9)
Simplified constructor just like for super class Request.
----------------------------------------+
src/RequestWithResultSetParameters.cpp | 13 ++-----------
src/Statement.cpp | 11 ++++++-----
test/TestBeginCommitRollback.cpp | 16 ++++++++--------
test/TestExecReadRequest.cpp | 13 +++++++------
test/TestExecWriteRequest.cpp | 16 ++++++++--------
5 files changed, 31 insertions(+), 38 deletions(-)
Index: carob/src/RequestWithResultSetParameters.cpp
diff -u carob/src/RequestWithResultSetParameters.cpp:1.2
carob/src/RequestWithResultSetParameters.cpp:1.3
--- carob/src/RequestWithResultSetParameters.cpp:1.2 Wed Nov 23 18:51:45 2005
+++ carob/src/RequestWithResultSetParameters.cpp Thu Nov 24 15:54:46 2005
@@ -1,20 +1,11 @@
#include "RequestWithResultSetParameters.hpp"
-// TODO: use the Named Parameters Idiom just like in superclass Request
-RequestWithResultSetParameters::RequestWithResultSetParameters(wstring sql,
- bool nullSqlTemplate, wstring sqlTemplatePrm, bool escapeProcessingPrm,
- int timeoutInSecondsPrm) :
+RequestWithResultSetParameters::RequestWithResultSetParameters(wstring sql) :
Request(sql),
maxRows(0),
fetchSize(0),
cursorNameIsNull(true)
-{
- if (!nullSqlTemplate)
- setSqlTemplate(sqlTemplatePrm);
-
- setEscapeProcessing(escapeProcessingPrm)
- .setTimeoutInSeconds(timeoutInSecondsPrm);
-}
+{ }
RequestWithResultSetParameters::~RequestWithResultSetParameters()
{
Index: carob/src/Statement.cpp
diff -u carob/src/Statement.cpp:1.7 carob/src/Statement.cpp:1.8
--- carob/src/Statement.cpp:1.7 Thu Nov 24 12:15:42 2005
+++ carob/src/Statement.cpp Thu Nov 24 15:54:46 2005
@@ -41,8 +41,8 @@
}
sql = trim(sql);
- RequestWithResultSetParameters request(sql, true, L"", escapeProcessing,
- timeout);
+ RequestWithResultSetParameters request(sql);
+ request.setEscapeProcessing(escapeProcessing).setTimeoutInSeconds(timeout);
setReadRequestParameters(request);
resultList = connectionPtr->statementExecute(request);
resultListIterator = resultList.begin();
@@ -68,8 +68,8 @@
resultPtr = NULL;
}
- RequestWithResultSetParameters request(sql, true, L"", escapeProcessing,
- timeout);
+ RequestWithResultSetParameters request(sql);
+ request.setEscapeProcessing(escapeProcessing).setTimeoutInSeconds(timeout);
setReadRequestParameters(request);
resultPtr = connectionPtr->statementExecuteQuery(request);
@@ -93,7 +93,8 @@
resultPtr->close();
resultPtr = NULL;
}
- Request request =
Request(sql).setEscapeProcessing(escapeProcessing).setTimeoutInSeconds(timeout);
+ Request request(sql);
+ request.setEscapeProcessing(escapeProcessing).setTimeoutInSeconds(timeout);
int updateCount = connectionPtr->statementExecuteUpdate(request);
return updateCount;
}
Index: carob/test/TestBeginCommitRollback.cpp
diff -u carob/test/TestBeginCommitRollback.cpp:1.4
carob/test/TestBeginCommitRollback.cpp:1.5
--- carob/test/TestBeginCommitRollback.cpp:1.4 Wed Nov 23 18:51:45 2005
+++ carob/test/TestBeginCommitRollback.cpp Thu Nov 24 15:54:46 2005
@@ -29,8 +29,8 @@
try
{
connectionPtr->setAutoCommit(false);
- RequestWithResultSetParameters readReq(L"select * from address", true, L"",
- false, 2);
+ RequestWithResultSetParameters readReq(L"select * from address");
+ readReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing read");
@@ -52,8 +52,8 @@
try
{
connectionPtr->setAutoCommit(false);
- RequestWithResultSetParameters readReq(L"select * from address", true, L"",
- false, 2);
+ RequestWithResultSetParameters readReq(L"select * from address");
+ readReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing read");
@@ -76,8 +76,8 @@
try
{
connectionPtr->setAutoCommit(false);
- Request updtReq = Request(L"update product set name='commited' where id=0")
- .setEscapeProcessing(false).setTimeoutInSeconds(2);
+ Request updtReq(L"update product set name='commited' where id=0");
+ updtReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing write");
@@ -100,8 +100,8 @@
try
{
connectionPtr->setAutoCommit(false);
- Request updtReq = Request(L"update product set name='rollbacked' where
id=0")
- .setEscapeProcessing(false).setTimeoutInSeconds(2);
+ Request updtReq(L"update product set name='rollbacked' where id=0");
+ updtReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing write");
Index: carob/test/TestExecReadRequest.cpp
diff -u carob/test/TestExecReadRequest.cpp:1.7
carob/test/TestExecReadRequest.cpp:1.8
--- carob/test/TestExecReadRequest.cpp:1.7 Wed Nov 23 15:16:36 2005
+++ carob/test/TestExecReadRequest.cpp Thu Nov 24 15:54:46 2005
@@ -32,8 +32,8 @@
wstring fctName(L"TestExecReadRequest::testReadBadRequest");
try
{
- RequestWithResultSetParameters readReq(L"dummy request", true, L"", false,
- 2);
+ RequestWithResultSetParameters readReq(L"dummy request");
+ readReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing read");
@@ -59,8 +59,9 @@
wstring fctName(L"TestExecReadRequest::testReadBadTable");
try
{
- RequestWithResultSetParameters readReq(L"select * from dummy", true, L"",
- false, 2);
+ RequestWithResultSetParameters readReq(L"select * from dummy");
+ readReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
+
if (isDebugEnabled())
{
logDebug(fctName, L"Executing read");
@@ -86,8 +87,8 @@
wstring fctName(L"TestExecReadRequest::testReadGood");
try
{
- RequestWithResultSetParameters readReq(L"select * from address", true, L"",
- false, 2);
+ RequestWithResultSetParameters readReq(L"select * from address");
+ readReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing read");
Index: carob/test/TestExecWriteRequest.cpp
diff -u carob/test/TestExecWriteRequest.cpp:1.8
carob/test/TestExecWriteRequest.cpp:1.9
--- carob/test/TestExecWriteRequest.cpp:1.8 Wed Nov 23 18:51:45 2005
+++ carob/test/TestExecWriteRequest.cpp Thu Nov 24 15:54:46 2005
@@ -31,8 +31,8 @@
wstring fctName(L"TestExecWriteRequest::testWriteBadRequest");
try
{
- Request updtReq = Request(L"dummy request")
- .setEscapeProcessing(false).setTimeoutInSeconds(2);
+ Request updtReq(L"dummy request");
+ updtReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing write");
@@ -58,8 +58,8 @@
wstring fctName(L"TestExecWriteRequest::testWriteBadTable");
try
{
- Request updtReq = Request(L"update dummy set name='gotit' where id=0")
- .setEscapeProcessing(false).setTimeoutInSeconds(2);
+ Request updtReq(L"update dummy set name='gotit' where id=0");
+ updtReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing write");
@@ -85,8 +85,8 @@
wstring fctName(L"TestExecWriteRequest::testWriteGood");
try
{
- Request updtReq = Request(L"update product set name='changed' where id=0")
- .setEscapeProcessing(false).setTimeoutInSeconds(2);
+ Request updtReq(L"update product set name='changed' where id=0");
+ updtReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing write");
@@ -115,8 +115,8 @@
wstring requestBegin = L"UPDATE product SET cost=";
wstring requestEnd = L" where id=";
- Request updtReq = Request(L"")
- .setEscapeProcessing(false).setTimeoutInSeconds(2);
+ Request updtReq(L"");
+ updtReq.setEscapeProcessing(false).setTimeoutInSeconds(2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing 1000 writes");
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
