diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2015-11-22 10:39:36 -0500 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2015-11-22 10:39:36 -0500 |
| commit | bf037ce78c2c76a34ecca0fb8bafa5d5be38968a (patch) | |
| tree | 3e91b0d0e8e0fb704c7df444283b6c8c63351f95 /lib/ur/basis.urs | |
| parent | 7d861ea0debf944cb8e3e38d73a8c0197de574b3 (diff) | |
| parent | 638e838a81e1ccc6594fda1920df441eb21577ae (diff) | |
Merge branch 'upstream' into dfsg_clean20151122+dfsg
Diffstat (limited to 'lib/ur/basis.urs')
| -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 |