r1989: Moddified transactions

[clsql.git] / interfaces / postgresql / postgresql-sql.cl

diff --git a/interfaces/postgresql/postgresql-sql.cl b/interfaces/postgresql/postgresql-sql.cl
index 24def53c2d16deb6eaedfd05f81a2ef32a1ee7a9..7e9d6e89a4051d5bedf0f8ea86ba4443707d2c9b 100644 (file)
--- a/interfaces/postgresql/postgresql-sql.cl
+++ b/interfaces/postgresql/postgresql-sql.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-sql.cl,v 1.11 2002/03/27 12:09:39 kevin Exp $
+;;;; $Id: postgresql-sql.cl,v 1.16 2002/05/10 08:05:48 marc.battyani Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -52,14 +52,16 @@
       (nreverse new-types)))
 
 (defun canonicalize-types (types num-fields res-ptr)
-  (let ((auto-list (make-type-list-for-auto num-fields res-ptr)))
-    (cond
-      ((listp types)
-       (canonicalize-type-list types auto-list))
-      ((eq types :auto)
-       auto-list)
-      (t
-       nil))))
+  (if (null types)
+      nil
+      (let ((auto-list (make-type-list-for-auto num-fields res-ptr)))
+       (cond
+         ((listp types)
+          (canonicalize-type-list types auto-list))
+         ((eq types :auto)
+          auto-list)
+         (t
+          nil)))))
 
 (defun tidy-error-message (message)
   (unless (stringp message)
@@ -85,6 +87,9 @@
   ((conn-ptr :accessor database-conn-ptr :initarg :conn-ptr
             :type pgsql-conn-def)))
 
+(defmethod database-type ((database postgresql-database))
+  :postgresql)
+
 (defmethod database-name-from-spec (connection-spec (database-type
                                                     (eql :postgresql)))
   (check-connection-spec connection-spec database-type
@@ -123,6 +128,7 @@
        (make-instance 'postgresql-database
                       :name (database-name-from-spec connection-spec
                                                      database-type)
+                      :connection-spec connection-spec
                       :conn-ptr connection)))))
 
 
@@ -272,3 +278,56 @@
           finally
             (incf (postgresql-result-set-tuple-index result-set))
             (return list)))))
+
+;;; Large objects support (Marc B)
+
+(defmethod database-create-large-object ((database postgresql-database))
+  (lo-create (database-conn-ptr database)
+            (logior postgresql::+INV_WRITE+ postgresql::+INV_READ+)))
+
+(defmethod database-write-large-object (object-id (data string) (database postgresql-database))
+  (let ((ptr (database-conn-ptr database))
+       (length (length data))
+       (result nil)
+       (fd nil))
+    (with-transaction (:database database)
+       (unwind-protect
+         (progn 
+           (setf fd (lo-open ptr object-id postgresql::+INV_WRITE+))
+           (when (>= fd 0)
+             (when (= (lo-write ptr fd data length) length)
+               (setf result t))))
+        (progn
+          (when (and fd (>= fd 0))
+            (lo-close ptr fd))
+          )))
+    result))
+
+;; (MB) the begin/commit/rollback stuff will be removed when with-transaction wil be implemented
+(defmethod database-read-large-object (object-id (database postgresql-database))
+  (let ((ptr (database-conn-ptr database))
+       (buffer nil)
+       (result nil)
+       (length 0)
+       (fd nil))
+    (unwind-protect
+       (progn
+        (database-execute-command "begin" database)
+        (setf fd (lo-open ptr object-id postgresql::+INV_READ+))
+        (when (>= fd 0)
+          (setf length (lo-lseek ptr fd 0 2))
+          (lo-lseek ptr fd 0 0)
+          (when (> length 0)
+            (setf buffer (uffi:allocate-foreign-string 
+                          length :unsigned t))
+            (when (= (lo-read ptr fd buffer length) length)
+              (setf result (uffi:convert-from-foreign-string
+                            buffer :length length :null-terminated-p nil))))))
+      (progn
+       (when buffer (uffi:free-foreign-object buffer))
+       (when (and fd (>= fd 0)) (lo-close ptr fd))
+       (database-execute-command (if result "commit" "rollback") database)))
+    result))
+
+(defmethod database-delete-large-object (object-id (database postgresql-database))
+  (lo-unlink (database-conn-ptr database) object-id))