diff options
| author |  Ziv Scully <ziv@mit.edu> | 2015-11-12 08:46:51 -0500 |
|---|---|---|
| committer | Ziv Scully <ziv@mit.edu> | 2015-11-12 08:46:51 -0500 |
| commit | 6205c6660874af4147828e2610ca5c2feec834ad (patch) | |
| tree | 3ae1ba40102d50b2e3c434a993e92d3d21d24987 /lib/ur | |
| parent | 7b14b2f01fd0218c0bbe0a5c4071fff190c91ce1 (diff) | |
| parent | dc8c8ed99b79e4f3c3c38f131dd7563148524591 (diff) | |
Merge.
Diffstat (limited to 'lib/ur')
| -rw-r--r-- | lib/ur/basis.urs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ur/basis.urs b/lib/ur/basis.urs index ec6ef599..a4872c32 100644 --- a/lib/ur/basis.urs +++ b/lib/ur/basis.urs @@ -163,6 +163,7 @@ val toSeconds : time -> int 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_div : t ::: Type -> sql_arith t -> sql_binary t t t 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 |