X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-postgresql-socket%2Fpostgresql-socket-api.lisp;h=31756efc8350aec8c21a2e370a36bb652e237d9b;hp=3ca868a2645469e8b44457cf92121aad5dc1a243;hb=refs%2Ftags%2Fv3.8.6;hpb=215ec41559dda52d46539d48a0aa390811c2423c

diff --git a/db-postgresql-socket/postgresql-socket-api.lisp b/db-postgresql-socket/postgresql-socket-api.lisp
index 3ca868a..31756ef 100644
--- a/db-postgresql-socket/postgresql-socket-api.lisp
+++ b/db-postgresql-socket/postgresql-socket-api.lisp
@@ -28,7 +28,7 @@
      (:float8 701)))
 
 (defmethod clsql-sys:database-type-library-loaded ((database-type
-					  (eql :postgresql-socket)))
+                                          (eql :postgresql-socket)))
   "T if foreign library was able to be loaded successfully. Always true for
 socket interface"
   t)
@@ -42,18 +42,18 @@ socket interface"
 (defmacro define-message-constants (description &rest clauses)
   (assert (evenp (length clauses)))
   (loop with seen-characters = nil
-	for (name char) on clauses by #'cddr
-	for char-code = (char-code char)
-	for doc-string = (format nil "~A (~:C): ~A" description char name)
-	if (member char seen-characters)
-	do (error "Duplicate message type ~@C for group ~A" char description)
-	else
-	collect
-	`(defconstant ,name ,char-code ,doc-string)
-	into result-clauses
-	and do (push char seen-characters)
+        for (name char) on clauses by #'cddr
+        for char-code = (char-code char)
+        for doc-string = (format nil "~A (~:C): ~A" description char name)
+        if (member char seen-characters)
+        do (error "Duplicate message type ~@C for group ~A" char description)
+        else
+        collect
+        `(defconstant ,name ,char-code ,doc-string)
+        into result-clauses
+        and do (push char seen-characters)
       finally
-	(return `(progn ,@result-clauses))))
+        (return `(progn ,@result-clauses))))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 (define-message-constants "Backend Message Constants"
@@ -78,7 +78,7 @@ socket interface"
 
 (defun send-socket-value-int32 (socket value)
   (declare (type stream socket)
-	   (type (unsigned-byte 32) value))
+           (type (unsigned-byte 32) value))
   (write-byte (ldb (byte 8 24) value) socket)
   (write-byte (ldb (byte 8 16) value) socket)
   (write-byte (ldb (byte 8 8) value) socket)
@@ -87,26 +87,26 @@ socket interface"
 
 (defun send-socket-value-int16 (socket value)
   (declare (type stream socket)
-	   (type (unsigned-byte 16) value))
+           (type (unsigned-byte 16) value))
   (write-byte (ldb (byte 8 8) value) socket)
   (write-byte (ldb (byte 8 0) value) socket)
   nil)
 
 (defun send-socket-value-int8 (socket value)
   (declare (type stream socket)
-	   (type (unsigned-byte 8) value))
+           (type (unsigned-byte 8) value))
   (write-byte (ldb (byte 8 0) value) socket)
   nil)
 
 (defun send-socket-value-char-code (socket value)
   (declare (type stream socket)
-	   (type character value))
+           (type character value))
   (write-byte (ldb (byte 8 0) (char-code value)) socket)
   nil)
 
 (defun send-socket-value-string (socket value)
   (declare (type stream socket)
-	   (type string value))
+           (type string value))
   #-sb-unicode
   (loop for char across value
         for code = (char-code char)
@@ -118,12 +118,12 @@ socket interface"
 
 (defun send-socket-value-limstring (socket value limit)
   (declare (type stream socket)
-	   (type string value)
-	   (type fixnum limit))
+           (type string value)
+           (type fixnum limit))
   (let ((length (length value)))
     (dotimes (i (min length limit))
       (let ((code (char-code (char value i))))
-	(write-byte code socket)))
+        (write-byte code socket)))
     (dotimes (i (- limit length))
       (write-byte 0 socket)))
   nil)
