X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-fdml.lisp;h=26e760e919937be497e3e54512b4725f478fc4a4;hb=8972490fe6f9453c5b70dae4fb1141cf9a67f0db;hp=71a3a9baa04d5bfbd4187032f6103691f71e6f06;hpb=e17f07ac3185371f7d2c989c9780f70767296a54;p=clsql.git

diff --git a/tests/test-fdml.lisp b/tests/test-fdml.lisp
index 71a3a9b..26e760e 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])
@@ -40,7 +40,7 @@
     (progn
       (clsql:insert-records :into [employee] 
                            :attributes '(emplid groupid first_name last_name
-                                         email companyid managerid)
+                                         email ecompanyid managerid)
                            :values '(11 1 "Yuri" "Gagarin" "gagarin@soviet.org"
                                      1 1))
       (values 
@@ -58,7 +58,7 @@
                                       (first_name "Yuri")
                                       (last_name "Gagarin")
                                       (email "gagarin@soviet.org")
-                                      (companyid 1) (managerid 1)))
+                                      (ecompanyid 1) (managerid 1)))
       (values 
        (clsql:select [first-name] [last-name] [email] :from [employee]
                     :where [= [emplid] 11])
@@ -289,14 +289,29 @@
 
 (deftest :fdml/select/15
     (multiple-value-bind (rows field-names)
-	(clsql:select [emplid] [street-number] [street-name] [city_field] [zip] 
+	(clsql:select [addressid] [street-number] [street-name] [city_field] [zip] 
 	 :from [address]
-	 :where [= 1 [emplid]])
+	 :where [= 1 [addressid]])
       (values
        rows
        (mapcar #'string-downcase field-names)))
   ((1 10 "Park Place" "Leningrad" 123))
-  ("emplid" "street_number" "street_name" "city_field" "zip"))
+  ("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)
+  (("1" "Lenin")))
 
 ;(deftest :fdml/select/11
 ;    (clsql:select [emplid] :from [employee]
@@ -337,17 +352,17 @@
    "Josef Stalin" "Leon Trotsky" "Boris Yeltsin"))
 
 (deftest :fdml/loop/2
-    (loop for emplid
+    (loop for (addressid)
       being each tuple in
-      [select [emplid] :from [address] :order-by [emplid]]
-      collect emplid)
-  ((1) (2)))
+      [select [addressid] :from [address] :order-by [addressid]]
+     collect addressid)
+  (1 2))
 
 (deftest :fdml/loop/3
-    (loop for emplid
+    (loop for addressid
       being each tuple in
-      [select [emplid] :from [address] :order-by [emplid] :flatp t]
-      collect emplid)
+      [select [addressid] :from [address] :order-by [addressid]]
+      collect addressid)
   (1 2))
 
 ;; starts a transaction deletes a record and then rolls back the deletion