X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-postgresql%2Fpostgresql-sql.lisp;h=a3f9b885f442c41b6296ebc1740afeb5d2567127;hb=1b07d2fd927cf8f1943ac0a0b8c980d1dc707076;hp=2d74fc1179e160d765645b66597038a2344080d9;hpb=eb52183ddb786552d5abf6fdfaaca657e0c56ea0;p=clsql.git

diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp
index 2d74fc1..a3f9b88 100644
--- a/db-postgresql/postgresql-sql.lisp
+++ b/db-postgresql/postgresql-sql.lisp
@@ -16,7 +16,7 @@
 (in-package #:cl-user)
 
 (defpackage #:clsql-postgresql
-    (:use #:common-lisp #:clsql-sys #:postgresql #:clsql-uffi)
+    (:use #:common-lisp #:clsql-sys #:pgsql #:clsql-uffi)
     (:export #:postgresql-database)
     (:documentation "This is the CLSQL interface to PostgreSQL."))
 
@@ -222,7 +222,7 @@
                (error 'sql-database-data-error
                       :database database
                       :expression sql-expression
-                      :error-id (uffi:convert-from-foreign-string (PQresultErrorField result +PG-DIAG-SQLSTATE+))
+                      :error-id (PQresultErrorField result +PG-DIAG-SQLSTATE+)
                       :message (tidy-error-message
 				(PQresultErrorMessage result)))))
           (PQclear result))))))
@@ -306,7 +306,7 @@
 
 (defmethod database-create-large-object ((database postgresql-database))
   (lo-create (database-conn-ptr database)
-	     (logior postgresql::+INV_WRITE+ postgresql::+INV_READ+)))
+	     (logior pgsql::+INV_WRITE+ pgsql::+INV_READ+)))
 
 
 #+mb-original
@@ -318,7 +318,7 @@
     (with-transaction (:database database)
        (unwind-protect
 	  (progn 
-	    (setf fd (lo-open ptr object-id postgresql::+INV_WRITE+))
+	    (setf fd (lo-open ptr object-id pgsql::+INV_WRITE+))
 	    (when (>= fd 0)
 	      (when (= (lo-write ptr fd data length) length)
 		(setf result t))))
@@ -336,7 +336,7 @@
     (database-execute-command "begin" database)
     (unwind-protect
 	(progn 
-	  (setf fd (lo-open ptr object-id postgresql::+INV_WRITE+))
+	  (setf fd (lo-open ptr object-id pgsql::+INV_WRITE+))
 	  (when (>= fd 0)
 	    (when (= (lo-write ptr fd data length) length)
 	      (setf result t))))
@@ -357,7 +357,7 @@
     (unwind-protect
        (progn
 	 (database-execute-command "begin" database)
-	 (setf fd (lo-open ptr object-id postgresql::+INV_READ+))
+	 (setf fd (lo-open ptr object-id pgsql::+INV_READ+))
 	 (when (>= fd 0)
 	   (setf length (lo-lseek ptr fd 0 2))
 	   (lo-lseek ptr fd 0 0)
@@ -429,7 +429,7 @@
       (coerce-string db)
       (coerce-string user)
       (let ((connection (PQsetdbLogin host port options tty db user password)))
-        (declare (type postgresql::pgsql-conn-ptr connection))
+        (declare (type pgsql::pgsql-conn-ptr connection))
         (unless (eq (PQstatus connection)
 		    pgsql-conn-status-type#connection-ok)
           ;; Connect failed