@@ -172,12 +172,12 @@ socket interface"
 
 (defmacro define-message-sender (name (&rest args) &rest clauses)
   (let ((socket-var (gensym))
-	(body nil))
+        (body nil))
     (dolist (clause clauses)
       (let* ((type (first clause))
-	     (fn (intern (concatenate 'string (symbol-name '#:send-socket-value-)
-				      (symbol-name type)))))
-	(push `(,fn ,socket-var ,@(rest clause)) body)))
+             (fn (intern (concatenate 'string (symbol-name '#:send-socket-value-)
+                                      (symbol-name type)))))
+        (push `(,fn ,socket-var ,@(rest clause)) body)))
     `(defun ,name (,socket-var ,@args)
        ,@(nreverse body))))
 
@@ -215,7 +215,7 @@ socket interface"
 
 (defun read-socket-sequence (stream length &optional (allow-wide t))
   (declare (stream stream)
-	   (optimize (speed 3) (safety 0)))
+           (optimize (speed 3) (safety 0)))
   #-sb-unicode
   (let ((result (make-string length)))
     (dotimes (i length result)
@@ -238,8 +238,8 @@ socket interface"
   (unless *crypt-library-loaded*
     (uffi:load-foreign-library
      (uffi:find-foreign-library "libcrypt"
-			   '(#+(or 64bit x86-64) "/usr/lib64/"
-			     "/usr/lib/" "/usr/local/lib/" "/lib/"))
+                           '(#+(or 64bit x86-64) "/usr/lib64/"
+                             "/usr/lib/" "/usr/local/lib/" "/lib/"))
      :supporting-libraries '("c"))
     (setq *crypt-library-loaded* t)))
 
@@ -266,9 +266,9 @@ socket interface"
   (:report
    (lambda (c stream)
      (format stream "~@<~A occurred on connection ~A. ~:@_Reason: ~A~:@>"
-	     (type-of c)
-	     (postgresql-condition-connection c)
-	     (postgresql-condition-message c)))))
+             (type-of c)
+             (postgresql-condition-connection c)
+             (postgresql-condition-message c)))))
 
 (define-condition postgresql-error (error postgresql-condition)
   ())
@@ -287,8 +287,8 @@ socket interface"
   (:report
    (lambda (c stream)
      (format stream "~@<Asynchronous notification on connection ~A: ~:@_~A~:@>"
-	     (postgresql-condition-connection c)
-	     (postgresql-condition-message c)))))
+             (postgresql-condition-connection c)
+             (postgresql-condition-message c)))))
 
 ;;; Structures
 
@@ -325,7 +325,7 @@ socket interface"
      (ext:connect-to-unix-socket
       (namestring
        (make-pathname :name ".s.PGSQL" :type (princ-to-string port)
-		      :defaults host))))
+                      :defaults host))))
     (string
      (ext:connect-to-inet-socket host port))))
 
@@ -335,7 +335,7 @@ socket interface"
     (pathname
      ;; Directory to unix-domain socket
      (let ((sock (make-instance 'sb-bsd-sockets:local-socket
-				:type :stream)))
+                                :type :stream)))
        (sb-bsd-sockets:socket-connect
         sock
         (namestring
@@ -344,13 +344,13 @@ socket interface"
        sock))
     (string
      (let ((sock (make-instance 'sb-bsd-sockets:inet-socket
-				:type :stream
-				:protocol :tcp)))
+                                :type :stream
+                                :protocol :tcp)))
        (sb-bsd-sockets:socket-connect
-	sock
-	(sb-bsd-sockets:host-ent-address
-	 (sb-bsd-sockets:get-host-by-name host))
-	port)
+        sock
+        (sb-bsd-sockets:host-ent-address
+         (sb-bsd-sockets:get-host-by-name host))
+        port)
        sock))))
 
 #+(or cmu scl)
@@ -374,32 +374,32 @@ socket interface"
   (etypecase host
     (pathname
      (let ((path (namestring
-		  (make-pathname :name ".s.PGSQL" :type (princ-to-string port)
-				 :defaults host))))
+                  (make-pathname :name ".s.PGSQL" :type (princ-to-string port)
+                                 :defaults host))))
        (socket:make-socket :type :stream :address-family :file
-			   :connect :active
-			   :remote-filename path :local-filename path)))
+                           :connect :active
+                           :remote-filename path :local-filename path)))
     (string
      (socket:with-pending-connect
-	 (mp:with-timeout (*postgresql-server-socket-timeout* (error "connect failed"))
-	   (socket:make-socket :type :stream :address-family :internet
-			       :remote-port port :remote-host host
-			       :connect :active :nodelay t))))))
+         (mp:with-timeout (*postgresql-server-socket-timeout* (error "connect failed"))
+           (socket:make-socket :type :stream :address-family :internet
+                               :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))))
+                  (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)))
+                        :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))))
+                      :remote-port port :remote-host host
+                      :connect :active :nodelay t))))
 
 #+lispworks
 (defun open-postgresql-socket-stream (host port)
@@ -408,7 +408,7 @@ socket interface"
      (error "File sockets not supported on Lispworks."))
     (string
      (comm:open-tcp-stream host port :direction :io :element-type '(unsigned-byte 8)
-			   :read-timeout *postgresql-server-socket-timeout*))
+                           :read-timeout *postgresql-server-socket-timeout*))
     ))
 
 
@@ -427,10 +427,10 @@ socket interface"
 ;;; Interface Functions
 
 (defun open-postgresql-connection (&key (host (cmucl-compat:required-argument))
-					(port +postgresql-server-default-port+)
-					(database (cmucl-compat:required-argument))
-					(user (cmucl-compat:required-argument))
-					options tty password)
+                                        (port +postgresql-server-default-port+)
+                                        (database (cmucl-compat:required-argument))
+                                        (user (cmucl-compat:required-argument))
+                                        options tty password)
   "Open a connection to a PostgreSQL server with the given parameters.
 Note that host, database and user arguments must be supplied.
 
@@ -454,14 +454,14 @@ order to facilitate automatic reconnection in case of communication
 troubles."
   (reopen-postgresql-connection
    (make-postgresql-connection :host host :port port
-			       :options (or options "") :tty (or tty "")
-			       :database database :user user
-			       :password (or password ""))))
+                               :options (or options "") :tty (or tty "")
+                               :database database :user user
+                               :password (or password ""))))
 
 (defun encrypt-md5 (plaintext salt)
   (string-downcase
    (format nil "~{~2,'0X~}"
-	   (coerce (md5sum-sequence (concatenate 'string plaintext salt)) 'list))))
+           (coerce (md5sum-sequence (concatenate 'string plaintext salt)) 'list))))
 
 (defun reopen-postgresql-connection (connection)
   "Reopen the given PostgreSQL connection.  Closes any existing
@@ -469,90 +469,90 @@ connection, if it is still open."
   (when (postgresql-connection-open-p connection)
     (close-postgresql-connection connection))
   (let ((socket (open-postgresql-socket-stream
-		  (postgresql-connection-host connection)
-		  (postgresql-connection-port connection))))
+                  (postgresql-connection-host connection)
+                  (postgresql-connection-port connection))))
     (unwind-protect
-	 (progn
-	   (setf (postgresql-connection-socket connection) socket)
-	   (send-startup-message socket
-				 (postgresql-connection-database connection)
-				 (postgresql-connection-user connection)
-				 (postgresql-connection-options connection)
-				 (postgresql-connection-tty connection))
-	   (force-output socket)
-	   (loop
-	       (case (read-socket-value-int8 socket)
-		 (#.+authentication-message+
-		  (case (read-socket-value-int32 socket)
-		    (0 (return))
-		    ((1 2)
-		     (error 'postgresql-login-error
-			    :connection connection
-			    :message
-			    "Postmaster expects unsupported Kerberos authentication."))
-		    (3
-		     (send-unencrypted-password-message
-		      socket
-		      (postgresql-connection-password connection))
+         (progn
+           (setf (postgresql-connection-socket connection) socket)
+           (send-startup-message socket
+                                 (postgresql-connection-database connection)
+                                 (postgresql-connection-user connection)
+                                 (postgresql-connection-options connection)
+                                 (postgresql-connection-tty connection))
+           (force-output socket)
+           (loop
+               (case (read-socket-value-int8 socket)
+                 (#.+authentication-message+
+                  (case (read-socket-value-int32 socket)
+                    (0 (return))
+                    ((1 2)
+                     (error 'postgresql-login-error
+                            :connection connection
+                            :message
+                            "Postmaster expects unsupported Kerberos authentication."))
+                    (3
+                     (send-unencrypted-password-message
+                      socket
+                      (postgresql-connection-password connection))
                       (force-output socket))
-		    (4
-		     (let ((salt (read-socket-sequence socket 2 nil)))
-		       (send-encrypted-password-message
-			socket
-			(crypt-password
-			 (postgresql-connection-password connection) salt)))
+                    (4
+                     (let ((salt (read-socket-sequence socket 2 nil)))
+                       (send-encrypted-password-message
+                        socket
+                        (crypt-password
+                         (postgresql-connection-password connection) salt)))
                      (force-output socket))
-		    (5
-		     (let ((salt (read-socket-sequence socket 4 nil)))
-		       (let* ((pwd2 (encrypt-md5 (postgresql-connection-password connection)
-						 (postgresql-connection-user connection)))
-			      (pwd (encrypt-md5 pwd2 salt)))
-			 (send-encrypted-password-message
-			  socket
-			  (concatenate 'string "md5" pwd))))
+                    (5
+                     (let ((salt (read-socket-sequence socket 4 nil)))
+                       (let* ((pwd2 (encrypt-md5 (postgresql-connection-password connection)
+                                                 (postgresql-connection-user connection)))
+                              (pwd (encrypt-md5 pwd2 salt)))
+                         (send-encrypted-password-message
+                          socket
+                          (concatenate 'string "md5" pwd))))
                      (force-output socket))
-		    (t
-		     (error 'postgresql-login-error
-			    :connection connection
-			    :message
-			    "Postmaster expects unknown authentication method."))))
-		 (#.+error-response-message+
-		  (let ((message (read-socket-value-string socket)))
-		    (error 'postgresql-login-error
-			   :connection connection :message message)))
-		 (t
-		  (error 'postgresql-login-error
-			 :connection connection
-			 :message
-			 "Received garbled message from Postmaster"))))
-	   ;; Start backend communication
-	   (force-output socket)
-	   (loop
-	       (case (read-socket-value-int8 socket)
-		 (#.+backend-key-message+
-		  (setf (postgresql-connection-pid connection)
-			(read-socket-value-int32 socket)
-			(postgresql-connection-key connection)
-			(read-socket-value-int32 socket)))
-		 (#.+ready-for-query-message+
-		  (setq socket nil)
-		  (return connection))
-		 (#.+error-response-message+
-		  (let ((message (read-socket-value-string socket)))
-		    (error 'postgresql-login-error
-			   :connection connection
-			   :message message)))
-		 (#.+notice-response-message+
-		  (let ((message (read-socket-value-string socket)))
-		    (warn 'postgresql-warning :connection connection
-			  :message message)))
-		 (t
-		  (error 'postgresql-login-error
-			 :connection connection
-			 :message
-			 "Received garbled message from Postmaster")))))
+                    (t
+                     (error 'postgresql-login-error
+                            :connection connection
+                            :message
+                            "Postmaster expects unknown authentication method."))))
+                 (#.+error-response-message+
+                  (let ((message (read-socket-value-string socket)))
+                    (error 'postgresql-login-error
+                           :connection connection :message message)))
+                 (t
+                  (error 'postgresql-login-error
+                         :connection connection
+                         :message
+                         "Received garbled message from Postmaster"))))
+           ;; Start backend communication
+           (force-output socket)
+           (loop
+               (case (read-socket-value-int8 socket)
+                 (#.+backend-key-message+
+                  (setf (postgresql-connection-pid connection)
+                        (read-socket-value-int32 socket)
+                        (postgresql-connection-key connection)
+                        (read-socket-value-int32 socket)))
+                 (#.+ready-for-query-message+
+                  (setq socket nil)
+                  (return connection))
+                 (#.+error-response-message+
+                  (let ((message (read-socket-value-string socket)))
+                    (error 'postgresql-login-error
+                           :connection connection
+                           :message message)))
+                 (#.+notice-response-message+
+                  (let ((message (read-socket-value-string socket)))
+                    (warn 'postgresql-warning :connection connection
+                          :message message)))
+                 (t
+                  (error 'postgresql-login-error
+                         :connection connection
+                         :message
+                         "Received garbled message from Postmaster")))))
       (when socket
-	(close socket)))))
+        (close socket)))))
 
 (defun close-postgresql-connection (connection &optional abort)
   (unless abort
@@ -572,24 +572,24 @@ connection, if it is still open."
   (assert (postgresql-connection-open-p connection))
   ;; Process any asnychronous messages
   (loop with socket = (postgresql-connection-socket connection)
-	while (listen socket)
-	do
-	(case (read-socket-value-int8 socket)
-	  (#.+ready-for-query-message+)
-	  (#.+notice-response-message+
-	   (let ((message (read-socket-value-string socket)))
-	     (warn 'postgresql-warning :connection connection
-		   :message message)))
-	  (#.+notification-response-message+
-	   (let ((pid (read-socket-value-int32 socket))
-		 (message (read-socket-value-string socket)))
-	     (when (= pid (postgresql-connection-pid connection))
-	       (signal 'postgresql-notification :connection connection
-		       :message message))))
-	  (t
-	   (close-postgresql-connection connection)
-	   (error 'postgresql-fatal-error :connection connection
-		  :message "Received garbled message from backend")))))
+        while (listen socket)
+        do
+        (case (read-socket-value-int8 socket)
+          (#.+ready-for-query-message+)
+          (#.+notice-response-message+
+           (let ((message (read-socket-value-string socket)))
+             (warn 'postgresql-warning :connection connection
+                   :message message)))
+          (#.+notification-response-message+
+           (let ((pid (read-socket-value-int32 socket))
+                 (message (read-socket-value-string socket)))
+             (when (= pid (postgresql-connection-pid connection))
+               (signal 'postgresql-notification :connection connection
+                       :message message))))
+          (t
+           (close-postgresql-connection connection)
+           (error 'postgresql-fatal-error :connection connection
+                  :message "Received garbled message from backend")))))
 
 (defun start-query-execution (connection query)
   (ensure-open-postgresql-connection connection)
@@ -600,65 +600,65 @@ connection, if it is still open."
 (defun wait-for-query-results (connection)
   (assert (postgresql-connection-open-p connection))
   (let ((socket (postgresql-connection-socket connection))
-	(cursor-name nil)
-	(error nil))
+        (cursor-name nil)
+        (error nil))
     (loop
-	(case (read-socket-value-int8 socket)
-	  (#.+completed-response-message+
-	   (return (values :completed (read-socket-value-string socket))))
-	  (#.+cursor-response-message+
-	   (setq cursor-name (read-socket-value-string socket)))
-	  (#.+row-description-message+
-	   (let* ((count (read-socket-value-int16 socket))
-		  (fields
-		   (loop repeat count
-		     collect
-		     (list
-		      (read-socket-value-string socket)
-		      (read-socket-value-int32 socket)
-		      (read-socket-value-int16 socket)
-		      (read-socket-value-int32 socket)))))
-	     (return
-	       (values :cursor
-		       (make-postgresql-cursor :connection connection
-					       :name cursor-name
-					       :fields fields)))))
-	  (#.+copy-in-response-message+
-	   (return :copy-in))
-	  (#.+copy-out-response-message+
-	   (return :copy-out))
-	  (#.+ready-for-query-message+
-	   (when error
-	     (error error))
-	   (return nil))
-	  (#.+error-response-message+
-	   (let ((message (read-socket-value-string socket)))
-	     (setq error
-		   (make-condition 'postgresql-error
-				   :connection connection :message message))))
-	  (#.+notice-response-message+
-	   (let ((message (read-socket-value-string socket)))
-	     (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)))
-	     (when (= pid (postgresql-connection-pid connection))
-	       (signal 'postgresql-notification :connection connection
-		       :message message))))
-	  (t
-	   (close-postgresql-connection connection)
-	   (error 'postgresql-fatal-error :connection connection
-		  :message "Received garbled message from backend"))))))
+        (case (read-socket-value-int8 socket)
+          (#.+completed-response-message+
+           (return (values :completed (read-socket-value-string socket))))
+          (#.+cursor-response-message+
+           (setq cursor-name (read-socket-value-string socket)))
+          (#.+row-description-message+
+           (let* ((count (read-socket-value-int16 socket))
+                  (fields
+                   (loop repeat count
+                     collect
+                     (list
+                      (read-socket-value-string socket)
+                      (read-socket-value-int32 socket)
+                      (read-socket-value-int16 socket)
+                      (read-socket-value-int32 socket)))))
+             (return
+               (values :cursor
+                       (make-postgresql-cursor :connection connection
+                                               :name cursor-name
+                                               :fields fields)))))
+          (#.+copy-in-response-message+
+           (return :copy-in))
+          (#.+copy-out-response-message+
+           (return :copy-out))
+          (#.+ready-for-query-message+
+           (when error
+             (error error))
+           (return nil))
+          (#.+error-response-message+
+           (let ((message (read-socket-value-string socket)))
+             (setq error
+                   (make-condition 'postgresql-error
+                                   :connection connection :message message))))
+          (#.+notice-response-message+
+           (let ((message (read-socket-value-string socket)))
+             (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)))
+             (when (= pid (postgresql-connection-pid connection))
+               (signal 'postgresql-notification :connection connection
+                       :message message))))
+          (t
+           (close-postgresql-connection connection)
+           (error 'postgresql-fatal-error :connection connection
+                  :message "Received garbled message from backend"))))))
 
 (defun read-null-bit-vector (socket count)
   (let ((result (make-array count :element-type 'bit)))
     (dotimes (offset (ceiling count 8))
       (loop with byte = (read-byte socket)
-	    for index from (* offset 8) below (min count (* (1+ offset) 8))
-	    for weight downfrom 7
-	    do (setf (aref result index) (ldb (byte 1 weight) byte))))
+            for index from (* offset 8) below (min count (* (1+ offset) 8))
+            for weight downfrom 7
+            do (setf (aref result index) (ldb (byte 1 weight) byte))))
     result))
 
 
@@ -684,46 +684,46 @@ connection, if it is still open."
   (if (zerop length)
       nil
     (let ((val 0)
-	  (first-char (read-byte socket))
-	  (minusp nil))
+          (first-char (read-byte socket))
+          (minusp nil))
       (declare (fixnum first-char))
       (decf length) ;; read first char
       (cond
        ((= first-char +char-code-minus+)
-	(setq minusp t))
+        (setq minusp t))
        ((= first-char +char-code-plus+)
-	)		;; nothing to do
+        )               ;; nothing to do
        (t
-	(setq val (- first-char +char-code-zero+))))
+        (setq val (- first-char +char-code-zero+))))
 
       (dotimes (i length)
-	(declare (fixnum i))
-	(setq val (+
-		   (* 10 val)
-		   (- (read-byte socket) +char-code-zero+))))
+        (declare (fixnum i))
+        (setq val (+
+                   (* 10 val)
+                   (- (read-byte socket) +char-code-zero+))))
       (if minusp
-	  (- val)
-	val))))
+          (- val)
+        val))))
 
 (defmacro ascii-digit (int)
   (let ((offset (gensym)))
     `(let ((,offset (- ,int +char-code-zero+)))
       (declare (fixnum ,int ,offset))
       (if (and (>= ,offset 0)
-	       (< ,offset 10))
-	  ,offset
-	  nil))))
+               (< ,offset 10))
+          ,offset
+          nil))))
 
 (defun read-double-from-socket (socket length)
   (declare (fixnum length))
   (let ((before-decimal 0)
-	(after-decimal 0)
-	(decimal-count 0)
-	(exponent 0)
-	(decimalp nil)
-	(minusp nil)
-	(result nil)
-	(char (read-byte socket)))
+        (after-decimal 0)
+        (decimal-count 0)
+        (exponent 0)
+        (decimalp nil)
+        (minusp nil)
+        (result nil)
+        (char (read-byte socket)))
     (declare (fixnum char exponent decimal-count))
     (decf length) ;; already read first character
     (cond
@@ -736,37 +736,37 @@ connection, if it is still open."
       (t
        (setq before-decimal (ascii-digit char))
        (unless before-decimal
-	 (error "Unexpected value"))))
+         (error "Unexpected value"))))
 
     (block loop
       (dotimes (i length)
-	(setq char (read-byte socket))
-	;;      (format t "~&len:~D, i:~D, char:~D, minusp:~A, decimalp:~A" length i char minusp decimalp)
-	(let ((weight (ascii-digit char)))
-	  (cond
-	   ((and weight (not decimalp)) ;; before decimal point
-	    (setq before-decimal (+ weight (* 10 before-decimal))))
-	   ((and weight decimalp) ;; after decimal point
-	    (setq after-decimal (+ weight (* 10 after-decimal)))
-	    (incf decimal-count))
-	   ((and (= char +char-code-period+))
-	    (setq decimalp t))
-	   ((or (= char +char-code-lower-e+) 	      ;; E is for exponent
-		(= char +char-code-upper-e+))
-	    (setq exponent (read-integer-from-socket socket (- length i 1)))
-	    (setq exponent (or exponent 0))
-	    (return-from loop))
-	  (t
-	   (break "Unexpected value"))
-	  )
-	)))
+        (setq char (read-byte socket))
+        ;;      (format t "~&len:~D, i:~D, char:~D, minusp:~A, decimalp:~A" length i char minusp decimalp)
+        (let ((weight (ascii-digit char)))
+          (cond
+           ((and weight (not decimalp)) ;; before decimal point
+            (setq before-decimal (+ weight (* 10 before-decimal))))
+           ((and weight decimalp) ;; after decimal point
+            (setq after-decimal (+ weight (* 10 after-decimal)))
+            (incf decimal-count))
+           ((and (= char +char-code-period+))
+            (setq decimalp t))
+           ((or (= char +char-code-lower-e+)          ;; E is for exponent
+                (= char +char-code-upper-e+))
+            (setq exponent (read-integer-from-socket socket (- length i 1)))
+            (setq exponent (or exponent 0))
+            (return-from loop))
+          (t
+           (break "Unexpected value"))
+          )
+        )))
     (setq result (* (+ (coerce before-decimal 'double-float)
-		       (* after-decimal
-			  (expt 10 (- decimal-count))))
-		    (expt 10 exponent)))
+                       (* after-decimal
+                          (expt 10 (- decimal-count))))
+                    (expt 10 exponent)))
     (if minusp
-	(- result)
-	result)))
+        (- result)
+        result)))
 
 
 #+ignore
