From d073725a2b58302c1a1d0faf4601df140c242307 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Tue, 28 Apr 2009 09:45:17 -0400 Subject: Switch to using sql_from_items --- tests/join.ur | 6 ++++++ tests/join.urp | 5 +++++ tests/join.urs | 1 + tests/query.ur | 24 ++++++++++++------------ 4 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 tests/join.ur create mode 100644 tests/join.urp create mode 100644 tests/join.urs (limited to 'tests') diff --git a/tests/join.ur b/tests/join.ur new file mode 100644 index 00000000..a883e45f --- /dev/null +++ b/tests/join.ur @@ -0,0 +1,6 @@ +table t : { A : int } + +fun main () = + r <- oneRow (SELECT * FROM t); + r <- oneRow (SELECT * FROM t AS T1, t AS T2); + return diff --git a/tests/join.urp b/tests/join.urp new file mode 100644 index 00000000..2719ecc3 --- /dev/null +++ b/tests/join.urp @@ -0,0 +1,5 @@ +debug +database dbname=join +sql join.sql + +join diff --git a/tests/join.urs b/tests/join.urs new file mode 100644 index 00000000..6ac44e0b --- /dev/null +++ b/tests/join.urs @@ -0,0 +1 @@ +val main : unit -> transaction page diff --git a/tests/query.ur b/tests/query.ur index 334c3d41..5d6264c6 100644 --- a/tests/query.ur +++ b/tests/query.ur @@ -6,18 +6,18 @@ datatype list a = Nil | Cons of a * list a val q1 = (SELECT * FROM t1) val r1 : transaction (list {A : int, B : string, C : float, D : bool}) = - query q1 - (fn fs acc => return (Cons (fs.T1, acc))) - Nil + query q1 + (fn fs acc => return (Cons (fs.T1, acc))) + Nil val r2 : transaction string = - ls <- r1; - return (case ls of - Nil => "Problem" - | Cons ({B = b, ...}, _) => b) + ls <- r1; + return (case ls of + Nil => "Problem" + | Cons ({B = b, ...}, _) => b) -val main : unit -> transaction page = fn () => - s <- r2; - return - {cdata s} - +fun main () : transaction page = + s <- r2; + return + {cdata s} + -- cgit v1.2.3