From a32b6934444ec02090e175c6e0ad6d84dfeb98c8 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 29 Sep 2002 18:54:17 +0000 Subject: [PATCH] r2889: *** empty log message *** --- db-postgresql-socket/postgresql-socket-api.cl | 4 ++-- db-postgresql-socket/postgresql-socket-sql.cl | 18 +++++++++--------- debian/changelog | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/db-postgresql-socket/postgresql-socket-api.cl b/db-postgresql-socket/postgresql-socket-api.cl index b64bdea..8a580b7 100644 --- a/db-postgresql-socket/postgresql-socket-api.cl +++ b/db-postgresql-socket/postgresql-socket-api.cl @@ -9,7 +9,7 @@ ;;;; ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: postgresql-socket-api.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $ +;;;; $Id: postgresql-socket-api.cl,v 1.2 2002/09/29 18:54:17 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -227,7 +227,7 @@ socket interface" (uffi:load-foreign-library (uffi:find-foreign-library "libcrypt" '("/usr/lib/" "/usr/local/lib/" "/lib/")) - :supporting-libaries '("c")) + :supporting-libraries '("c")) (eval '(uffi:def-function "crypt" ((key :cstring) (salt :cstring)) diff --git a/db-postgresql-socket/postgresql-socket-sql.cl b/db-postgresql-socket/postgresql-socket-sql.cl index 4532dc2..9ca2af3 100644 --- a/db-postgresql-socket/postgresql-socket-sql.cl +++ b/db-postgresql-socket/postgresql-socket-sql.cl @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: postgresql-socket-sql.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $ +;;;; $Id: postgresql-socket-sql.cl,v 1.2 2002/09/29 18:54:17 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -176,20 +176,20 @@ doesn't depend on UFFI." :options options :tty tty :database db :user user :password password)) - (:no-error (connection) - ;; Success, make instance - (make-instance 'postgresql-socket-database - :name (database-name-from-spec connection-spec - database-type) - :connection-spec connection-spec - :connection connection)) (postgresql-error (c) ;; Connect failed (error 'clsql-connect-error :database-type database-type :connection-spec connection-spec :errno (type-of c) - :error (postgresql-condition-message c)))))) + :error (postgresql-condition-message c))) + (:no-error (connection) + ;; Success, make instance + (make-instance 'postgresql-socket-database + :name (database-name-from-spec connection-spec + database-type) + :connection-spec connection-spec + :connection connection))))) (defmethod database-disconnect ((database postgresql-socket-database)) (close-postgresql-connection (database-connection database)) diff --git a/debian/changelog b/debian/changelog index 6d18fb3..036f8df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ cl-sql (0.9.5-1) unstable; urgency=low * Fix defgeneric form in db-interfaces.cl + * Fix load-libraris call in postgresql-socket-api.cl -- Kevin M. Rosenberg Fri, 27 Sep 2002 08:55:33 -0600 -- 2.34.1