X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fdatabase.lisp;h=285d3e269b237e4d6817854465f7d01cfe78b035;hp=f155732566e4d640011eaf5e9f88fd4eacc22ff3;hb=748f18aeaee5e0512317657a86f7a019f06e12de;hpb=e622ee6f4bf2b9fe81af59d566e651c983a4833b

diff --git a/sql/database.lisp b/sql/database.lisp
index f155732..285d3e2 100644
--- a/sql/database.lisp
+++ b/sql/database.lisp
@@ -63,7 +63,9 @@ error is signalled."
                    :message
 		   (format nil "There exists ~A database called ~A."
 			   (if (zerop count) "no" "more than one")
-			   database)))))))
+			   database)))))
+    (null
+     (error "A database must be specified rather than NIL."))))
 
 
 (defun connect (connection-spec
@@ -120,9 +122,9 @@ be taken from this pool."
                (restart-case
 		   (error 'sql-connection-error
 			  :message
-			  "There is an existing connection ~A to database ~A."
+			  (format nil "There is an existing connection ~A to database ~A."
 			  old-db
-			  (database-name old-db))
+			  (database-name old-db)))
                  (create-new ()
                    :report "Create a new connection."
                    (setq result
@@ -214,7 +216,7 @@ database connection cannot be closed, an error is signalled."
 	       (let ((db (find-database database :errorp nil)))
 		 (when (null db)
 		   (if (and database error)
-		       (error 'clsql-generic-error
+		       (error 'sql-connection-error
 			      :message
 			      (format nil "Unable to find database with connection-spec ~A." database))
 		       (return-from reconnect nil)))
@@ -276,29 +278,38 @@ database is printed."
     (values)))
 
 (defun create-database (connection-spec &key database-type)
+  "This function creates a database in the database system specified
+by DATABASE-TYPE."
   (when (stringp connection-spec)
     (setq connection-spec (string-to-list-connection-spec connection-spec)))
   (database-create connection-spec database-type))
 
 (defun probe-database (connection-spec &key database-type)
+  "This function tests for the existence of a database in the database
+system specified by DATABASE-TYPE."
   (when (stringp connection-spec)
     (setq connection-spec (string-to-list-connection-spec connection-spec)))
   (database-probe connection-spec database-type))
 
 (defun destroy-database (connection-spec &key database-type)
+  "This function destroys a database in the database system specified
+by DATABASE-TYPE."
   (when (stringp connection-spec)
     (setq connection-spec (string-to-list-connection-spec connection-spec)))
   (database-destroy connection-spec database-type))
 
 (defun list-databases (connection-spec &key database-type)
+  "This function returns a list of databases existing in the database
+system specified by DATABASE-TYPE."
   (when (stringp connection-spec)
     (setq connection-spec (string-to-list-connection-spec connection-spec)))
   (database-list connection-spec database-type))
 
 (defmacro with-database ((db-var connection-spec &rest connect-args) &body body)
-  "Evaluate the body in an environment, where `db-var' is bound to the
-database connection given by `connection-spec' and `connect-args'.
-The connection is automatically closed or released to the pool on exit from the body."
+  "Evaluate the body in an environment, where DB-VAR is bound to the
+database connection given by CONNECTION-SPEC and CONNECT-ARGS.  The
+connection is automatically closed or released to the pool on exit
+from the body."
   (let ((result (gensym "result-")))
     (unless db-var (setf db-var '*default-database*))
     `(let ((,db-var (connect ,connection-spec ,@connect-args))