Fixed bug reported by JTK related to the not-null sql-expression

[clsql.git] / tests / test-syntax.lisp

diff --git a/tests/test-syntax.lisp b/tests/test-syntax.lisp
index 65efd9830bf414e2ede51e8290e6c9720a8d0ce7..9bd666247ff860a86def758c4b4a6a528bd51364 100644 (file)
--- a/tests/test-syntax.lisp
+++ b/tests/test-syntax.lisp
@@ -14,7 +14,7 @@
 
 (in-package #:clsql-tests)
 
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
 
 
 (setq *rt-syntax*
@@ -190,6 +190,18 @@
     (clsql:sql [not [null]])
   "(NOT (NULL))")
 
+(deftest :syntax/null/5
+    (clsql:sql [is [foo.bar] [null]])
+  "(FOO.BAR IS NULL)")
+
+(deftest :syntax/null/6
+    (clsql:sql [is [foo.bar] [not-null]])
+  "(FOO.BAR IS NOT NULL)")
+
+(deftest :syntax/null/7
+    (clsql:sql [not-null [foo.bar]])
+  "(FOO.BAR IS NOT NULL)")
+
 
 
 (deftest :syntax/relational/1
@@ -409,4 +421,18 @@
 
 ))
 
-#.(clsql:restore-sql-reader-syntax-state)
+(defun test-output-sql/sql-ident-table ()
+  (let ((tests `((,(make-instance 'sql-ident-table :name :foo) "FOO")
+                (,(make-instance 'sql-ident-table :name :foo-bar) "FOO_BAR")
+                (,(make-instance 'sql-ident-table :name "foo") "\"foo\"")
+                (,(make-instance 'sql-ident-table :name '|foo bar|) "\"foo bar\"")
+                (,(make-instance 'sql-ident-table :name :foo :table-alias :bar) "FOO BAR" )
+                (,(make-instance 'sql-ident-table :name :foo_bar :table-alias :bar-bast) "FOO_BAR BAR_BAST")
+                (,(make-instance 'sql-ident-table :name "foo" :table-alias "Bar") "\"foo\" \"Bar\"")
+                (,(make-instance 'sql-ident-table :name '|foo bar| :table-alias :bast) "\"foo bar\" BAST"))))
+    (loop for (test expected-result) in tests
+         for test-out = (with-output-to-string (*sql-stream*) (output-sql test nil))
+         do (assert (string-equal test-out expected-result)
+                    (test test-out expected-result)
+                    "Test:~s didnt match ~S"
+                    test-out expected-result))))