diff lib/ur/basis.urs @ 2280:985c8016b592

Merge.
author Ziv Scully <ziv@mit.edu>
date Thu, 12 Nov 2015 08:46:51 -0500
parents 849404a3af27
children
line wrap: on
line diff
--- a/lib/ur/basis.urs	Wed Nov 11 20:01:48 2015 -0500
+++ b/lib/ur/basis.urs	Thu Nov 12 08:46:51 2015 -0500
@@ -163,6 +163,7 @@
 val diffInSeconds : time -> time -> int
 (* Earlier time first *)
 val toMilliseconds : time -> int
+val fromMilliseconds : int -> time
 val diffInMilliseconds : time -> time -> int
 val timef : string -> time -> string (* Uses strftime() format string *)
 val readUtc : string -> option time
@@ -553,6 +554,9 @@
 val sql_mod : sql_binary int int int
 
 val sql_eq : t ::: Type -> sql_binary t t bool
+(* Note that the semantics of this operator on nullable types are different than for standard SQL!
+ * Instead, we do it the sane way, where [NULL = NULL]. *)
+
 val sql_ne : t ::: Type -> sql_binary t t bool
 val sql_lt : t ::: Type -> sql_binary t t bool
 val sql_le : t ::: Type -> sql_binary t t bool