r9241: add type-modified database identifier support to SELECT

[clsql.git] / tests / test-fdml.lisp

diff --git a/tests/test-fdml.lisp b/tests/test-fdml.lisp
index f7ee00504df2bddb8dba1c3f803a06c092a931be..1134c913193a35001b362ae711ad12d6c791186c 100644 (file)
--- a/tests/test-fdml.lisp
+++ b/tests/test-fdml.lisp
@@ -276,11 +276,11 @@
 
 (deftest :fdml/select/13
      (multiple-value-bind (results field-names) 
-        (clsql:select [emplid] [last-name] [married] :from [employee] 
+        (clsql:select [emplid] [last-name] :from [employee] 
                       :where [= [emplid] 1])
        (values results (mapcar #'string-downcase field-names)))
- ((1 "Lenin" "t"))
- ("emplid" "last_name" "married"))
+ ((1 "Lenin"))
+ ("emplid" "last_name"))
 
 (deftest :fdml/select/14
      (floatp (car (clsql:select [height] :from [employee] :where [= [emplid] 1] 
@@ -288,11 +288,31 @@
   t)
 
 (deftest :fdml/select/15
-    (clsql:select [married] :from [employee] 
-     :where [= [emplid] 4]
+    (multiple-value-bind (rows field-names)
+       (clsql:select [emplid] [street-number] [street-name] [city_field] [zip] 
+        :from [address]
+        :where [= 1 [emplid]])
+      (values
+       rows
+       (mapcar #'string-downcase field-names)))
+  ((1 10 "Park Place" "Leningrad" 123))
+  ("emplid" "street_number" "street_name" "city_field" "zip"))
+
+(deftest :fdml/select/16
+    (clsql:select [emplid] :from [employee] :where [= 1 [emplid]]
+     :field-names nil)
+  ((1)))
+
+(deftest :fdml/select/17
+    (clsql:select [emplid] [last-name] :from [employee] :where [= 1 [emplid]]
+     :field-names nil)
+  ((1 "Lenin")))
+
+(deftest :fdml/select/18
+    (clsql:select [emplid :string] [last-name] :from [employee] :where [= 1 [emplid]]
      :field-names nil)
- (("f")))
- 
+  (("1" "Lenin")))
+
 ;(deftest :fdml/select/11
 ;    (clsql:select [emplid] :from [employee]
 ;                :where [= [emplid] [any [select [companyid] :from [company]]]]
@@ -329,7 +349,21 @@
       collect (concatenate 'string forename " " surname))
   ("Yuri Andropov" "Leonid Brezhnev" "Konstantin Chernenko" "Mikhail Gorbachev"
                    "Nikita Kruschev" "Vladamir Lenin" "Vladamir Putin"
-                   "Josef Stalin" "Leon Trotsky" "Boris Yeltsin"))
+   "Josef Stalin" "Leon Trotsky" "Boris Yeltsin"))
+
+(deftest :fdml/loop/2
+    (loop for (emplid)
+      being each tuple in
+      [select [emplid] :from [address] :order-by [emplid]]
+     collect emplid)
+  (1 2))
+
+(deftest :fdml/loop/3
+    (loop for emplid
+      being each tuple in
+      [select [emplid] :from [address] :order-by [emplid]]
+      collect emplid)
+  (1 2))
 
 ;; starts a transaction deletes a record and then rolls back the deletion 
 (deftest :fdml/transaction/1