Date: Wednesday, November 23, 2005 @ 15:16:37
Author: gilles
Path: /cvsroot/carob/carob
Modified: contrib/PHP/sample_carob_request.cpp (1.3 -> 1.4)
test/TestBeginCommitRollback.cpp (1.2 -> 1.3)
test/TestExecReadRequest.cpp (1.6 -> 1.7)
test/TestExecWriteRequest.cpp (1.6 -> 1.7)
test/TestStatement.cpp (1.3 -> 1.4)
Applied recent changes (request and executeXXX)
--------------------------------------+
contrib/PHP/sample_carob_request.cpp | 7 +-----
test/TestBeginCommitRollback.cpp | 35 ++++++++++++---------------------
test/TestExecReadRequest.cpp | 29 +++++++++++----------------
test/TestExecWriteRequest.cpp | 35 ++++++++++++---------------------
test/TestStatement.cpp | 3 +-
5 files changed, 42 insertions(+), 67 deletions(-)
Index: carob/contrib/PHP/sample_carob_request.cpp
diff -u carob/contrib/PHP/sample_carob_request.cpp:1.3
carob/contrib/PHP/sample_carob_request.cpp:1.4
--- carob/contrib/PHP/sample_carob_request.cpp:1.3 Mon Nov 14 16:18:25 2005
+++ carob/contrib/PHP/sample_carob_request.cpp Wed Nov 23 15:16:36 2005
@@ -130,15 +130,12 @@
connectionPtr = connectionPool.connectToController(connectionPrms);
// Create request object
- SelectRequest readReq(wreq,
- false,
- 2,
- L"\n");
+ RequestWithResultSetParameters readReq(wreq, true, L"", false, 2);
// efree(req); // segfaults
// Execute request
- DriverResultSet* drsPtr = connectionPtr->execReadRequest(readReq);
+ DriverResultSet* drsPtr = connectionPtr->statementExecuteQuery(readReq);
if (!drsPtr)
throw CarobException(L"null resultset");
Index: carob/test/TestBeginCommitRollback.cpp
diff -u carob/test/TestBeginCommitRollback.cpp:1.2
carob/test/TestBeginCommitRollback.cpp:1.3
--- carob/test/TestBeginCommitRollback.cpp:1.2 Wed Nov 9 14:35:34 2005
+++ carob/test/TestBeginCommitRollback.cpp Wed Nov 23 15:16:36 2005
@@ -21,8 +21,7 @@
#include <iostream>
#include "TestBeginCommitRollback.hpp"
-#include "SelectRequest.hpp"
-#include "UpdateRequest.hpp"
+#include "Request.hpp"
void TestBeginCommitRollback::testReadRequestAndCommit()
{
@@ -30,15 +29,13 @@
try
{
connectionPtr->setAutoCommit(false);
- SelectRequest readReq(L"select * from address;",
- false,
- 2,
- L"\n");
+ RequestWithResultSetParameters readReq(L"select * from address", true, L"",
+ false, 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing read");
}
- connectionPtr->execReadRequest(readReq);
+ connectionPtr->statementExecuteQuery(readReq);
connectionPtr->commit();
CPPUNIT_ASSERT(true);
}
@@ -55,15 +52,13 @@
try
{
connectionPtr->setAutoCommit(false);
- SelectRequest readReq(L"select * from address;",
- false,
- 2,
- L"\n");
+ RequestWithResultSetParameters readReq(L"select * from address", true, L"",
+ false, 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing read");
}
- connectionPtr->execReadRequest(readReq);
+ connectionPtr->statementExecuteQuery(readReq);
connectionPtr->rollback();
CPPUNIT_ASSERT(true);
@@ -81,15 +76,13 @@
try
{
connectionPtr->setAutoCommit(false);
- UpdateRequest updtReq(L"update product set name='commited' where id=0;",
- false,
- 2,
- L"\n");
+ Request updtReq(L"update product set name='commited' where id=0", true,
L"",
+ false, 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing write");
}
- connectionPtr->execWriteRequest(updtReq);
+ connectionPtr->statementExecuteUpdate(updtReq);
connectionPtr->commit();
CPPUNIT_ASSERT(true);
@@ -107,15 +100,13 @@
try
{
connectionPtr->setAutoCommit(false);
- UpdateRequest updtReq(L"update product set name='rollbacked' where id=0;",
- false,
- 2,
- L"\n");
+ Request updtReq(L"update product set name='rollbacked' where id=0", true,
+ L"", false, 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing write");
}
- connectionPtr->execWriteRequest(updtReq);
+ connectionPtr->statementExecuteUpdate(updtReq);
connectionPtr->rollback();
CPPUNIT_ASSERT(true);
}
Index: carob/test/TestExecReadRequest.cpp
diff -u carob/test/TestExecReadRequest.cpp:1.6
carob/test/TestExecReadRequest.cpp:1.7
--- carob/test/TestExecReadRequest.cpp:1.6 Wed Nov 9 14:35:34 2005
+++ carob/test/TestExecReadRequest.cpp Wed Nov 23 15:16:36 2005
@@ -22,24 +22,23 @@
#include "Common.hpp"
#include "CarobException.hpp"
+#include "Connection.hpp"
#include "DriverResultSet.hpp"
#include "TestExecReadRequest.hpp"
-#include "SelectRequest.hpp"
+#include "RequestWithResultSetParameters.hpp"
void TestExecReadRequest::testReadBadRequest()
{
wstring fctName(L"TestExecReadRequest::testReadBadRequest");
try
{
- SelectRequest readReq(L"dummy request;",
- false,
- 2,
- L"\n");
+ RequestWithResultSetParameters readReq(L"dummy request", true, L"", false,
+ 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing read");
}
- connectionPtr->execReadRequest(readReq);
+ connectionPtr->statementExecuteQuery(readReq);
// We should receive an exception instead of coming here
CPPUNIT_ASSERT(false);
}
@@ -60,15 +59,13 @@
wstring fctName(L"TestExecReadRequest::testReadBadTable");
try
{
- SelectRequest readReq(L"select * from dummy;",
- false,
- 2,
- L"\n");
+ RequestWithResultSetParameters readReq(L"select * from dummy", true, L"",
+ false, 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing read");
}
- connectionPtr->execReadRequest(readReq);
+ connectionPtr->statementExecuteQuery(readReq);
// We should receive an exception instead of coming here
CPPUNIT_ASSERT(false);
}
@@ -89,17 +86,15 @@
wstring fctName(L"TestExecReadRequest::testReadGood");
try
{
- SelectRequest readReq(L"select * from address;",
- false,
- 2,
- L"\n");
+ RequestWithResultSetParameters readReq(L"select * from address", true, L"",
+ false, 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing read");
}
- DriverResultSet* drsPtr = connectionPtr->execReadRequest(readReq);
+ DriverResultSet* drsPtr = connectionPtr->statementExecuteQuery(readReq);
logDebug(fctName, *drsPtr);
- //Display five rows for debugging...
+ //Display 50 rows for debugging...
// wcerr<<L"Row\tId\tName\t\tCost"<<endl;
wcerr<<L"Row\tId\tFirstName\t\tLastName"<<endl;
for (int i=0; i<50; i++)
Index: carob/test/TestExecWriteRequest.cpp
diff -u carob/test/TestExecWriteRequest.cpp:1.6
carob/test/TestExecWriteRequest.cpp:1.7
--- carob/test/TestExecWriteRequest.cpp:1.6 Wed Nov 9 14:35:34 2005
+++ carob/test/TestExecWriteRequest.cpp Wed Nov 23 15:16:36 2005
@@ -20,25 +20,23 @@
*/
#include "Common.hpp"
+#include "Connection.hpp"
#include "CarobException.hpp"
#include "DriverResultSet.hpp"
#include "TestExecWriteRequest.hpp"
-#include "UpdateRequest.hpp"
+#include "Request.hpp"
void TestExecWriteRequest::testWriteBadRequest()
{
wstring fctName(L"TestExecWriteRequest::testWriteBadRequest");
try
{
- UpdateRequest updtReq(L"dummy request;",
- false,
- 2,
- L"\n");
+ Request updtReq(L"dummy request", true, L"", false, 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing write");
}
- connectionPtr->execWriteRequest(updtReq);
+ connectionPtr->statementExecuteUpdate(updtReq);
// We should receive an exception instead of coming here
CPPUNIT_ASSERT(false);
}
@@ -59,15 +57,13 @@
wstring fctName(L"TestExecWriteRequest::testWriteBadTable");
try
{
- UpdateRequest updtReq(L"update dummy set name='gotit' where id=0;",
- false,
- 2,
- L"\n");
+ Request updtReq(L"update dummy set name='gotit' where id=0", true, L"",
+ false, 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing write");
}
- connectionPtr->execWriteRequest(updtReq);
+ connectionPtr->statementExecuteUpdate(updtReq);
// We should receive an exception instead of coming here
CPPUNIT_ASSERT(false);
}
@@ -88,15 +84,13 @@
wstring fctName(L"TestExecWriteRequest::testWriteGood");
try
{
- UpdateRequest updtReq(L"update product set name='changed' where id=0;",
- false,
- 2,
- L"\n");
+ Request updtReq(L"update product set name='changed' where id=0", true, L"",
+ false, 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing write");
}
- int32_t nbRowsAffected = connectionPtr->execWriteRequest(updtReq);
+ int32_t nbRowsAffected = connectionPtr->statementExecuteUpdate(updtReq);
CPPUNIT_ASSERT(nbRowsAffected == 1);
}
@@ -120,19 +114,16 @@
wstring requestBegin = L"UPDATE product SET cost=";
wstring requestEnd = L" where id=";
- UpdateRequest updtReq(L"",
- false,
- 2,
- L"\n");
+ Request updtReq(L"", true, L"", false, 2);
if (isDebugEnabled())
{
logDebug(fctName, L"Executing 1000 writes");
}
for (int i=0; i<1000; i++)
{
- updtReq.setSQLQuery(requestBegin + toWString(i)
+ updtReq.setSqlQuery(requestBegin + toWString(i)
+ requestEnd + toWString(i%50));
- int32_t nbRowsAffected = connectionPtr->execWriteRequest(updtReq);
+ int32_t nbRowsAffected = connectionPtr->statementExecuteUpdate(updtReq);
CPPUNIT_ASSERT(nbRowsAffected == 1);
}
Index: carob/test/TestStatement.cpp
diff -u carob/test/TestStatement.cpp:1.3 carob/test/TestStatement.cpp:1.4
--- carob/test/TestStatement.cpp:1.3 Fri Nov 18 17:38:38 2005
+++ carob/test/TestStatement.cpp Wed Nov 23 15:16:36 2005
@@ -21,10 +21,11 @@
#include <iostream>
#include "Common.hpp"
+#include "Connection.hpp"
#include "CarobException.hpp"
#include "DriverResultSet.hpp"
#include "TestStatement.hpp"
-#include "SelectRequest.hpp"
+#include "RequestWithResultSetParameters.hpp"
#include "Statement.hpp"
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
