CVS update of carob (13 files)

    Date: Tuesday, January 24, 2006 @ 19:37:27
  Author: gilles
    Path: /cvsroot/carob/carob

Modified: include/DriverResultSet.hpp (1.27 -> 1.28) include/Field.hpp
          (1.10 -> 1.11) include/ParameterStatement.hpp (1.8 -> 1.9)
          include/Request.hpp (1.14 -> 1.15)
          include/RequestWithResultSetParameters.hpp (1.10 -> 1.11)
          include/ResultSetMetaData.hpp (1.6 -> 1.7) include/Statement.hpp
          (1.28 -> 1.29) src/Field.cpp (1.8 -> 1.9)
          src/ParameterStatement.cpp (1.7 -> 1.8) src/Request.cpp (1.8 ->
          1.9) src/RequestWithResultSetParameters.cpp (1.8 -> 1.9)
          src/ResultSetMetaData.cpp (1.8 -> 1.9) src/Statement.cpp (1.25
          -> 1.26)

Removal #2 of useless and unnecessary includes in .hpps (implied forward 
declarations)
Reordered includes in .cpp (from most specific to most general)


--------------------------------------------+
 include/DriverResultSet.hpp                |    2 ++
 include/Field.hpp                          |    8 +++++---
 include/ParameterStatement.hpp             |   10 +++++-----
 include/Request.hpp                        |    6 +++++-
 include/RequestWithResultSetParameters.hpp |    6 +++++-
 include/ResultSetMetaData.hpp              |    7 ++++---
 include/Statement.hpp                      |   12 +++++++-----
 src/Field.cpp                              |    4 +++-
 src/ParameterStatement.cpp                 |    4 +++-
 src/Request.cpp                            |    4 +++-
 src/RequestWithResultSetParameters.cpp     |    4 +++-
 src/ResultSetMetaData.cpp                  |    6 ++++++
 src/Statement.cpp                          |   16 +++++++++++++---
 13 files changed, 64 insertions(+), 25 deletions(-)


Index: carob/include/DriverResultSet.hpp
diff -u carob/include/DriverResultSet.hpp:1.27 
carob/include/DriverResultSet.hpp:1.28
--- carob/include/DriverResultSet.hpp:1.27      Tue Jan 24 18:54:51 2006
+++ carob/include/DriverResultSet.hpp   Tue Jan 24 19:37:27 2006
@@ -23,6 +23,7 @@
 #define DRIVERRESULTSET_H_
 
 #include "SQLDataSerialization.hpp"
+#include "CarobException.hpp"
 
 #include <vector>
 
@@ -61,6 +62,7 @@
 class Statement;
 class Connection;
 class Field;
