diff options
author | 2010-12-24 16:41:10 -0500 | |
---|---|---|
committer | 2010-12-24 16:41:10 -0500 | |
commit | 15aa6f21492886d96545da1e0b0e5f8e5d796c8d (patch) | |
tree | b5dcda955d15cd13ca71e4fc21251701d03a0c9a | |
parent | 64b7c504f9c1651a11f29a32a0c0ef5db6fdc982 (diff) |
Top.queryI1; fix definition of uw_Basis_minTime
-rw-r--r-- | lib/ur/top.ur | 6 | ||||
-rw-r--r-- | lib/ur/top.urs | 5 | ||||
-rw-r--r-- | src/c/urweb.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/lib/ur/top.ur b/lib/ur/top.ur index 19259e92..83d5b6af 100644 --- a/lib/ur/top.ur +++ b/lib/ur/top.ur @@ -241,6 +241,12 @@ fun queryI [tables ::: {{Type}}] [exps ::: {Type}] (fn fs _ => f fs) () +fun queryI1 [nm ::: Name] [fs ::: {Type}] (q : sql_query [] [nm = fs] []) + (f : $fs -> transaction unit) = + query q + (fn fs _ => f fs.nm) + () + fun queryX [tables ::: {{Type}}] [exps ::: {Type}] [ctx ::: {Unit}] [inp ::: {Type}] [tables ~ exps] (q : sql_query [] tables exps) (f : $(exps ++ map (fn fields :: {Type} => $fields) tables) diff --git a/lib/ur/top.urs b/lib/ur/top.urs index 74b04ed1..d86ae553 100644 --- a/lib/ur/top.urs +++ b/lib/ur/top.urs @@ -152,6 +152,11 @@ val queryI : tables ::: {{Type}} -> exps ::: {Type} -> transaction unit) -> transaction unit +val queryI1 : nm ::: Name -> fs ::: {Type} + -> sql_query [] [nm = fs] [] + -> ($fs -> transaction unit) + -> transaction unit + val queryX : tables ::: {{Type}} -> exps ::: {Type} -> ctx ::: {Unit} -> inp ::: {Type} -> [tables ~ exps] => sql_query [] tables exps diff --git a/src/c/urweb.c b/src/c/urweb.c index efe50591..77d39ee7 100644 --- a/src/c/urweb.c +++ b/src/c/urweb.c @@ -3415,7 +3415,7 @@ uw_Basis_string uw_Basis_mstrcat(uw_context ctx, ...) { return r; } -const uw_Basis_time minTime = 0; +const uw_Basis_time uw_Basis_minTime = 0; uw_Basis_time uw_Basis_now(uw_context ctx) { return time(NULL); |