Date: Monday, April 24, 2006 @ 09:33:08
  Author: csaba
    Path: /cvsroot/carob/carob

Modified: include/Connection.hpp (1.65 -> 1.66) include/Field.hpp (1.11 ->
          1.12) src/Field.cpp (1.9 -> 1.10)

Protocol change due to the new "encoding" member in the Field class.


------------------------+
 include/Connection.hpp |    2 +-
 include/Field.hpp      |    9 ++++++++-
 src/Field.cpp          |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)


Index: carob/include/Connection.hpp
diff -u carob/include/Connection.hpp:1.65 carob/include/Connection.hpp:1.66
--- carob/include/Connection.hpp:1.65   Fri Apr  7 16:47:02 2006
+++ carob/include/Connection.hpp        Mon Apr 24 09:33:08 2006
@@ -31,7 +31,7 @@
 #include <list>
 
 namespace {
-const int32_t ProtocolVersion = (static_cast<int32_t>(1) /* major */ << 16)
+const int32_t ProtocolVersion = (static_cast<int32_t>(2) /* major */ << 16)
                                                     + 0 /* minor */;
 }
 
Index: carob/include/Field.hpp
diff -u carob/include/Field.hpp:1.11 carob/include/Field.hpp:1.12
--- carob/include/Field.hpp:1.11        Tue Jan 24 19:37:27 2006
+++ carob/include/Field.hpp     Mon Apr 24 09:33:08 2006
@@ -16,7 +16,7 @@
  * limitations under the License.
  *
  * Initial developer(s): Gilles Rayrat
- * Contributor(s): 
+ * Contributor(s): Csaba Simon
  */
 
 #ifndef FIELD_H_
@@ -157,6 +157,12 @@
    */
   std::wstring toString() { return getFullName(); }
 
+  /**
+   * Retrieves the encoding of the field.
+   * @return encoding
+   */
+  std::wstring getEncoding() { return encoding; }
+  
 private:
   std::wstring        table_name;
   bool                table_name_not_null;
@@ -177,6 +183,7 @@
   bool                is_signed;
   int                 precision;
   int                 scale;
+  std::wstring        encoding;
 };
 typedef Field  *FieldPtr;
 
Index: carob/src/Field.cpp
diff -u carob/src/Field.cpp:1.9 carob/src/Field.cpp:1.10
--- carob/src/Field.cpp:1.9     Tue Jan 24 19:37:27 2006
+++ carob/src/Field.cpp Mon Apr 24 09:33:08 2006
@@ -52,5 +52,5 @@
   sockPtr>>is_signed;
   sockPtr>>precision;
   sockPtr>>scale;
+  sockPtr>>encoding;
 }
-

_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits

Reply via email to