X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-postgresql%2Fpostgresql-loader.lisp;h=420c97a56ce5dedfcd2fcd0e182fe4af069320dc;hp=9a3539e97e7722b2e6dceeb3c88e224bca41f560;hb=9bbed78051e80e6ab76ae47834136035602bbbf1;hpb=bada52b7a8fd2cc484dee33cccd64ca09a52ec3d diff --git a/db-postgresql/postgresql-loader.lisp b/db-postgresql/postgresql-loader.lisp index 9a3539e..420c97a 100644 --- a/db-postgresql/postgresql-loader.lisp +++ b/db-postgresql/postgresql-loader.lisp @@ -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 #:postgresql) (defvar *postgresql-supporting-libraries* '("crypt" "c") @@ -28,11 +27,11 @@ 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-base:database-type-library-loaded ((database-type (eql :postgresql))) *postgresql-library-loaded*) -(defmethod clsql-base-sys:database-type-load-foreign ((database-type +(defmethod clsql-base:database-type-load-foreign ((database-type (eql :postgresql))) (let ((libpath (uffi:find-foreign-library "libpq" @@ -40,7 +39,10 @@ set to the right path before compiling or loading the system.") "/usr/lib/" "/postgresql/lib/" "/usr/local/pgsql/lib/" "/usr/lib/pgsql/" "/opt/pgsql/lib/pgsql" "/sw/lib/pgsql/") - :drive-letters '("C" "D" "E")))) + :drive-letters '("C" "D" "E") + #+(or macosx darwin ccl-5.0) :types + #+(or macosx darwin ccl-5.0) '("so") + ))) (if (uffi:load-foreign-library libpath :module "postgresql" :supporting-libraries @@ -48,5 +50,5 @@ set to the right path before compiling or loading the system.") (setq *postgresql-library-loaded* t) (warn "Can't load PostgreSQL client library ~A" libpath)))) -(clsql-base-sys:database-type-load-foreign :postgresql) +(clsql-base:database-type-load-foreign :postgresql)