X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-syntax.lisp;h=65efd9830bf414e2ede51e8290e6c9720a8d0ce7;hp=c2007f676f6130987337e33e87756519dd59ddd6;hb=d2d49ab13c98bc7a1819a0fd3968268a5567bdc3;hpb=9a70270bf9a1d60323ded33ce52bd0904544c70b

diff --git a/tests/test-syntax.lisp b/tests/test-syntax.lisp
index c2007f6..65efd98 100644
--- a/tests/test-syntax.lisp
+++ b/tests/test-syntax.lisp
@@ -1,25 +1,25 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; ======================================================================
-;;;; File:    test-syntax.lisp
-;;;; Author:  Marcus Pearce <m.t.pearce@city.ac.uk>
-;;;; Created: 30/03/2004
-;;;; Updated: $Id$
-;;;; ======================================================================
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Description ==========================================================
-;;;; ======================================================================
+;;;; Name:     clsql.asd
+;;;; Purpose:  Tests for the CLSQL Symbolic SQL syntax.
+;;;; Authors:  Marcus Pearce and Kevin M. Rosenberg
+;;;; Created:  March 2004
 ;;;;
-;;;; Tests for the CLSQL Symbolic SQL syntax. 
-;;;;
-;;;; ======================================================================
+;;;; CLSQL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
+;;;; *************************************************************************
 
 (in-package #:clsql-tests)
 
 #.(clsql:locally-enable-sql-reader-syntax)
 
+
 (setq *rt-syntax*
       '(
-	
+
 (deftest :syntax/generic/1
     (clsql:sql "foo")
   "'foo'")
@@ -40,6 +40,9 @@
     (clsql:sql ["SELECT FOO,BAR FROM BAZ"])
   "SELECT FOO,BAR FROM BAZ")
 
+(deftest :syntax/generic/6
+    (clsql:sql "What's up Doc?")
+  "'What''s up Doc?'")
 
 (deftest :syntax/ident/1
     (clsql:sql [foo])
@@ -50,33 +53,143 @@
   "FOO.BAR")
 
 (deftest :syntax/ident/3
-    (clsql:sql ["foo" bar])
-  "FOO.BAR")
+    (clsql:sql [foo :integer])
+  "FOO")
 
