X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=classic-tests%2Ftables.lisp;h=44d7ad279fa79a6d5fd1ed231ce28d39391cffc5;hb=5691bb90517d7c565a141d131da76c3de1f8d566;hp=7d5daa51571a2c4ec60c5948a6f64a2f69f54fe5;hpb=39d3fefaebf35a19a211d1ab6552d7ff54faccd2;p=clsql.git

diff --git a/classic-tests/tables.lisp b/classic-tests/tables.lisp
index 7d5daa5..44d7ad2 100644
--- a/classic-tests/tables.lisp
+++ b/classic-tests/tables.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          tables.cl
+;;;; Name:          tables.lisp
 ;;;; Purpose:       Table creation tests in CLSQL
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
@@ -28,7 +28,7 @@
 ;;;  (:postgresql ("localhost" "another-db" "user2" "dont-tell"))
 ;;;  (:postgresql-socket ("pg-server" "a-db-name" "user" "secret-password")))
 
-(in-package :clsql-tests)
+(in-package #:clsql-classic-tests)
 
 (defvar *config-pathname*
   (make-pathname :default (user-homedir-pathname)
@@ -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)
 	     )