Update of /project/elephant/cvsroot/elephant/src/db-clsql In directory clnet:/tmp/cvs-serv15863

Modified Files: sql-controller.lisp Log Message: Fixed CLSQL initialization error

--- /project/elephant/cvsroot/elephant/src/db-clsql/sql-controller.lisp 2007/03/06 04:43:02 1.22 +++ /project/elephant/cvsroot/elephant/src/db-clsql/sql-controller.lisp 2007/03/23 16:06:43 1.23 @@ -436,10 +436,7 @@ (defmethod open-controller ((sc sql-store-controller) ;; At present these three have no meaning &key - (recover nil) - (recover-fatal nil) - (thread t)) - (declare (ignore recover recover-fatal thread)) + &allow-other-keys) (insure-thread-table-lock) (the sql-store-controller (let* ((dbtype (car (second (controller-spec sc)))) @@ -448,8 +445,10 @@ (not (probe-file path)))) (con (clsql:connect (cdr (second (controller-spec sc))) :database-type dbtype + :pool t :if-exists :old))) - (setf (slot-value sc 'dbcons) (make-hash-table :test 'equal)) + (setf (controller-db-table sc) (make-hash-table :test 'equal)) + (setf (gethash (thread-hash) (controller-db-table sc)) con) ;; (setf (slot-value sc 'db) con) ;; Now we should make sure that the KEYVALUE table exists, and, if ;; it does not, we need to create it..