X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-syntax.lisp;h=04ea99cbe1c3857383fe98d3b6face4079c285ad;hb=2961f4f122593e9d4875e88e6af159de28c8dd47;hp=8591817cf58cf58d68c53d50942fc3b26f8ed34c;hpb=e303385b84c6246c7d60ebd95d764a282a181a23;p=clsql.git

diff --git a/tests/test-syntax.lisp b/tests/test-syntax.lisp
index 8591817..04ea99c 100644
--- a/tests/test-syntax.lisp
+++ b/tests/test-syntax.lisp
@@ -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])
@@ -206,6 +209,10 @@
 
 (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)")
 
 
@@ -213,6 +220,10 @@
     (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"])
@@ -249,6 +260,11 @@
     (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]]])
@@ -264,7 +280,7 @@
 
 (deftest :syntax/sets/4
     (clsql:sql [minus [select [foo] :from [bar]] [select [baz] :from [bar]]])
- "SELECT FOO FROM BAR EXCEPT SELECT BAZ FROM BAR")
+ "SELECT FOO FROM BAR MINUS SELECT BAZ FROM BAR")
 
 
 (deftest :syntax/function/1