Mercurial > urweb
comparison 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 |
comparison
equal
deleted
inserted
replaced
2279:32a407902d3b | 2280:985c8016b592 |
---|---|
161 val addSeconds : time -> int -> time | 161 val addSeconds : time -> int -> time |
162 val toSeconds : time -> int | 162 val toSeconds : time -> int |
163 val diffInSeconds : time -> time -> int | 163 val diffInSeconds : time -> time -> int |
164 (* Earlier time first *) | 164 (* Earlier time first *) |
165 val toMilliseconds : time -> int | 165 val toMilliseconds : time -> int |
166 val fromMilliseconds : int -> time | |
166 val diffInMilliseconds : time -> time -> int | 167 val diffInMilliseconds : time -> time -> int |
167 val timef : string -> time -> string (* Uses strftime() format string *) | 168 val timef : string -> time -> string (* Uses strftime() format string *) |
168 val readUtc : string -> option time | 169 val readUtc : string -> option time |
169 | 170 |
170 (* Takes a year, month, day, hour, minute, second. *) | 171 (* Takes a year, month, day, hour, minute, second. *) |
551 val sql_times : t ::: Type -> sql_arith t -> sql_binary t t t | 552 val sql_times : t ::: Type -> sql_arith t -> sql_binary t t t |
552 val sql_div : t ::: Type -> sql_arith t -> sql_binary t t t | 553 val sql_div : t ::: Type -> sql_arith t -> sql_binary t t t |
553 val sql_mod : sql_binary int int int | 554 val sql_mod : sql_binary int int int |
554 | 555 |
555 val sql_eq : t ::: Type -> sql_binary t t bool | 556 val sql_eq : t ::: Type -> sql_binary t t bool |
557 (* Note that the semantics of this operator on nullable types are different than for standard SQL! | |
558 * Instead, we do it the sane way, where [NULL = NULL]. *) | |
559 | |
556 val sql_ne : t ::: Type -> sql_binary t t bool | 560 val sql_ne : t ::: Type -> sql_binary t t bool |
557 val sql_lt : t ::: Type -> sql_binary t t bool | 561 val sql_lt : t ::: Type -> sql_binary t t bool |
558 val sql_le : t ::: Type -> sql_binary t t bool | 562 val sql_le : t ::: Type -> sql_binary t t bool |
559 val sql_gt : t ::: Type -> sql_binary t t bool | 563 val sql_gt : t ::: Type -> sql_binary t t bool |
560 val sql_ge : t ::: Type -> sql_binary t t bool | 564 val sql_ge : t ::: Type -> sql_binary t t bool |