Merge branch 'uncontroversial' of russ@git.acceleration.net:/var/git/clsql into accel

[clsql.git] / db-postgresql-socket3 / sql.lisp

diff --git a/db-postgresql-socket3/sql.lisp b/db-postgresql-socket3/sql.lisp
index 8c2fa3efb695dc2da15ef01eedd48da7c5dbe0cd..6fdef8e1c6b8ea7c404a722f371975cbb9f9acb1 100644 (file)
--- a/db-postgresql-socket3/sql.lisp
+++ b/db-postgresql-socket3/sql.lisp
@@ -58,11 +58,11 @@
   (ecase *backend-warning-behavior*
     (:warn
      (warn 'sql-database-warning :database database
-           :message (postgresql-condition-message condition)))
+           :message (cl-postgres:database-error-message condition)))
     (:error
      (error 'sql-database-error :database database
             :message (format nil "Warning upgraded to error: ~A"
-                             (postgresql-condition-message condition))))
+                             (cl-postgres:database-error-message condition))))
     ((:ignore nil)
      ;; do nothing
      )))
@@ -72,7 +72,7 @@
          :database database
          :expression expression
          :error-id (type-of condition)
-         :message (postgresql-condition-message condition)))
+         :message (cl-postgres:database-error-message condition)))
 
 (defmacro with-postgresql-handlers
     ((database &optional expression)
@@ -84,7 +84,7 @@
        (handler-bind ((postgresql-warning
                        (lambda (c)
                          (convert-to-clsql-warning ,database-var c)))
-                      (postgresql-error
+                      (cl-postgres:database-error
                        (lambda (c)
                          (convert-to-clsql-error
                           ,database-var ,expression-var c))))
@@ -142,7 +142,7 @@
                :database-type database-type
                :connection-spec connection-spec
                :error-id (type-of c)
-               :message (postgresql-condition-message c)))
+               :message (cl-postgres:database-error-message c)))
       (:no-error (connection)
                  ;; Success, make instance
                  (make-instance 'postgresql-socket3-database
@@ -208,50 +208,23 @@
 
 ;;;; Cursoring interface
 
-(defclass cursor ()
-  ((next-row :accessor next-row :initarg :next-row :initform nil)
-   (fields :accessor fields :initarg :fields :initform nil)
-   (next-field :accessor next-field :initarg :next-field :initform nil)
-   (done :accessor done :initarg :done :initform nil)))
-
-(defvar *cursor* ())
-
-(cl-postgres:def-row-reader clsql-cursored-row-reader (fields)
-  (setf *cursor*
-       (make-instance 'cursor
-                      :next-row #'cl-postgres:next-row
-                      :fields fields
-                      :next-field #'cl-postgres:next-field)))
 
 (defmethod database-query-result-set ((expression string)
                                       (database postgresql-socket3-database)
                                       &key full-set result-types)
   (declare (ignore result-types))
   (declare (ignore full-set))
-  (let ((connection (database-connection database))
-       *cursor*)
-    (with-postgresql-handlers (database expression)
-      (cl-postgres:exec-query connection expression 'clsql-cursored-row-reader)
-      (break "Built cursor")
-      (values *cursor* (length (fields *cursor*))))))
+  (error "Cursoring interface is not supported for postgresql-socket3-database try cl-postgres:exec-query with a custom row-reader"))
 
 (defmethod database-dump-result-set (result-set
                                      (database postgresql-socket3-database))
-  (unless (done result-set)
-    (loop :while (funcall (next-row result-set))))
+  (error "Cursoring interface is not supported for postgresql-socket3-database try cl-postgres:exec-query with a custom row-reader")
   T)
 
 (defmethod database-store-next-row (result-set
                                     (database postgresql-socket3-database)
                                     list)
-  (when (and (not (done result-set))
-            (setf (done result-set) (funcall (next-row result-set))))
-    (let* ((data (loop :for field :across (fields result-set)
-                      :collect (funcall (next-field result-set) field))))
-      ;; Maybe?
-      ;(setf list data)
-      (setf (car list) (car data) (cdr list) (cdr data))
-      )))
+  (error "Cursoring interface is not supported for postgresql-socket3-database try cl-postgres:exec-query with a custom row-reader"))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;