-;(deftest :syntax/ident/4
-;    (clsql:sql [foo "bar"])
-;  "FOO \"bar\"")
+(deftest :syntax/ident/4
+    (clsql:sql [foo bar :integer])
+  "FOO.BAR")
 
 (deftest :syntax/ident/5
-    (clsql:sql [foo :integer])
-  "FOO INTEGER")
+    (clsql:sql [foo "bar"])
+    "FOO \"bar\"")
 
 (deftest :syntax/ident/6
-    (clsql:sql [foo bar :integer])
-  "FOO.BAR INTEGER")
+    (clsql:sql ["foo" bar])
+ "\"foo\".BAR")
 
 (deftest :syntax/ident/7
     (clsql:sql ["foo" bar :integer])
-  "FOO.BAR INTEGER")
+ "\"foo\".BAR")
 
 
-(deftest :syntax/value/1
+(deftest :syntax/attribute/1
+    (clsql:sql (clsql:sql-expression :table 'foo :attribute 'bar))
+  "FOO.BAR")
+
+(deftest :syntax/attribute/2
+    (clsql:sql (clsql:sql-expression :table 'foo :attribute "bar"))
+  "FOO.\"bar\"")
+
+(deftest :syntax/attribute/3
+    (clsql:sql (clsql:sql-expression :table "foo" :attribute 'bar))
+  "\"foo\".BAR")
+
+(deftest :syntax/attribute/4
+    (clsql:sql (clsql:sql-expression :table "foo" :attribute "bar"))
+  "\"foo\".\"bar\"")
+
+
+(deftest :syntax/subquery/1
     (clsql:sql [any '(3 4)])
-  "(ANY ((3,4)))")
+ "ANY((3,4))")
+
+(deftest :syntax/subquery/2
+    (clsql:sql [in [foo] '(foo bar baz)])
+  "(FOO IN (FOO,BAR,BAZ))")
+
+(deftest :syntax/subquery/3
+    (clsql:sql [all '(foo bar baz)])
+  "ALL((FOO,BAR,BAZ))")
+
+(deftest :syntax/subquery/4
+    (clsql:sql [exists '(foo bar baz)])
+  "EXISTS((FOO,BAR,BAZ))")
+
+(deftest :syntax/subquery/5
+    (clsql:sql [some '(foo bar baz)])
+  "SOME((FOO,BAR,BAZ))")
+
+
+(deftest :syntax/aggregate/1
+    (clsql:sql [max [+ [foo] [* 1000 [bar]]]])
+ "MAX((FOO + (1000 * BAR)))")
+
+(deftest :syntax/aggregate/2
+    (clsql:sql [avg [+ [foo] [* 1000 [bar]]]])
+ "AVG((FOO + (1000 * BAR)))")
+
+(deftest :syntax/aggregate/3
+    (clsql:sql [min [+ [foo] [* 1000 [bar]]]])
+ "MIN((FOO + (1000 * BAR)))")
+
+(deftest :syntax/aggregate/4
+    (clsql:sql [sum [foo] [bar]])
+ "SUM(FOO,BAR)")
+
+(deftest :syntax/aggregate/5
+    (clsql:sql [count [foo]])
+ "COUNT(FOO)")
+
+
+(deftest :syntax/logical/1
+    (values (clsql:sql [and [foo] [bar]])
+	    (clsql:sql [or [foo] [bar]]))
+  "(FOO AND BAR)"
+  "(FOO OR BAR)")
+
+(deftest :syntax/logical/2
+    (clsql:sql [not [foo]])
+  "(NOT (FOO))")
+
+;;; Test how we apply logical operators when we have different numbers of children
+;;; This is useful if we wish to (apply #'sql-and some-list) without having to do
+;;; alot of length checking
+(deftest :syntax/logical/3
+    (values (clsql:sql [and ])
+	    (clsql:sql [and [foo]])
+	    (clsql:sql [and [not [foo]]])
+	    (clsql:sql [and [foo] [bar] [baz]]))
+  ""
+  "FOO"
+  "(NOT (FOO))"
+  "(FOO AND BAR AND BAZ)")
+
+(deftest :syntax/logical/4
+    (clsql:sql [and [= [foo] [bar]]])
+  "(FOO = BAR)")
+
+(deftest :syntax/logical/5
+  (clsql:sql [and [= [foo] [bar]]
+		  [= [bar] [bast]]
+		  [= [block] [blech]]])
+  "((FOO = BAR) AND (BAR = BAST) AND (BLOCK = BLECH))")
+
+(deftest :syntax/logical/6
+    (clsql:sql
+     (apply #'sql-and
+	    (list [= [foo] [bar]]
+		  [and ]
+		  [and [= [bar] [bast]]])))
+  "((FOO = BAR) AND (BAR = BAST))")
+
+
+(deftest :syntax/null/1
+    (clsql:sql [null [foo]])
+  "(FOO IS NULL)")
+
+(deftest :syntax/null/2
+    (clsql:sql [not [null [foo]]])
+  "(NOT ((FOO IS NULL)))")
+
+(deftest :syntax/null/3
+    (clsql:sql [null])
+  "NULL")
+
+(deftest :syntax/null/4
+    (clsql:sql [not [null]])
+  "(NOT (NULL))")
 
-(deftest :syntax/value/2
-    (clsql:sql [* 2 3])
-  "(2 * 3)")
 
 
 (deftest :syntax/relational/1
@@ -88,6 +201,140 @@
       (clsql:sql [> [foo] x]))
   "(FOO > 10)")
 
+(deftest :syntax/relational/3
+    (clsql:sql [>= [baz] [beep]])
+  "(BAZ >= BEEP)")
+
+(deftest :syntax/relational/4
+    (clsql:sql [< [baz] [beep]])
+  "(BAZ < BEEP)")
+
+(deftest :syntax/relational/5
+    (clsql:sql [= [baz] [beep]])
+  "(BAZ = BEEP)")
+
+(deftest :syntax/relational/6
+    (clsql:sql [<> [baz] [beep]])
+  "(BAZ <> BEEP)")
+
+
+(deftest :syntax/between/1
+    (clsql:sql [between [- [foo] 1] [* [bar] 5] [/ [baz] 9]])
+  "(FOO - 1) BETWEEN (BAR * 5) AND (BAZ / 9)")
+
+(deftest :syntax/between/2
+    (clsql:sql [not [between [- [foo] 1] [* [bar] 5] [/ [baz] 9]]])
+  "(NOT ((FOO - 1) BETWEEN (BAR * 5) AND (BAZ / 9)))")
+
+
+(deftest :syntax/arithmetic/1
+    (clsql:sql [+ [foo bar] [baz]])
+ "(FOO.BAR + BAZ)")
+
+(deftest :syntax/arithmetic/2
+    (clsql:sql [- [foo bar] [baz]])
+ "(FOO.BAR - BAZ)")
+
+(deftest :syntax/arithmetic/3
+    (clsql:sql [/ [foo bar] [baz]])
+ "(FOO.BAR / BAZ)")
+
+(deftest :syntax/arithmetic/4
+    (clsql:sql [* [foo bar] [baz]])
+ "(FOO.BAR * BAZ)")
+
+(deftest :syntax/arithmetic/5
+    (clsql:sql [- [foo bar]])
+ "(- (FOO.BAR))")
+
+(deftest :syntax/arithmetic/6
+    (clsql:sql [* 2 3])
+  "(2 * 3)")
+
+
+(deftest :syntax/substr/1
+    (clsql:sql [substr [hello] 1 4])
+ "SUBSTR(HELLO,1,4)")
+
+(deftest :syntax/substring/1
+    (clsql:sql [substring [hello] 1 4])
+ "SUBSTRING(HELLO,1,4)")
+
+
+(deftest :syntax/concat/1
+    (clsql:sql [|| [foo] [bar] [baz]])
+ "(FOO || BAR || BAZ)")
+
+(deftest :syntax/concat/2
+    (clsql:sql [concat [foo] [bar]])
+ "CONCAT(FOO,BAR)")
+
+
+(deftest :syntax/pattern/1
+    (clsql:sql [like [foo] "%v"])
+  "(FOO LIKE '%v')")
+
+(deftest :syntax/pattern/2
+    (clsql:sql [not [like [foo] "%v"]])
+  "(NOT ((FOO LIKE '%v')))")
+
+
+(deftest :syntax/distinct/1
+    (clsql:sql [distinct [foo bar :string]])
+ "DISTINCT FOO.BAR")
+
+(deftest :syntax/distinct/2
+    (clsql:sql [distinct [foo :string] [bar :integer]])
+ "DISTINCT FOO, BAR")
+
+
+(deftest :syntax/order-by/1
+    (clsql:sql [order-by [foo]])
+ "ORDER BY FOO")
+
+(deftest :syntax/group-by/1
+    (clsql:sql [group-by [foo]])
+ "GROUP BY FOO")
+
+(deftest :syntax/group-by/2
+    (clsql:sql
+     (clsql-sys::make-query [foo] [bar] [count [foo]]
+      :from [table]
+      :group-by '([foo] [bar])
+      :order-by '([foo] [bar])))
+  "SELECT FOO,BAR,COUNT(FOO) FROM TABLE GROUP BY FOO,BAR ORDER BY FOO,BAR")
+
+
+(deftest :syntax/coalesce/1
+    (clsql:sql [coalesce [foo] [bar] "not specified"])
+ "COALESCE(FOO,BAR,'not specified')")
+
+(deftest :syntax/coalesce/2
+    (clsql:sql [nvl [foo] "not specified"])
+ "COALESCE(FOO,'not specified')")
+
+(deftest :syntax/nvl/1
+    (clsql:sql [nvl [foo] "not specified"])
+ "COALESCE(FOO,'not specified')")
+
+
+
+(deftest :syntax/sets/1
+    (clsql:sql [union [select [foo] :from [bar]] [select [baz] :from [bar]]])
+ "SELECT FOO FROM BAR UNION SELECT BAZ FROM BAR")
+
+(deftest :syntax/sets/2
+    (clsql:sql [intersect [select [foo] :from [bar]] [select [baz] :from [bar]]])
+ "SELECT FOO FROM BAR INTERSECT SELECT BAZ FROM BAR")
+
+(deftest :syntax/sets/3
+    (clsql:sql [except [select [foo] :from [bar]] [select [baz] :from [bar]]])
+ "SELECT FOO FROM BAR EXCEPT SELECT BAZ FROM BAR")
+
+(deftest :syntax/sets/4
+    (clsql:sql [minus [select [foo] :from [bar]] [select [baz] :from [bar]]])
+ "SELECT FOO FROM BAR MINUS SELECT BAZ FROM BAR")
+
 
 (deftest :syntax/function/1
     (clsql:sql [function "COS" [age]])
@@ -97,11 +344,12 @@
     (clsql:sql [function "TO_DATE" "02/06/99" "mm/DD/RR"])
   "TO_DATE('02/06/99','mm/DD/RR')")
 
+
 (deftest :syntax/query/1
     (clsql:sql [select [person_id] [surname] :from [person]])
   "SELECT PERSON_ID,SURNAME FROM PERSON")
 
-(deftest :syntax/query/2 
+(deftest :syntax/query/2
     (clsql:sql [select [foo] [bar *]
                       :from '([baz] [bar])
                       :where [or [= [foo] 3]
@@ -118,19 +366,19 @@
 (deftest :syntax/query/4
     (clsql:sql [select [count [*]] :from [emp]])
   "SELECT COUNT(*) FROM EMP")
-  
 
-(deftest :syntax/expression1
+
+(deftest :syntax/expression/1
     (clsql:sql
      (clsql:sql-operation
       'select
       (clsql:sql-expression :table 'foo :attribute 'bar)
       (clsql:sql-expression :attribute 'baz)
-      :from (list 
+      :from (list
              (clsql:sql-expression :table 'foo)
              (clsql:sql-expression :table 'quux))
       :where
-      (clsql:sql-operation 'or 
+      (clsql:sql-operation 'or
                           (clsql:sql-operation
                            '>
                            (clsql:sql-expression :attribute 'baz)
@@ -141,7 +389,7 @@
                                                 :attribute 'bar)
                            "SU%"))))
   "SELECT FOO.BAR,BAZ FROM FOO,QUUX WHERE ((BAZ > 3) OR (FOO.BAR LIKE 'SU%'))")
-  
+
 (deftest :syntax/expression/2
     (clsql:sql
      (apply (clsql:sql-operator 'and)