X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=blobdiff_plain;f=connect.lisp;h=e0495fc00fec45688f9ec9799703afb8e1e1d4de;hp=d1b3789c91e609cbbce24d459e461a1e2b079c5d;hb=a88591e62595d2d25d5e6cfd29064d107c8b6b73;hpb=84f9a22269a37d2d58bdb0f6211f8757855c18ab diff --git a/connect.lisp b/connect.lisp index d1b3789..e0495fc 100644 --- a/connect.lisp +++ b/connect.lisp @@ -1,4 +1,4 @@ -;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: umlisp -*- +;;;; -- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: umlisp -*- ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; @@ -7,15 +7,12 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: connect.lisp,v 1.2 2002/12/02 15:57:17 kevin Exp $ +;;;; $Id$ ;;;; -;;;; This file, part of Hyperobject-SQL, is -;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D. +;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg ;;;; ************************************************************************* -(in-package :hyperobject) -(eval-when (:compile-toplevel :execute) - (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2)))) +(in-package #:hyperobject) (defvar *ho-sql-db* "ho") (defun ho-sql-db () @@ -54,8 +51,8 @@ (defun sql-connect () "Connect to HO database, automatically used pooled connections" - (clsql:connect `(,(ho-sql-host) ,(ho-sql-db) ,(ho-sql-user) ,(ho-sql-passwd)) - :database-type *ho-sql-type* :pool t)) + (clsql:connect `(,(ho-sql-host) ,(ho-sql-db) ,(ho-sql-user) ,(ho-sql-passwd)) + :database-type *ho-sql-type* :pool t)) (defun sql-disconnect (conn) "Disconnect from HO database, but put connection back into pool" @@ -67,7 +64,7 @@ (defmacro with-sql-connection ((conn) &body body) `(let ((,conn (sql-connect))) (unwind-protect - (progn ,@body) + (progn ,@body) (when ,conn (clsql:disconnect :database ,conn))))) (defun sql-query (cmd conn &key (types :auto)) @@ -81,7 +78,7 @@ (defmacro with-mutex-sql ((conn) &body body) `(let ((,conn (sql-connect))) (unwind-protect - (progn ,@body) + (progn ,@body) (when ,conn (sql-disconnect ,conn))))) (defun mutex-sql-execute (cmd)