Date: Wednesday, November 23, 2005 @ 17:30:45
Author: gilles
Path: /cvsroot/carob/carob
Modified: include/Connection.hpp (1.22 -> 1.23)
include/DriverResultSet.hpp (1.7 -> 1.8) include/Field.hpp (1.3
-> 1.4) src/Field.cpp (1.3 -> 1.4)
Added fieldLabel in Field class.
Updated protocol version to reflect this fieldLabel serialization addition
-----------------------------+
include/Connection.hpp | 2 +-
include/DriverResultSet.hpp | 2 --
include/Field.hpp | 1 +
src/Field.cpp | 1 +
4 files changed, 3 insertions(+), 3 deletions(-)
Index: carob/include/Connection.hpp
diff -u carob/include/Connection.hpp:1.22 carob/include/Connection.hpp:1.23
--- carob/include/Connection.hpp:1.22 Wed Nov 23 15:13:47 2005
+++ carob/include/Connection.hpp Wed Nov 23 17:30:45 2005
@@ -37,7 +37,7 @@
/** Command prefix sent before each command */
#define CommandPrefix 0xB015CA
-#define ProtocolVersion 26
+#define ProtocolVersion 27
//#define Ping -1
#define StatementExecuteQuery 0
Index: carob/include/DriverResultSet.hpp
diff -u carob/include/DriverResultSet.hpp:1.7
carob/include/DriverResultSet.hpp:1.8
--- carob/include/DriverResultSet.hpp:1.7 Wed Nov 23 15:14:37 2005
+++ carob/include/DriverResultSet.hpp Wed Nov 23 17:30:45 2005
@@ -192,8 +192,6 @@
//TODO:
/** column name -> index in ResultSet data array */
// hash_map<wstring, int32_t> columnNameToIndex;
- /** full column name -> index in ResultSet data array */
-// hash_map<wstring, int32_t> fullColumnNameToIndex;
/** Type of ResultSet */
int32_t resultSetType;
/** Concurrency for this ResultSet */
Index: carob/include/Field.hpp
diff -u carob/include/Field.hpp:1.3 carob/include/Field.hpp:1.4
--- carob/include/Field.hpp:1.3 Wed Sep 21 12:08:15 2005
+++ carob/include/Field.hpp Wed Nov 23 17:30:45 2005
@@ -48,6 +48,7 @@
wstring tableName;
bool tableNameNotNull;
wstring fieldName;
+ wstring fieldLabel;
int32_t columnDisplaySize;
int32_t sqlType;
wstring typeName;
Index: carob/src/Field.cpp
diff -u carob/src/Field.cpp:1.3 carob/src/Field.cpp:1.4
--- carob/src/Field.cpp:1.3 Wed Sep 21 12:08:15 2005
+++ carob/src/Field.cpp Wed Nov 23 17:30:45 2005
@@ -30,6 +30,7 @@
sockPtr>>tableName;
}
sockPtr>>fieldName;
+ sockPtr>>fieldLabel;
sockPtr>>columnDisplaySize;
sockPtr>>sqlType;
sockPtr>>typeName;
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