+class TypeTag;
 /**
  * A <code>ResultSet</code> provides access to a table of data generated by
  * executing a Statement. The table rows are retrieved in sequence. Within a 
row
Index: carob/include/Field.hpp
diff -u carob/include/Field.hpp:1.10 carob/include/Field.hpp:1.11
--- carob/include/Field.hpp:1.10        Tue Dec 13 18:07:24 2005
+++ carob/include/Field.hpp     Tue Jan 24 19:37:27 2006
@@ -1,6 +1,6 @@
 /*
  * Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
  * Contact: sequoia-NAAfj4rwCWAYtQj7fl1lsA@xxxxxxxxxxxxxxxx
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,12 +22,14 @@
 #ifndef FIELD_H_
 #define FIELD_H_
 
-#include <string>
+#include "CarobException.hpp"
 
-#include "DriverSocket.hpp"
+#include <string>
 
 namespace CarobNS {
 
+class DriverSocket;
+
 /**
  * Field is our private implementation of <code>ResultSetMetaData</code>,
  * holding the information for one column.
Index: carob/include/ParameterStatement.hpp
diff -u carob/include/ParameterStatement.hpp:1.8 
carob/include/ParameterStatement.hpp:1.9
--- carob/include/ParameterStatement.hpp:1.8    Fri Jan 20 20:49:09 2006
+++ carob/include/ParameterStatement.hpp        Tue Jan 24 19:37:27 2006
@@ -21,17 +21,17 @@
 #ifndef PARAMETERSTATEMENT_HPP_
 #define PARAMETERSTATEMENT_HPP_
 
-#include <string>
-#include <vector>
+#include "Statement.hpp"
 
 #include "CarobException.hpp"
-#include "Statement.hpp"
-#include "BigDecimal.hpp"
 
-namespace CarobNS {
+#include <string>
+#include <vector>
 
+namespace CarobNS {
 
 class Connection;
+class BigDecimal;
 
 /**
  * A SQL Statement template is stored in a
Index: carob/include/Request.hpp
diff -u carob/include/Request.hpp:1.14 carob/include/Request.hpp:1.15
--- carob/include/Request.hpp:1.14      Mon Jan 23 17:17:59 2006
+++ carob/include/Request.hpp   Tue Jan 24 19:37:27 2006
@@ -22,10 +22,14 @@
 #ifndef REQUEST_HPP_
 #define REQUEST_HPP_
 
-#include "DriverSocket.hpp"
+#include "CarobException.hpp"
+
+#include <string>
 
 namespace CarobNS {
 
+class DriverSocket;
+
 /**
  * This class defines a Request object. This basically carries the SQL 
statement
  * and the SQL template if this is a ParameterStatement.
Index: carob/include/RequestWithResultSetParameters.hpp
diff -u carob/include/RequestWithResultSetParameters.hpp:1.10 
carob/include/RequestWithResultSetParameters.hpp:1.11
--- carob/include/RequestWithResultSetParameters.hpp:1.10       Wed Jan  4 
11:53:51 2006
+++ carob/include/RequestWithResultSetParameters.hpp    Tue Jan 24 19:37:27 2006
@@ -1,6 +1,6 @@
 /*
  * Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
  * Contact: sequoia-NAAfj4rwCWAYtQj7fl1lsA@xxxxxxxxxxxxxxxx
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,10 @@
 
 #include "Request.hpp"
 
+#include "CarobException.hpp"
+
+#include <string>
+
 namespace CarobNS {
 
 /**
Index: carob/include/ResultSetMetaData.hpp
diff -u carob/include/ResultSetMetaData.hpp:1.6 
carob/include/ResultSetMetaData.hpp:1.7
--- carob/include/ResultSetMetaData.hpp:1.6     Tue Dec 13 18:18:51 2005
+++ carob/include/ResultSetMetaData.hpp Tue Jan 24 19:37:27 2006
@@ -1,6 +1,6 @@
 /*
  * Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
  * Contact: sequoia-NAAfj4rwCWAYtQj7fl1lsA@xxxxxxxxxxxxxxxx
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,6 @@
 #define RESULTSETMETADATA_HPP_
 
 #include "CarobException.hpp"
-#include "DriverResultSet.hpp"
 
 namespace CarobNS {
 
@@ -44,6 +43,8 @@
  */
 #define columnNullableUnknown     2
 
+class DriverResultSet;
+
 /**
  * ResultSet metadata provided for pretty printing of the ResultSet by a
  * console.
@@ -64,7 +65,7 @@
    * Returns the number of columns in this <code>ResultSet</code> object.
    * @return the number of columns
    */
-  int                   getColumnCount() { return resultSetPtr->nbOfColumns; }
+  int                   getColumnCount();
   /**
    * Indicates whether the designated column is automatically numbered, thus
    * read-only.
Index: carob/include/Statement.hpp
diff -u carob/include/Statement.hpp:1.28 carob/include/Statement.hpp:1.29
--- carob/include/Statement.hpp:1.28    Tue Jan 17 15:30:44 2006
+++ carob/include/Statement.hpp Tue Jan 24 19:37:27 2006
@@ -21,12 +21,12 @@
 #ifndef STATEMENT_HPP_
 #define STATEMENT_HPP_
 
-#include <string>
-#include <list>
+#include "DriverResultSet.hpp"
 
 #include "Common.hpp"
-#include "DriverResultSet.hpp"
-#include "RequestWithResultSetParameters.hpp"
+
+#include <string>
+#include <list>
 
 namespace CarobNS {
 
@@ -53,6 +53,8 @@
 
 class Connection;
 class ResultSetMetaData;
+class DriverResultSet;
+class RequestWithResultSetParameters;
 
 /**
  * A <code>Statement</code> object is used for executing a static SQL
@@ -161,7 +163,7 @@
    * 
    * @return true if there are more results pending for retrieval.
    */
