X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fpostgresql%2Fpostgresql-sql.cl;h=41b43bf7673245c5adbc3c40c39a599a411f2b6e;hb=b3d8cca2287bb8e5224798a549cc9069abc7d968;hp=2f3399243f80acb0263a28a2d77f489c328eed5c;hpb=f1930020ce73039b8627af801722c28afff5d31d;p=clsql.git

diff --git a/interfaces/postgresql/postgresql-sql.cl b/interfaces/postgresql/postgresql-sql.cl
index 2f33992..41b43bf 100644
--- 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.10 2002/03/27 08:09:25 kevin Exp $
+;;;; $Id: postgresql-sql.cl,v 1.17 2002/05/14 16:29:53 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -30,33 +30,38 @@
 
 ;;; Field conversion functions
 
-(defun canonicalize-types (types num-fields res-ptr)
-  (cond
-   ((listp types)
-    (canonicalize-type-list types num-fields))
-   ((eq types :auto)
-    (let ((new-types '()))
-      (dotimes (i num-fields)
-	(declare (fixnum i))
-	(let* ((type (PQftype res-ptr i)))
-	  (push
-	   (case type
-	     ((#.pgsql-ftype#bytea
-	       #.pgsql-ftype#int2
-	       #.pgsql-ftype#int4)
-	      :int)
-	     (#.pgsql-ftype#int8
-	      :longlong)
-	     ((#.pgsql-ftype#float4
-	       #.pgsql-ftype#float8)
-	      :double)
-	     (otherwise
-	      t))
-	   new-types)))
+(defun make-type-list-for-auto (num-fields res-ptr)
+  (let ((new-types '()))
+    (dotimes (i num-fields)
+      (declare (fixnum i))
+      (let* ((type (PQftype res-ptr i)))
+	(push
+	 (case type
+	   ((#.pgsql-ftype#bytea
+	     #.pgsql-ftype#int2
+	     #.pgsql-ftype#int4)
+	    :int32)
+	   (#.pgsql-ftype#int8
+	    :int64)
+	   ((#.pgsql-ftype#float4
+	     #.pgsql-ftype#float8)
+	    :double)
+	   (otherwise
+	    t))
+	 new-types)))
       (nreverse new-types)))
-   (t
-    nil)))
 
+(defun canonicalize-types (types num-fields res-ptr)
+  (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)
@@ -82,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
@@ -120,6 +128,7 @@
 	(make-instance 'postgresql-database
 		       :name (database-name-from-spec connection-spec
 						      database-type)
+		       :connection-spec connection-spec
 		       :conn-ptr connection)))))
 
 
@@ -269,3 +278,60 @@
           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))
+
+(when (clsql-sys:database-type-library-loaded :postgresql)
+  (clsql-sys:initialize-database-type :database-type :postgresql)
+  (pushnew :postgresql cl:*features*))