diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2009-09-15 10:43:01 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2009-09-15 10:43:01 -0400 |
| commit | 3a19d9df41599153b83a77006b87dcae49c97035 (patch) | |
| tree | af899c914ca5c3509abcf245f324dbc1d21c757f /src/mysql.sml | |
| parent | 44eb43907a88455c0cf223a411860a27d59c78b6 (diff) | |
Fix MySQL timestamp input
Diffstat (limited to 'src/mysql.sml')
| -rw-r--r-- | src/mysql.sml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mysql.sml b/src/mysql.sml index 25efc641..eba125c7 100644 --- a/src/mysql.sml +++ b/src/mysql.sml @@ -49,7 +49,7 @@ fun p_buffer_type t = | Float => "MYSQL_TYPE_DOUBLE" | String => "MYSQL_TYPE_STRING" | Bool => "MYSQL_TYPE_LONG" - | Time => "MYSQL_TYPE_TIME" + | Time => "MYSQL_TYPE_TIMESTAMP" | Blob => "MYSQL_TYPE_BLOB" | Channel => "MYSQL_TYPE_LONGLONG" | Client => "MYSQL_TYPE_LONG" @@ -666,7 +666,7 @@ fun p_getcol {loc, wontLeakStrings = _, col = i, typ = t} = string ";", newline, newline, - string "struct tm t = {mt->second, mt->minute, mt->hour, mt->day, mt->month-1, mt->year, 0, 0, -1};", + string "struct tm t = {mt->second, mt->minute, mt->hour, mt->day, mt->month-1, mt->year - 1900, 0, 0, -1};", newline, string "mktime(&t);", newline, @@ -1058,13 +1058,13 @@ fun queryPrepared {loc, id, query, inputs, cols, doCols, nested} = string (ErrorMsg.spanToString loc), string ": error converting to MySQL time\");", newline, - oneField "year" "year", + oneField "year" "year + 1900", box [string "in_buffer", string (Int.toString i), string ".month = tms.tm_mon + 1;", newline], oneField "day" "mday", - oneField "hour" "hour", + oneField "hour" "hour - 1", oneField "minute" "min", oneField "second" "sec", newline, @@ -1339,10 +1339,10 @@ fun dmlPrepared {loc, id, dml, inputs} = string (ErrorMsg.spanToString loc), string ": error converting to MySQL time\");", newline, - oneField "year" "year", - oneField "month" "mon", + oneField "year" "year + 1900", + oneField "month" "mon + 1", oneField "day" "mday", - oneField "hour" "hour", + oneField "hour" "hour - 1", oneField "minute" "min", oneField "second" "sec", newline, |