Reading timestamps from SQL

2 files changed, 23 insertions, 7 deletions

diff --git a/src/c/urweb.c b/src/c/urweb.c
index 7a160637..df3ce6e1 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -728,6 +728,7 @@ uw_unit uw_Basis_htmlifyBool_w(uw_context ctx, uw_Basis_bool b) {
 }
 
 #define TIME_FMT "%x %X"
+#define TIME_FMT_PG "%Y-%m-%d %T"
 
 uw_Basis_string uw_Basis_htmlifyTime(uw_context ctx, uw_Basis_time t) {
   size_t len;
@@ -950,10 +951,10 @@ uw_Basis_bool *uw_Basis_stringToBool(uw_context ctx, uw_Basis_string s) {
 }
 
 uw_Basis_time *uw_Basis_stringToTime(uw_context ctx, uw_Basis_string s) {
-  char *end = strchr(s, 0);
+  char *dot = strchr(s, '.'), *end = strchr(s, 0);
   struct tm stm;
 
-  if (strptime(s, TIME_FMT, &stm) == end) {
+  if ((dot ? (*dot = 0, strptime(s, TIME_FMT_PG, &stm)) : strptime(s, TIME_FMT, &stm)) == end) {
     uw_Basis_time *r = uw_malloc(ctx, sizeof(uw_Basis_time));
     *r = mktime(&stm);
     return r;    
@@ -992,11 +993,24 @@ uw_Basis_bool uw_Basis_stringToBool_error(uw_context ctx, uw_Basis_string s) {
 }
 
 uw_Basis_time uw_Basis_stringToTime_error(uw_context ctx, uw_Basis_string s) {
-  char *end = strchr(s, 0);
+  char *dot = strchr(s, '.'), *end = strchr(s, 0);
   struct tm stm = {};
 
-  if (strptime(s, TIME_FMT, &stm) == end)
-    return mktime(&stm);
-  else
-    uw_error(ctx, FATAL, "Can't parse time: %s", s);
+  if (dot) {
+    *dot = 0;
+    if (strptime(s, TIME_FMT_PG, &stm)) {
+      *dot = '.';
+      return mktime(&stm);
+    }
+    else {
+      *dot = '.';
+      uw_error(ctx, FATAL, "Can't parse time: %s", s);
+    }
+  }
+  else {
+    if (strptime(s, TIME_FMT, &stm) == end)
+      return mktime(&stm);
+    else
+      uw_error(ctx, FATAL, "Can't parse time: %s", s);
+  }
 }
diff --git a/src/cjr_print.sml b/src/cjr_print.sml
index 7c0fd73c..01d71872 100644
--- a/src/cjr_print.sml
+++ b/src/cjr_print.sml
@@ -403,6 +403,7 @@ fun p_unsql wontLeakStrings env (tAll as (t, loc)) e =
         else
             box [string "uw_Basis_strdup(ctx, ", e, string ")"]
       | TFfi ("Basis", "bool") => box [string "uw_Basis_stringToBool_error(ctx, ", e, string ")"]
+      | TFfi ("Basis", "time") => box [string "uw_Basis_stringToTime_error(ctx, ", e, string ")"]
       | _ => (ErrorMsg.errorAt loc "Don't know how to unmarshal type from SQL";
               Print.eprefaces' [("Type", p_typ env tAll)];
               string "ERROR")
@@ -1395,6 +1396,7 @@ fun p_sqltype' env (tAll as (t, loc)) =
       | TFfi ("Basis", "float") => "float8"
       | TFfi ("Basis", "string") => "text"
       | TFfi ("Basis", "bool") => "bool"
+      | TFfi ("Basis", "time") => "timestamp"
       | _ => (ErrorMsg.errorAt loc "Don't know SQL equivalent of type";
               Print.eprefaces' [("Type", p_typ env tAll)];
               "ERROR")