X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-postgresql-socket%2Fpostgresql-socket-api.lisp;h=dabaad923b8bbd59886924ef7ceba182d97fffdf;hp=572e5cf7b16794caee2dd2934031c75f0d7cef0c;hb=8a8ee2d7d791b7a3efaed06420802a925d16fca3;hpb=66b64b326d109d6cb0d96923b60ed6aaeaeabb21

diff --git a/db-postgresql-socket/postgresql-socket-api.lisp b/db-postgresql-socket/postgresql-socket-api.lisp
index 572e5cf..dabaad9 100644
--- a/db-postgresql-socket/postgresql-socket-api.lisp
+++ b/db-postgresql-socket/postgresql-socket-api.lisp
@@ -2,16 +2,14 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          postgresql-socket-api.lisp
-;;;; Purpose:       Low-level PostgreSQL interface using sockets
-;;;; Programmers:   Kevin M. Rosenberg based on
-;;;;                Original code by Pierre R. Mai 
-;;;;                
-;;;; Date Started:  Feb 2002
+;;;; Name:     postgresql-socket-api.lisp
+;;;; Purpose:  Low-level PostgreSQL interface using sockets
+;;;; Authors:  Kevin M. Rosenberg based on original code by Pierre R. Mai 
+;;;; Created:  Feb 2002
 ;;;;
 ;;;; $Id$
 ;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -19,16 +17,6 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-
-;;;; Changes by Kevin Rosenberg
-;;;;  - Added socket open functions for Allegro and Lispworks
-;;;;  - Changed CMUCL FFI to UFFI
-;;;;  - Added necessary (force-output) for socket streams on 
-;;;;     Allegro and Lispworks
-;;;;  - Added initialization variable
-;;;;  - Added field type processing
-
- 
 (in-package #:postgresql-socket)
 
 (uffi:def-enum pgsql-ftype
@@ -39,13 +27,13 @@
      (:float4 700)
      (:float8 701)))
 
-(defmethod clsql-base-sys:database-type-library-loaded ((database-type
+(defmethod clsql-sys:database-type-library-loaded ((database-type
 					  (eql :postgresql-socket)))
   "T if foreign library was able to be loaded successfully. Always true for
 socket interface"
   t)
 
-(defmethod clsql-base-sys:database-type-load-foreign ((database-type (eql :postgresql-socket)))
+(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :postgresql-socket)))
   t)
 
 
@@ -232,13 +220,14 @@ socket interface"
   (unless *crypt-library-loaded*
     (uffi:load-foreign-library 
      (uffi:find-foreign-library "libcrypt"
-			   '("/usr/lib/" "/usr/local/lib/" "/lib/"))
+			   '(#+64bit "/usr/lib64/"
+			     "/usr/lib/" "/usr/local/lib/" "/lib/"))
      :supporting-libraries '("c"))
     (setq *crypt-library-loaded* t)))
 
 (in-package :postgresql-socket)
 
-(uffi:def-function "crypt" 
+(uffi:def-function ("crypt" crypt)
     ((key :cstring)
      (salt :cstring))
   :returning :cstring)
@@ -375,6 +364,21 @@ socket interface"
 			       :remote-port port :remote-host host
 			       :connect :active :nodelay t))))))
 
+#+openmcl
+(defun open-postgresql-socket-stream (host port)
+  (etypecase host
+    (pathname
+     (let ((path (namestring
+		  (make-pathname :name ".s.PGSQL" :type (princ-to-string port)
+				 :defaults host))))
+       (ccl:make-socket :type :stream :address-family :file
+			:connect :active
+			:remote-filename path :local-filename path)))
+    (string
+     (ccl:make-socket :type :stream :address-family :internet
+		      :remote-port port :remote-host host
+		      :connect :active :nodelay t))))
+
 #+lispworks
 (defun open-postgresql-socket-stream (host port)
   (etypecase host
@@ -597,8 +601,9 @@ connection, if it is still open."
 				   :connection connection :message message))))
 	  (#.+notice-response-message+
 	   (let ((message (read-socket-value-string socket)))
-	     (warn 'postgresql-warning
-		   :connection connection :message message)))
+	     (unless (eq :ignore clsql-sys:*backend-warning-behavior*)
+	       (warn 'postgresql-warning
+		     :connection connection :message message))))
 	  (#.+notification-response-message+
 	   (let ((pid (read-socket-value-int32 socket))
 		 (message (read-socket-value-string socket)))