r8885: pre 2.3.4

[clsql.git] / classic-tests / tables.lisp

diff --git a/classic-tests/tables.lisp b/classic-tests/tables.lisp
index 48fe2951fe1a2fcd8ba9d78b05b4c210e1370193..44d7ad279fa79a6d5fd1ed231ce28d39391cffc5 100644 (file)
--- a/classic-tests/tables.lisp
+++ b/classic-tests/tables.lisp
@@ -76,29 +76,29 @@
       (unwind-protect
           (progn
             (create-test-table db)
-            (dolist (row (query "select * from test_clsql" :database db :types :auto))
+            (dolist (row (query "select * from test_clsql" :database db :result-types :auto))
               (test-table-row row :auto type))
-            (dolist (row (query "select * from test_clsql" :database db :types nil))
+            (dolist (row (query "select * from test_clsql" :database db :result-types nil))
               (test-table-row row nil type))
             (loop for row across (map-query 'vector #'list "select * from test_clsql" 
-                                            :database db :types :auto)
+                                            :database db :result-types :auto)
                   do (test-table-row row :auto type))
             (loop for row across (map-query 'vector #'list "select * from test_clsql" 
-                                            :database db :types nil)
+                                            :database db :result-types nil)
                   do (test-table-row row nil type))
             (loop for row in (map-query 'list #'list "select * from test_clsql" 
-                                        :database db :types nil)
+                                        :database db :result-types nil)
                   do (test-table-row row nil type))
             (loop for row in (map-query 'list #'list "select * from test_clsql" 
-                                        :database db :types :auto)
+                                        :database db :result-types :auto)
                 do (test-table-row row :auto type))
             (test (map-query nil #'list "select * from test_clsql" 
-                             :database db :types :auto)
+                             :database db :result-types :auto)
                   nil
                   :fail-info "Expected NIL result from map-query nil")
             (do-query ((int float bigint str) "select * from test_clsql")
               (test-table-row (list int float bigint str) nil type))
-            (do-query ((int float bigint str) "select * from test_clsql" :types :auto)
+            (do-query ((int float bigint str) "select * from test_clsql" :result-types :auto)
               (test-table-row (list int float bigint str) :auto type))
             (drop-test-table db)
             )
@@ -211,7 +211,7 @@
                   i (clsql:number-to-sql-string (sqrt i))
                   (clsql:number-to-sql-string (sqrt i)))
           db))
-       (let ((res (clsql-mysql::database-query-result-set "select * from test_clsql" db :full-set t :types nil)))
+       (let ((res (clsql-mysql::database-query-result-set "select * from test_clsql" db :full-set t :result-types nil)))
          (setq result (mysql:mysql-num-rows
                        (clsql-mysql::mysql-result-set-res-ptr res)))
          (clsql-mysql::database-dump-result-set res db))
@@ -233,29 +233,29 @@
          (unwind-protect
           (progn
             (create-test-table db)
-            (dolist (row (query "select * from test_clsql" :database db :types :auto))
+            (dolist (row (query "select * from test_clsql" :database db :result-types :auto))
               (test-table-row row :auto type))
-            (dolist (row (query "select * from test_clsql" :database db :types nil))
+            (dolist (row (query "select * from test_clsql" :database db :result-types nil))
               (test-table-row row nil type))
             (loop for row across (map-query 'vector #'list "select * from test_clsql" 
-                                            :database db :types :auto)
+                                            :database db :result-types :auto)
                   do (test-table-row row :auto type))
             (loop for row across (map-query 'vector #'list "select * from test_clsql" 
-                                            :database db :types nil)
+                                            :database db :result-types nil)
                   do (test-table-row row nil type))
             (loop for row in (map-query 'list #'list "select * from test_clsql" 
-                                        :database db :types nil)
+                                        :database db :result-types nil)
                   do (test-table-row row nil type))
             (loop for row in (map-query 'list #'list "select * from test_clsql" 
-                                        :database db :types :auto)
+                                        :database db :result-types :auto)
                 do (test-table-row row :auto type))
             (test (map-query nil #'list "select * from test_clsql" 
-                             :database db :types :auto)
+                             :database db :result-types :auto)
                   nil
                   :fail-info "Expected NIL result from map-query nil")
             (do-query ((int float bigint str) "select * from test_clsql")
               (test-table-row (list int float bigint str) nil type))
-            (do-query ((int float bigint str) "select * from test_clsql" :types :auto)
+            (do-query ((int float bigint str) "select * from test_clsql" :result-types :auto)
               (test-table-row (list int float bigint str) :auto type))
             (drop-test-table db)
             )