-  bool                    moreResults() const {return resultListIterator != 
resultList.end();}
+  bool                    moreResults() const;
 
   /**
    * Return the true if next available result is a ResultSet or false it this 
is
Index: carob/src/Field.cpp
diff -u carob/src/Field.cpp:1.8 carob/src/Field.cpp:1.9
--- carob/src/Field.cpp:1.8     Fri Dec  2 15:53:07 2005
+++ carob/src/Field.cpp Tue Jan 24 19:37:27 2006
@@ -1,6 +1,6 @@
 /*
  * Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
  * Contact: sequoia-NAAfj4rwCWAYtQj7fl1lsA@xxxxxxxxxxxxxxxx
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,8 @@
 
 #include "Field.hpp"
 
+#include "DriverSocket.hpp"
+
 using std::wstring;
 
 using namespace CarobNS;
Index: carob/src/ParameterStatement.cpp
diff -u carob/src/ParameterStatement.cpp:1.7 
carob/src/ParameterStatement.cpp:1.8
--- carob/src/ParameterStatement.cpp:1.7        Sat Jan 21 01:52:52 2006
+++ carob/src/ParameterStatement.cpp    Tue Jan 24 19:37:27 2006
@@ -20,9 +20,11 @@
  */
 #include "ParameterStatement.hpp"
 
+#include "Connection.hpp"
+#include "BigDecimal.hpp"
+
 #include "Common.hpp"
 #include "CarobException.hpp"
-#include "Connection.hpp"
 
 namespace CarobNS {
 /**
Index: carob/src/Request.cpp
diff -u carob/src/Request.cpp:1.8 carob/src/Request.cpp:1.9
--- carob/src/Request.cpp:1.8   Wed Jan  4 11:53:51 2006
+++ carob/src/Request.cpp       Tue Jan 24 19:37:27 2006
@@ -1,6 +1,6 @@
 /*
  * Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
  * Contact: sequoia-NAAfj4rwCWAYtQj7fl1lsA@xxxxxxxxxxxxxxxx
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,8 @@
 
 #include "Request.hpp"
 
+#include "DriverSocket.hpp"
+
 using namespace CarobNS;
 
 Request::~Request()
Index: carob/src/RequestWithResultSetParameters.cpp
diff -u carob/src/RequestWithResultSetParameters.cpp:1.8 
carob/src/RequestWithResultSetParameters.cpp:1.9
--- carob/src/RequestWithResultSetParameters.cpp:1.8    Wed Jan  4 11:53:51 2006
+++ carob/src/RequestWithResultSetParameters.cpp        Tue Jan 24 19:37:27 2006
@@ -1,6 +1,6 @@
 /*
  * Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Continuent, Inc.
  * Contact: sequoia-NAAfj4rwCWAYtQj7fl1lsA@xxxxxxxxxxxxxxxx
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,8 @@
 
 #include "RequestWithResultSetParameters.hpp"
 
+#include "DriverSocket.hpp"
+
 using std::wstring;
 
 using namespace CarobNS;
Index: carob/src/ResultSetMetaData.cpp
diff -u carob/src/ResultSetMetaData.cpp:1.8 carob/src/ResultSetMetaData.cpp:1.9
--- carob/src/ResultSetMetaData.cpp:1.8 Tue Jan 24 18:54:51 2006
+++ carob/src/ResultSetMetaData.cpp     Tue Jan 24 19:37:27 2006
@@ -24,6 +24,8 @@
 #include "Field.hpp"
 #include "Common.hpp"
 
+#include "DriverResultSet.hpp"
+
 using std::wstring;
 
 using namespace CarobNS;
@@ -35,6 +37,10 @@
     throw DriverException(L"Null resultSet, cannot get column count");
   resultSetPtr = rs;
 }
+int ResultSetMetaData::getColumnCount()
+{
+  return resultSetPtr->nbOfColumns;
+}
 void ResultSetMetaData::checkColumnIndex(int column) throw (DriverException,
     UnexpectedException)
 {
Index: carob/src/Statement.cpp
diff -u carob/src/Statement.cpp:1.25 carob/src/Statement.cpp:1.26
--- carob/src/Statement.cpp:1.25        Fri Jan 13 12:51:47 2006
+++ carob/src/Statement.cpp     Tue Jan 24 19:37:27 2006
@@ -19,11 +19,16 @@
  * Contributor(s): Zsolt Simon
  */
 
-#include "CarobException.hpp"
-#include "Common.hpp"
+#include "Statement.hpp"
+
 #include "Connection.hpp"
 #include "ResultSetMetaData.hpp"
-#include "Statement.hpp"
+#include "RequestWithResultSetParameters.hpp"
+
+#include "CarobException.hpp"
+#include "Common.hpp"
+
+#include <string>
 
 using std::wstring;
 
@@ -167,6 +172,11 @@
   return lastUpdateCount;
 }
 
+bool Statement::moreResults() const
+{
+  return resultListIterator != resultList.end();
+}
+
 bool Statement::getMoreResults() throw (DriverException, SocketIOException,
 BackendException, ControllerException, ProtocolException, UnexpectedException)
 {