X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-fddl.lisp;h=c5c305b3828d3d4aa1ac694df734e8949fb5339a;hb=fdd069770e32d0cfa4b66d6e5cfd4540197660ba;hp=301c37c0af89f440ac8dd135253ac9ef331a60fe;hpb=4d46d4d631cad1c4fe3accbe99f4182d975fd678;p=clsql.git

diff --git a/tests/test-fddl.lisp b/tests/test-fddl.lisp
index 301c37c..c5c305b 100644
--- a/tests/test-fddl.lisp
+++ b/tests/test-fddl.lisp
@@ -24,11 +24,10 @@
 	
 ;; list current tables 
 (deftest :fddl/table/1
-    (apply #'values 
-           (sort (mapcar #'string-downcase
-                         (clsql:list-tables :owner *test-database-user*))
-                 #'string<))
-  "addr" "company" "ea_join" "employee" "type_bigint" "type_table")
+    (sort (mapcar #'string-downcase
+		  (clsql:list-tables :owner *test-database-user*))
+     #'string<)
+  ("addr" "big" "company" "ea_join" "employee" "type_bigint" "type_table"))
 
 ;; create a table, test for its existence, drop it and test again 
 (deftest :fddl/table/2
@@ -87,7 +86,7 @@
                     (clsql:list-attributes [employee]
 					   :owner *test-database-user*))
             #'string<))
-  "birthday" "ecompanyid" "email" "emplid" "first_name" "groupid" "height"
+  "bd_utime" "birthday" "ecompanyid" "email" "emplid" "first_name" "groupid" "height"
   "last_name" "managerid" "married")
 
 (deftest :fddl/attributes/2
@@ -97,7 +96,7 @@
                     (clsql:list-attribute-types [employee]
                                                :owner *test-database-user*))
             #'string<))
-  "birthday" "ecompanyid" "email" "emplid" "first_name" "groupid" "height"
+  "bd_utime" "birthday" "ecompanyid" "email" "emplid" "first_name" "groupid" "height"
   "last_name" "managerid" "married")
 
 ;; Attribute types are vendor specific so need to test a range
@@ -119,6 +118,9 @@
     (and (member (clsql:attribute-type [height] [employee]) '(:float :float8 :number)) t)
   t)
 
+(deftest :fddl/attributes/7
+    (and (member (clsql:attribute-type [bd_utime] [employee]) '(:bigint :int8 :char)) t)
+  t)
 
 
 ;; create a view, test for existence, drop it and test again
@@ -211,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))
@@ -227,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])
@@ -266,6 +268,28 @@
         (clsql:drop-sequence [foo] :if-does-not-exist :ignore)))
   6)
 
+(deftest :fddl/big/1 
+    (let ((rows (clsql:select [*] :from [big] :field-names nil)))
+      (values
+       (length rows)
+       (do ((i 0 (1+ i))
+	    (max (expt 2 60))
+	    (rest rows (cdr rest)))
+	   ((= i (length rows)) t)
+	 (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)
+
+	   
 ))
 
 #.(clsql:restore-sql-reader-syntax-state)