X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=tests%2Ftest-fddl.lisp;h=c5c305b3828d3d4aa1ac694df734e8949fb5339a;hp=b75f2cf2dbdc6ceb60ca2d091ed3dd8c65623c14;hb=fdd069770e32d0cfa4b66d6e5cfd4540197660ba;hpb=7c7edf1d85706148f55a8507a261d024defa0c7c

diff --git a/tests/test-fddl.lisp b/tests/test-fddl.lisp
index b75f2cf..c5c305b 100644
--- a/tests/test-fddl.lisp
+++ b/tests/test-fddl.lisp
@@ -119,7 +119,7 @@
   t)
 
 (deftest :fddl/attributes/7
-    (and (member (clsql:attribute-type [bd_utime] [employee]) '(:bigint :int8 :number)) t)
+    (and (member (clsql:attribute-type [bd_utime] [employee]) '(:bigint :int8 :char)) t)
   t)
 
 
@@ -213,7 +213,7 @@
       (apply #'values result))
   t t t)
 
-;; test list-table-indexes
+;; test list-indexes with keyword :ON 
 (deftest :fddl/index/3
     (progn
       (clsql:create-table [i3test] '(([a] (string 10))
@@ -229,7 +229,7 @@
        (sort 
 	(mapcar 
 	 #'string-downcase
-	 (clsql:list-table-indexes [i3test] :owner *test-database-user*))
+	 (clsql:list-indexes :on [i3test] :owner *test-database-user*))
 	#'string-lessp)
        (progn
 	 (clsql:drop-index [bar] :on [i3test])
@@ -276,10 +276,16 @@
 	    (max (expt 2 60))
 	    (rest rows (cdr rest)))
 	   ((= i (length rows)) t)
-	 (let ((row (car rest))
-	       (index (1+ i)))
-	   (unless (and (eql (first row) index)
-			(eql (second row) (truncate max index)))
+	 (let ((index (1+ i))
+	       (int (first (car rest)))
+	       (bigint (second (car rest))))
+	   (when (and (or (eq *test-database-type* :oracle)
+			  (and (eq *test-database-type* :odbc)
+			       (eq *test-database-underlying-type* :postgresql)))
+		      (stringp bigint))
+	     (setf bigint (parse-integer bigint)))
+	   (unless (and (eql int index)
+			(eql bigint (truncate max index)))
 	     (return nil))))))
   555 t)