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

diff --git a/tests/test-fddl.lisp b/tests/test-fddl.lisp
index 0dc053b..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<))
-  "company" "employee" "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
@@ -59,14 +58,35 @@
                     (clsql:drop-table [foo] :if-does-not-exist :ignore))))
   "comments" "height" "id" "name")
 
+(deftest :fddl/table/4
+    (values
+     (clsql:table-exists-p "MyMixedCase")
+     (progn
+       (clsql:create-table "MyMixedCase" '(([a] integer)))
+       (clsql:table-exists-p "MyMixedCase"))
+     (progn
+       (clsql:drop-table "MyMixedCase")
+       (clsql:table-exists-p "MyMixedCase")))
+  nil t nil)
+
+(deftest :fddl/table/5
+    (prog1
+	(progn
+	  (clsql:create-table "MyMixedCase" '(([a] integer)))
+	  (clsql:execute-command "insert into MyMixedCase values (5)")
+	   (clsql:insert-records :into "MyMixedCase" :values '(6))
+	   (clsql:select [a] :from "MyMixedCase" :order-by '((a :asc))))
+      (clsql:drop-table "MyMixedCase"))
+  ((5) (6)))
+
 (deftest :fddl/attributes/1
     (apply #'values
            (sort 
             (mapcar #'string-downcase
                     (clsql:list-attributes [employee]
-                                          :owner *test-database-user*))
+					   :owner *test-database-user*))
             #'string<))
-  "birthday" "companyid" "email" "emplid" "first_name" "groupid" "height"
+  "bd_utime" "birthday" "ecompanyid" "email" "emplid" "first_name" "groupid" "height"
   "last_name" "managerid" "married")
 
 (deftest :fddl/attributes/2
@@ -76,26 +96,31 @@
                     (clsql:list-attribute-types [employee]
                                                :owner *test-database-user*))
             #'string<))
-  "birthday" "companyid" "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
 (deftest :fddl/attributes/3
-    (and (member (clsql:attribute-type [emplid] [employee]) '(:int :integer :int4)) t)
+    (and (member (clsql:attribute-type [emplid] [employee]) '(:int :integer :int4 :number)) t)
   t)
 
 (deftest :fddl/attributes/4
-    (clsql:attribute-type [first-name] [employee]) 
-  :varchar 30 nil 1)
+    (multiple-value-bind (type length scale nullable)
+	(clsql:attribute-type [first-name] [employee])
+      (values (clsql-sys:in type :varchar :varchar2) length scale nullable))
+  t 30 nil 1)
 
 (deftest :fddl/attributes/5
-    (and (member (clsql:attribute-type [birthday] [employee]) '(:datetime :timestamp)) t)
+    (and (member (clsql:attribute-type [birthday] [employee]) '(:datetime :timestamp :date)) t)
   t)
 
 (deftest :fddl/attributes/6
-    (and (member (clsql:attribute-type [height] [employee]) '(:float :float8)) t)
+    (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
@@ -112,7 +137,7 @@
   t nil)
   
   ;; create a view, list its attributes and drop it 
-(when (clsql-base:db-type-has-views? *test-database-underlying-type*)
+(when (clsql-sys:db-type-has-views? *test-database-underlying-type*)
   (deftest :fddl/view/2
       (progn (clsql:create-view [lenins-group]
 				:as [select [first-name] [last-name] [email]
@@ -188,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))
@@ -204,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])
@@ -243,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)