+2010-03-21 Kevin Rosenberg <kevin@rosenberg.net>
+ * sql/fdml.lisp: Fix DO-QUERY to actually return the last value of the body
+
2010-03-02 Nathan Bird <nathan@acceleration.net>
* doc/: Added a README on how to build doc; now builds on Ubuntu.
* sql/oodml.lisp: READ-SQL-VALUE now has explicit method for
;;;; Author: Kevin M. Rosenberg
;;;; Created: Feb 2002
;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
;;;;
;;;; CLSQL users are granted the rights to distribute and use this software
;;;; as governed by the terms of the Lisp Lesser GNU Public License
*mysql-library-loaded*)
(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
- (clsql:push-library-path clsql-mysql-system::*library-file-dir*)
+ (unless *mysql-library-loaded*
+ (clsql:push-library-path clsql-mysql-system::*library-file-dir*)
- (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
- :module "mysql"
- :supporting-libraries *mysql-supporting-libraries*)
-
- (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
- :module "clsql-mysql"
- :supporting-libraries *mysql-supporting-libraries*)
- (setq *mysql-library-loaded* t))
+ (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
+ :module "mysql"
+ :supporting-libraries *mysql-supporting-libraries*)
+ (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
+ :module "clsql-mysql"
+ :supporting-libraries *mysql-supporting-libraries*)
+ (setq *mysql-library-loaded* t)))
(clsql-sys:database-type-load-foreign :mysql)
-
(qe (gensym "QUERY-EXPRESSION-"))
(columns (gensym "COLUMNS-"))
(row (gensym "ROW-"))
- (db (gensym "DB-")))
+ (db (gensym "DB-"))
+ (last-form-eval (gensym "LFE-")))
`(let ((,qe ,query-expression)
(,db ,database))
(typecase ,qe
:result-types ,result-types)
(when ,result-set
(unwind-protect
- (do ((,row (make-list ,columns)))
+ (do ((,row (make-list ,columns))
+ (,last-form-eval nil))
((not (database-store-next-row ,result-set ,db ,row))
- nil)
+ ,last-form-eval)
(destructuring-bind ,args ,row
- ,@body))
+ (setq ,last-form-eval
+ (progn
+ ,@body))))
(database-dump-result-set ,result-set ,db)))))))))
(defun map-query (output-type-spec function query-expression