X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-fdml.lisp;h=f3b9d13f718ff921f9bbafc966978d320a9fb0e2;hb=4d1a3100285889c84e63f8f4500dbd4b6c1f8ddc;hp=8d87097e8db1b3de950c3c0197d870b1dcd60664;hpb=f716bb1161cf9e89a96945c4a444244f9d303691;p=clsql.git

diff --git a/tests/test-fdml.lisp b/tests/test-fdml.lisp
index 8d87097..f3b9d13 100644
--- a/tests/test-fdml.lisp
+++ b/tests/test-fdml.lisp
@@ -128,9 +128,13 @@
   (("Vladamir" "Lenin" "lenin@soviet.org")))
 
 
+;; Computed values are not always classified as numeric by psqlodbc
 (deftest :fdml/query/1
-    (clsql:query "SELECT COUNT(*) FROM EMPLOYEE WHERE (EMAIL LIKE '%org')" :field-names nil)
-  (("10")))
+    (let ((count (caar (clsql:query "SELECT COUNT(*) FROM EMPLOYEE WHERE (EMAIL LIKE '%org')" :field-names nil))))
+      (if (stringp count)
+	  (nth-value 0 (parse-integer count))
+	count))
+  10)
 
 (deftest :fdml/query/2
     (multiple-value-bind (rows field-names)
@@ -141,6 +145,14 @@
    ("Josef" "Stalin") ("Leon" "Trotsky"))
   ("FIRST_NAME" "LAST_NAME"))
 
+(deftest :fdml/query/3
+    (caar (clsql:query "SELECT EMPLID FROM EMPLOYEE WHERE LAST_NAME = 'Andropov'" :field-names nil))
+  6)
+  
+(deftest :fdml/query/4
+    (typep (caar (clsql:query "SELECT HEIGHT FROM EMPLOYEE WHERE LAST_NAME = 'Andropov'" :field-names nil))
+     'float)
+  t)
   
 (deftest :fdml/execute-command/1
     (values