@@ -778,141 +778,141 @@ connection, if it is still open."
 
 (defun read-cursor-row (cursor types)
   (let* ((connection (postgresql-cursor-connection cursor))
-	 (socket (postgresql-connection-socket connection))
-	 (fields (postgresql-cursor-fields cursor)))
+         (socket (postgresql-connection-socket connection))
+         (fields (postgresql-cursor-fields cursor)))
     (assert (postgresql-connection-open-p connection))
     (loop
-	(let ((code (read-socket-value-int8 socket)))
-	  (case code
-	    (#.+ascii-row-message+
-	     (return
-	       (loop with count = (length fields)
-		     with null-vector = (read-null-bit-vector socket count)
-		     repeat count
-		     for null-bit across null-vector
-		     for i from 0
-		     for null-p = (zerop null-bit)
-		     if null-p
-		     collect nil
-		     else
-		     collect
-		     (read-field socket (nth i types)))))
-	    (#.+binary-row-message+
-	     (error "NYI"))
-	    (#.+completed-response-message+
-	     (return (values nil (read-socket-value-string socket))))
-	    (#.+error-response-message+
-	     (let ((message (read-socket-value-string socket)))
-	       (error 'postgresql-error
-		      :connection connection :message message)))
-	    (#.+notice-response-message+
-	     (let ((message (read-socket-value-string socket)))
-	       (warn 'postgresql-warning
-		     :connection connection :message message)))
-	    (#.+notification-response-message+
-	     (let ((pid (read-socket-value-int32 socket))
-		   (message (read-socket-value-string socket)))
-	       (when (= pid (postgresql-connection-pid connection))
-		 (signal 'postgresql-notification :connection connection
-			 :message message))))
-	    (t
-	     (close-postgresql-connection connection)
-	     (error 'postgresql-fatal-error :connection connection
-		    :message "Received garbled message from backend")))))))
+        (let ((code (read-socket-value-int8 socket)))
+          (case code
+            (#.+ascii-row-message+
+             (return
+               (loop with count = (length fields)
+                     with null-vector = (read-null-bit-vector socket count)
+                     repeat count
+                     for null-bit across null-vector
+                     for i from 0
+                     for null-p = (zerop null-bit)
+                     if null-p
+                     collect nil
+                     else
+                     collect
+                     (read-field socket (nth i types)))))
+            (#.+binary-row-message+
+             (error "NYI"))
+            (#.+completed-response-message+
+             (return (values nil (read-socket-value-string socket))))
+            (#.+error-response-message+
+             (let ((message (read-socket-value-string socket)))
+               (error 'postgresql-error
+                      :connection connection :message message)))
+            (#.+notice-response-message+
+             (let ((message (read-socket-value-string socket)))
+               (warn 'postgresql-warning
+                     :connection connection :message message)))
+            (#.+notification-response-message+
+             (let ((pid (read-socket-value-int32 socket))
+                   (message (read-socket-value-string socket)))
+               (when (= pid (postgresql-connection-pid connection))
+                 (signal 'postgresql-notification :connection connection
+                         :message message))))
+            (t
+             (close-postgresql-connection connection)
+             (error 'postgresql-fatal-error :connection connection
+                    :message "Received garbled message from backend")))))))
 
 (defun map-into-indexed (result-seq func seq)
   (dotimes (i (length seq))
     (declare (fixnum i))
     (setf (elt result-seq i)
-	  (funcall func (elt seq i) i)))
+          (funcall func (elt seq i) i)))
   result-seq)
 
 (defun copy-cursor-row (cursor sequence types)
   (let* ((connection (postgresql-cursor-connection cursor))
-	 (socket (postgresql-connection-socket connection))
-	 (fields (postgresql-cursor-fields cursor)))
+         (socket (postgresql-connection-socket connection))
+         (fields (postgresql-cursor-fields cursor)))
     (assert (= (length fields) (length sequence)))
     (loop
-	(let ((code (read-socket-value-int8 socket)))
-	  (case code
-	    (#.+ascii-row-message+
-	     (return
-	       #+ignore
-	       (let* ((count (length sequence))
-		      (null-vector (read-null-bit-vector socket count)))
-		 (dotimes (i count)
-		   (declare (fixnum i))
-		   (if (zerop (elt null-vector i))
-		       (setf (elt sequence i) nil)
-		       (let ((value (read-field socket (nth i types))))
-			 (setf (elt sequence i) value)))))
-	       (map-into-indexed
-		sequence
-		#'(lambda (null-bit i)
-		    (if (zerop null-bit)
-			nil
-			(read-field socket (nth i types))))
-		(read-null-bit-vector socket (length sequence)))))
-	    (#.+binary-row-message+
-	     (error "NYI"))
-	    (#.+completed-response-message+
-	     (return (values nil (read-socket-value-string socket))))
-	    (#.+error-response-message+
-	     (let ((message (read-socket-value-string socket)))
-	       (error 'postgresql-error
-		      :connection connection :message message)))
-	    (#.+notice-response-message+
-	     (let ((message (read-socket-value-string socket)))
-	       (warn 'postgresql-warning
-		     :connection connection :message message)))
-	    (#.+notification-response-message+
-	     (let ((pid (read-socket-value-int32 socket))
-		   (message (read-socket-value-string socket)))
-	       (when (= pid (postgresql-connection-pid connection))
-		 (signal 'postgresql-notification :connection connection
-			 :message message))))
-	    (t
-	     (close-postgresql-connection connection)
-	     (error 'postgresql-fatal-error :connection connection
-		    :message "Received garbled message from backend")))))))
+        (let ((code (read-socket-value-int8 socket)))
+          (case code
+            (#.+ascii-row-message+
+             (return
+               #+ignore
+               (let* ((count (length sequence))
+                      (null-vector (read-null-bit-vector socket count)))
+                 (dotimes (i count)
+                   (declare (fixnum i))
+                   (if (zerop (elt null-vector i))
+                       (setf (elt sequence i) nil)
+                       (let ((value (read-field socket (nth i types))))
+                         (setf (elt sequence i) value)))))
+               (map-into-indexed
+                sequence
+                #'(lambda (null-bit i)
+                    (if (zerop null-bit)
+                        nil
+                        (read-field socket (nth i types))))
+                (read-null-bit-vector socket (length sequence)))))
+            (#.+binary-row-message+
+             (error "NYI"))
+            (#.+completed-response-message+
+             (return (values nil (read-socket-value-string socket))))
+            (#.+error-response-message+
+             (let ((message (read-socket-value-string socket)))
+               (error 'postgresql-error
+                      :connection connection :message message)))
+            (#.+notice-response-message+
+             (let ((message (read-socket-value-string socket)))
+               (warn 'postgresql-warning
+                     :connection connection :message message)))
+            (#.+notification-response-message+
+             (let ((pid (read-socket-value-int32 socket))
+                   (message (read-socket-value-string socket)))
+               (when (= pid (postgresql-connection-pid connection))
+                 (signal 'postgresql-notification :connection connection
+                         :message message))))
+            (t
+             (close-postgresql-connection connection)
+             (error 'postgresql-fatal-error :connection connection
+                    :message "Received garbled message from backend")))))))
 
 (defun skip-cursor-row (cursor)
   (let* ((connection (postgresql-cursor-connection cursor))
-	 (socket (postgresql-connection-socket connection))
-	 (fields (postgresql-cursor-fields cursor)))
+         (socket (postgresql-connection-socket connection))
+         (fields (postgresql-cursor-fields cursor)))
     (loop
-	(let ((code (read-socket-value-int8 socket)))
-	  (case code
-	    (#.+ascii-row-message+
-	     (loop for null-bit across
-		   (read-null-bit-vector socket (length fields))
-		   do
-		   (unless (zerop null-bit)
-		     (let* ((length (read-socket-value-int32 socket)))
-		       (loop repeat (- length 4) do (read-byte socket)))))
-	     (return t))
-	    (#.+binary-row-message+
-	     (error "NYI"))
-	    (#.+completed-response-message+
-	     (return (values nil (read-socket-value-string socket))))
-	    (#.+error-response-message+
-	     (let ((message (read-socket-value-string socket)))
-	       (error 'postgresql-error
-		      :connection connection :message message)))
-	    (#.+notice-response-message+
-	     (let ((message (read-socket-value-string socket)))
-	       (warn 'postgresql-warning
-		     :connection connection :message message)))
-	    (#.+notification-response-message+
-	     (let ((pid (read-socket-value-int32 socket))
-		   (message (read-socket-value-string socket)))
-	       (when (= pid (postgresql-connection-pid connection))
-		 (signal 'postgresql-notification :connection connection
-			 :message message))))
-	    (t
-	     (close-postgresql-connection connection)
-	     (error 'postgresql-fatal-error :connection connection
-		    :message "Received garbled message from backend")))))))
+        (let ((code (read-socket-value-int8 socket)))
+          (case code
+            (#.+ascii-row-message+
+             (loop for null-bit across
+                   (read-null-bit-vector socket (length fields))
+                   do
+                   (unless (zerop null-bit)
+                     (let* ((length (read-socket-value-int32 socket)))
+                       (loop repeat (- length 4) do (read-byte socket)))))
+             (return t))
+            (#.+binary-row-message+
+             (error "NYI"))
+            (#.+completed-response-message+
+             (return (values nil (read-socket-value-string socket))))
+            (#.+error-response-message+
+             (let ((message (read-socket-value-string socket)))
+               (error 'postgresql-error
+                      :connection connection :message message)))
+            (#.+notice-response-message+
+             (let ((message (read-socket-value-string socket)))
+               (warn 'postgresql-warning
+                     :connection connection :message message)))
+            (#.+notification-response-message+
+             (let ((pid (read-socket-value-int32 socket))
+                   (message (read-socket-value-string socket)))
+               (when (= pid (postgresql-connection-pid connection))
+                 (signal 'postgresql-notification :connection connection
+                         :message message))))
+            (t
+             (close-postgresql-connection connection)
+             (error 'postgresql-fatal-error :connection connection
+                    :message "Received garbled message from backend")))))))
 
 (defun run-query (connection query &optional (result-types nil))
   (start-query-execution connection query)
@@ -920,10 +920,10 @@ connection, if it is still open."
       (wait-for-query-results connection)
     (assert (eq status :cursor))
     (loop for row = (read-cursor-row cursor result-types)
-	  while row
-	  collect row
-	  finally
-	  (wait-for-query-results connection))))
+          while row
+          collect row
+          finally
+          (wait-for-query-results connection))))
 
 #+scl
 (declaim (ext:maybe-inline read-byte write-byte))