X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-fdml.lisp;h=df9f28faf52bd6f90be6749dcd83e8d528ba3d6f;hb=aced01441ccf8a826de544ed34bed4d8616a14ee;hp=f7ee00504df2bddb8dba1c3f803a06c092a931be;hpb=f69c5bfba59d54628f9a08b83413ec3df3c92432;p=clsql.git

diff --git a/tests/test-fdml.lisp b/tests/test-fdml.lisp
index f7ee005..df9f28f 100644
--- a/tests/test-fdml.lisp
+++ b/tests/test-fdml.lisp
@@ -27,7 +27,7 @@
     (progn
       (clsql:insert-records :into [employee] 
                            :values `(11 1 "Yuri" "Gagarin" "gagarin@soviet.org"
-                                     1 1 1.85 t ,(clsql-base:get-time)))
+                                     1 1 1.85 t ,(clsql:get-time)))
       (values 
        (clsql:select [first-name] [last-name] [email]
                     :from [employee] :where [= [emplid] 11])
@@ -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 [addressid] [street-number] [street-name] [city_field] [zip] 
+	 :from [address]
+	 :where [= 1 [addressid]])
+      (values
+       rows
+       (mapcar #'string-downcase field-names)))
+  ((1 10 "Park Place" "Leningrad" 123))
+  ("addressid" "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 (addressid)
+      being each tuple in
+      [select [addressid] :from [address] :order-by [addressid]]
+     collect addressid)
+  (1 2))
+
+(deftest :fdml/loop/3
+    (loop for addressid
+      being each tuple in
+      [select [addressid] :from [address] :order-by [addressid]]
+      collect addressid)
+  (1 2))
 
 ;; starts a transaction deletes a record and then rolls back the deletion 
 (deftest :fdml/transaction/1