github-migration
/
mysql2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finally add real date/time/datetime parsing

This commit is contained in:
Brian Lopez 2010-04-03 16:51:10 -07:00
parent 31c0255451
commit 0a733a1f02
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ext/mysql2_ext.c
View File

@ -184,6 +184,7 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
MYSQL_RES * result; MYSQL_RES * result;
MYSQL_ROW row; MYSQL_ROW row;
MYSQL_FIELD * fields; MYSQL_FIELD * fields;
struct tm parsedTime;
unsigned int i = 0, numFields = 0, symbolizeKeys = 0; unsigned int i = 0, numFields = 0, symbolizeKeys = 0;
unsigned long * fieldLengths; unsigned long * fieldLengths;
@ -236,26 +237,38 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
break; break;
case MYSQL_TYPE_DECIMAL: // DECIMAL or NUMERIC field case MYSQL_TYPE_DECIMAL: // DECIMAL or NUMERIC field
case MYSQL_TYPE_NEWDECIMAL: // Precision math DECIMAL or NUMERIC field (MySQL 5.0.3 and up) case MYSQL_TYPE_NEWDECIMAL: // Precision math DECIMAL or NUMERIC field (MySQL 5.0.3 and up)
// val = rb_funcall(cBigDecimal, intern_new, 1, rb_str_new(row[i], fieldLengths[i])); val = rb_funcall(cBigDecimal, intern_new, 1, rb_str_new(row[i], fieldLengths[i]));
// break; break;
case MYSQL_TYPE_FLOAT: // FLOAT field case MYSQL_TYPE_FLOAT: // FLOAT field
case MYSQL_TYPE_DOUBLE: // DOUBLE or REAL field case MYSQL_TYPE_DOUBLE: // DOUBLE or REAL field
val = rb_float_new(strtod(row[i], NULL)); val = rb_float_new(strtod(row[i], NULL));
break; break;
case MYSQL_TYPE_TIMESTAMP: // TIMESTAMP field
case MYSQL_TYPE_TIME: // TIME field case MYSQL_TYPE_TIME: // TIME field
if (memcmp("00:00:00", row[i], 10) == 0) {
val = rb_str_new(row[i], fieldLengths[i]);
} else {
strptime(row[i], "%T", &parsedTime);
val = rb_funcall(rb_cTime, intern_local, 6, INT2NUM(1900+parsedTime.tm_year), INT2NUM(parsedTime.tm_mon+1), INT2NUM(parsedTime.tm_mday), INT2NUM(parsedTime.tm_hour), INT2NUM(parsedTime.tm_min), INT2NUM(parsedTime.tm_sec));
}
break;
case MYSQL_TYPE_TIMESTAMP: // TIMESTAMP field
case MYSQL_TYPE_DATETIME: // DATETIME field case MYSQL_TYPE_DATETIME: // DATETIME field
// if (memcmp("0000-00-00 00:00:00", row[i], 19) == 0) { if (memcmp("0000-00-00 00:00:00", row[i], 19) == 0) {
// val = rb_str_new(row[i], fieldLengths[i]); val = Qnil;
// } else { } else {
// val = rb_funcall(rb_cTime, intern_parse, 1, rb_str_new(row[i], fieldLengths[i])); strptime(row[i], "%F %T", &parsedTime);
// } val = rb_funcall(rb_cTime, intern_local, 6, INT2NUM(1900+parsedTime.tm_year), INT2NUM(parsedTime.tm_mon+1), INT2NUM(parsedTime.tm_mday), INT2NUM(parsedTime.tm_hour), INT2NUM(parsedTime.tm_min), INT2NUM(parsedTime.tm_sec));
// break; }
break;
case MYSQL_TYPE_DATE: // DATE field case MYSQL_TYPE_DATE: // DATE field
case MYSQL_TYPE_NEWDATE: // Newer const used > 5.0 case MYSQL_TYPE_NEWDATE: // Newer const used > 5.0
// val = rb_funcall(cDate, intern_parse, 1, rb_str_new(row[i], fieldLengths[i])); if (memcmp("0000-00-00", row[i], 10) == 0) {
// val = rb_str_new(row[i], fieldLengths[i]); val = Qnil;
// break; } else {
strptime(row[i], "%F", &parsedTime);
val = rb_funcall(rb_cTime, intern_local, 3, INT2NUM(1900+parsedTime.tm_year), INT2NUM(parsedTime.tm_mon+1), INT2NUM(parsedTime.tm_mday));
}
break;
case MYSQL_TYPE_TINY_BLOB: case MYSQL_TYPE_TINY_BLOB:
case MYSQL_TYPE_MEDIUM_BLOB: case MYSQL_TYPE_MEDIUM_BLOB:
case MYSQL_TYPE_LONG_BLOB: case MYSQL_TYPE_LONG_BLOB:
@ -330,8 +343,11 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
/* Ruby Extension initializer */ /* Ruby Extension initializer */
void Init_mysql2_ext() { void Init_mysql2_ext() {
// rb_require("bigdecimal"); rb_require("date");
// cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal")); rb_require("bigdecimal");
cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
cDate = rb_const_get(rb_cObject, rb_intern("Date"));
cDateTime = rb_const_get(rb_cObject, rb_intern("DateTime"));
VALUE mMysql2 = rb_define_module("Mysql2"); VALUE mMysql2 = rb_define_module("Mysql2");
@ -349,7 +365,8 @@ void Init_mysql2_ext() {
VALUE mEnumerable = rb_const_get(rb_cObject, rb_intern("Enumerable")); VALUE mEnumerable = rb_const_get(rb_cObject, rb_intern("Enumerable"));
rb_include_module(cMysql2Result, mEnumerable); rb_include_module(cMysql2Result, mEnumerable);
// intern_new = rb_intern("new"); intern_new = rb_intern("new");
intern_local = rb_intern("local");
sym_symbolize_keys = ID2SYM(rb_intern("symbolize_keys")); sym_symbolize_keys = ID2SYM(rb_intern("symbolize_keys"));
sym_reconnect = ID2SYM(rb_intern("reconnect")); sym_reconnect = ID2SYM(rb_intern("reconnect"));

5
ext/mysql2_ext.h
View File

@ -1,3 +1,4 @@
#include <time.h>
#include <ruby.h> #include <ruby.h>
#include <mysql/mysql.h> #include <mysql/mysql.h>
@ -10,8 +11,8 @@
int utf8Encoding, binaryEncoding; int utf8Encoding, binaryEncoding;
#endif #endif
// VALUE cBigDecimal; static VALUE cBigDecimal, cDate, cDateTime;
// ID intern_new; ID intern_new, intern_local;
/* Mysql2::Client */ /* Mysql2::Client */
#define GetMysql2Client(obj, sval) (sval = (MYSQL*)DATA_PTR(obj)); #define GetMysql2Client(obj, sval) (sval = (MYSQL*)DATA_PTR(obj));