r11418: 30 Dec 2006 Kevin Rosenberg <kevin@rosenberg.net>

[clsql.git] / db-postgresql / postgresql-loader.lisp

diff --git a/db-postgresql/postgresql-loader.lisp b/db-postgresql/postgresql-loader.lisp
index cfb9a362b2c6710227551aee8a5d315991ae8ea2..f98aec691bfedd26fe4a90c0654af57dc7f169d0 100644 (file)
--- a/db-postgresql/postgresql-loader.lisp
+++ b/db-postgresql/postgresql-loader.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-loader.lisp,v 1.2 2002/11/23 18:00:26 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :postgresql)
+(in-package #:pgsql)
 
 
 (defvar *postgresql-supporting-libraries* '("crypt" "c")
@@ -28,25 +27,16 @@ set to the right path before compiling or loading the system.")
 (defvar *postgresql-library-loaded* nil
   "T if foreign library was able to be loaded successfully")
 
-(defmethod clsql-base-sys:database-type-library-loaded ((database-type
+(defmethod clsql-sys:database-type-library-loaded ((database-type
                                                    (eql :postgresql)))
   *postgresql-library-loaded*)
                                      
-(defmethod clsql-base-sys:database-type-load-foreign ((database-type
+(defmethod clsql-sys:database-type-load-foreign ((database-type
                                                  (eql :postgresql)))
-  (let ((libpath (uffi:find-foreign-library 
-                 "libpq"
-                 '("/opt/postgresql/lib/" "/usr/local/lib/" 
-                   "/usr/lib/" "/postgresql/lib/"
-                   "/usr/local/pgsql/lib/" "/usr/lib/pgsql/"
-                   "/opt/pgsql/lib/pgsql" "/sw/lib/pgsql/")
-                 :drive-letters '("C" "D" "E"))))
-    (if        (uffi:load-foreign-library libpath
-                                  :module "postgresql"
-                                  :supporting-libraries 
-                                  *postgresql-supporting-libraries*)
-       (setq *postgresql-library-loaded* t)
-      (warn "Can't load PostgreSQL client library ~A" libpath))))
+  (clsql-uffi:find-and-load-foreign-library "libpq"
+                                            :module "postgresql"
+                                            :supporting-libraries *postgresql-supporting-libraries*)
+  (setq *postgresql-library-loaded* t))
 
-(clsql-base-sys:database-type-load-foreign :postgresql)
+(clsql-sys:database-type-load-foreign :postgresql)