Date: Thursday, January 19, 2006 @ 10:51:44
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: src/Utils.cpp (1.23 -> 1.24) test/TestMySQLAPI.cpp (1.26 ->
1.27)
Time,date and datetime to string cases implemented.
-----------------------+
src/Utils.cpp | 18 +++++++++++++++---
test/TestMySQLAPI.cpp | 4 ++--
2 files changed, 17 insertions(+), 5 deletions(-)
Index: libmysequoia/src/Utils.cpp
diff -u libmysequoia/src/Utils.cpp:1.23 libmysequoia/src/Utils.cpp:1.24
--- libmysequoia/src/Utils.cpp:1.23 Thu Jan 19 09:47:37 2006
+++ libmysequoia/src/Utils.cpp Thu Jan 19 10:51:44 2006
@@ -834,6 +834,8 @@
void getFromTime(MYSQL_BIND *bind, MYSQL_FIELD *field, void *data)
{
+ MYSQL_TIME time;
+
*bind->error = 0;
switch (bind->buffer_type)
@@ -870,7 +872,9 @@
case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING:
- LOG4CXX_ERROR(logger, "Not implemented yet!");
+ convertTime(data, &time, MYSQL_TIMESTAMP_TIME);
+ *bind->error = MYSQL_TIME_to_str(&time, (char *)bind->buffer,
bind->buffer_length);
+ *bind->length = strlen((char *)bind->buffer);
break;
case MYSQL_TYPE_TIME:
@@ -894,6 +898,8 @@
void getFromDate(MYSQL_BIND *bind, MYSQL_FIELD *field, void *data)
{
+ MYSQL_TIME date;
+
*bind->error = 0;
switch (bind->buffer_type)
@@ -930,7 +936,9 @@
case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING:
- LOG4CXX_ERROR(logger, "Not implemented yet!");
+ convertDateTime(data, &date, MYSQL_TIMESTAMP_DATE, false);
+ *bind->error = MYSQL_TIME_to_str(&date, (char *)bind->buffer,
bind->buffer_length);
+ *bind->length = strlen((char *)bind->buffer);
break;
case MYSQL_TYPE_TIME:
@@ -954,6 +962,8 @@
void getFromDateTime(MYSQL_BIND *bind, MYSQL_FIELD *field, void *data)
{
+ MYSQL_TIME datetime;
+
*bind->error = 0;
switch (bind->buffer_type)
@@ -990,7 +1000,9 @@
case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING:
- LOG4CXX_ERROR(logger, "Not implemented yet!");
+ convertDateTime(data, &datetime, MYSQL_TIMESTAMP_DATE, true);
+ *bind->error = MYSQL_TIME_to_str(&datetime, (char *)bind->buffer,
bind->buffer_length);
+ *bind->length = strlen((char *)bind->buffer);
break;
case MYSQL_TYPE_TIME:
Index: libmysequoia/test/TestMySQLAPI.cpp
diff -u libmysequoia/test/TestMySQLAPI.cpp:1.26
libmysequoia/test/TestMySQLAPI.cpp:1.27
--- libmysequoia/test/TestMySQLAPI.cpp:1.26 Thu Jan 19 09:46:55 2006
+++ libmysequoia/test/TestMySQLAPI.cpp Thu Jan 19 10:51:44 2006
@@ -210,8 +210,8 @@
void TestMySQLAPI::mysql_real_query_2_test(void)
{
- char *query = "insert into t1 (b,d,e,f) values (1,'2006-01-01', '1:2:3',
NOW()),"
- "(2,'2006-01-02','4:5:6', NOW()),(3,'2006-01-03','7:8:9',
NOW())";
+ char *query = "insert into t1 (b,d,e) values (1,'2006-01-01', '1:2:3'),"
+ "(2,'2006-01-02','4:5:6'),(3,'2006-01-03','7:8:9')";
// connect to the database
CPPUNIT_ASSERT(mysql_real_connect(mysql, HOST, USER1, PASSWD1, DB1, 0, 0, 0)
!= 0);
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits