X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-fddl.lisp;h=41e79d527441ec45745372bd748894dfd8852ef6;hp=ed25a04d2b9a65a396d5aa4b8064cd6b2b7086a0;hb=0b35694f3659e5ee739ea72ce74d798c3f0ddb73;hpb=d2d49ab13c98bc7a1819a0fd3968268a5567bdc3

diff --git a/tests/test-fddl.lisp b/tests/test-fddl.lisp
index ed25a04..41e79d5 100644
--- a/tests/test-fddl.lisp
+++ b/tests/test-fddl.lisp
@@ -16,8 +16,7 @@
 
 
 (in-package #:clsql-tests)
-
-#.(clsql:locally-enable-sql-reader-syntax)
+(clsql-sys:file-enable-sql-reader-syntax)
 
 (def-dataset *ds-fddl*
   (:setup (lambda ()
@@ -45,9 +44,11 @@ B varchar(32))")
 ;; list current tables
 (deftest :fddl/table/1
     (with-dataset *ds-fddl*
-      (sort (mapcar #'string-downcase
-		    (clsql:list-tables ))
-	    #'string<))
+      (let ((tables (sort (mapcar #'string-downcase (clsql:list-tables))
+                          #'string<)))
+        ;; sqlite has a table for autoincrement sequences that we dont care about if
+        ;; it exists
+        (remove "sqlite_sequence" tables :test #'string-equal)))
   ("alpha" "bravo"))
 
 ;; create a table, test for its existence, drop it and test again
@@ -106,7 +107,7 @@ B varchar(32))")
      (progn
        (let ((*backend-warning-behavior*
 	      (if (member *test-database-type*
-			  '(:postgresql :postgresql-socket))
+			  '(:postgresql :postgresql-socket :postgresql-socket3))
 		  :ignore
 		  :warn)))
 	 (case *test-database-underlying-type*
@@ -128,7 +129,7 @@ B varchar(32))")
      (progn
        (let ((*backend-warning-behavior*
 	      (if (member *test-database-type*
-			  '(:postgresql :postgresql-socket))
+			  '(:postgresql :postgresql-socket :postgresql-socket3))
 		  :ignore
 		  :warn)))
 	 (clsql:create-table [foo] '(([bar] integer :not-null)
@@ -169,12 +170,14 @@ B varchar(32))")
     (with-dataset *ds-fddl*
       (multiple-value-bind (type length scale nullable)
 	  (clsql:attribute-type [c] [alpha])
-	(values (clsql-sys:in type :varchar :varchar2) length scale nullable)))
+	(values (clsql-sys:in type :varchar :varchar2 :nvarchar)
+                length scale nullable)))
   t 30 nil 1)
 
 (deftest :fddl/attributes/5
     (with-dataset *ds-fddl*
-      (and (member (clsql:attribute-type [d] [alpha]) '(:datetime :timestamp :date)) t))
+      (and (member (clsql:attribute-type [d] [alpha])
+                   '(:datetime :timestamp :date :smalldatetime)) t))
   t)
 
 (deftest :fddl/attributes/6
@@ -449,5 +452,3 @@ B varchar(32))")
   (nil (t nil) t (t nil)))
 
   ))
-
-#.(clsql:restore-sql-reader-syntax-state)