X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-postgresql-socket%2Fpostgresql-socket-sql.lisp;h=24597c0d6459f8cd0c4c77afcbaa02a1a2a3b626;hp=180b036904613be3a0fa5529737b8dc08e53ffde;hb=1dda729b250779079efbdc1d3f6bbb3ae4a20ba4;hpb=9711a224f9684aaaba08e20eaab826be1beee460

diff --git a/db-postgresql-socket/postgresql-socket-sql.lisp b/db-postgresql-socket/postgresql-socket-sql.lisp
index 180b036..24597c0 100644
--- a/db-postgresql-socket/postgresql-socket-sql.lisp
+++ b/db-postgresql-socket/postgresql-socket-sql.lisp
@@ -104,8 +104,17 @@ doesn't depend on UFFI."
 
 
 (defun convert-to-clsql-warning (database condition)
-  (warn 'clsql-database-warning :database database
-	:message (postgresql-condition-message condition)))
+  (ecase *backend-warning-behavior*
+    (:warn
+     (warn 'clsql-database-warning :database database
+	   :message (postgresql-condition-message condition)))
+    (:error
+     (error 'clsql-sql-error :database database
+	    :message (format nil "Warning upgraded to error: ~A" 
+			     (postgresql-condition-message condition))))
+    ((:ignore nil)
+     ;; do nothing
+     )))
 
 (defun convert-to-clsql-error (database expression condition)
   (error 'clsql-sql-error :database database
@@ -127,7 +136,6 @@ doesn't depend on UFFI."
 		       (lambda (c)
 			 (convert-to-clsql-error
 			  ,database-var ,expression-var c))))
-	 ;; KMR - removed double @@
 	 ,@body))))
 
 (defmethod database-initialize-database-type ((database-type
@@ -239,23 +247,23 @@ doesn't depend on UFFI."
 	  (wait-for-query-results connection)
 	(when (eq status :cursor)
 	  (loop
-	      (multiple-value-bind (row stuff)
-		  (skip-cursor-row result)
-		(unless row
-		  (setq status :completed result stuff)
-		  (return)))))
+	    (multiple-value-bind (row stuff)
+		(skip-cursor-row result)
+	      (unless row
+		(setq status :completed result stuff)
+		(return)))))
 	(cond
-	  ((null status)
-	   t)
-	  ((eq status :completed)
-	   (unless (null (wait-for-query-results connection))
+	 ((null status)
+	  t)
+	 ((eq status :completed)
+	  (unless (null (wait-for-query-results connection))
 	     (close-postgresql-connection connection)
 	     (error 'clsql-sql-error
 		    :database database
 		    :expression expression
 		    :errno 'multiple-results
 		    :error "Received multiple results for command."))
-	   result)
+	  result)
 	  (t
 	   (close-postgresql-connection connection)
 	   (error 'clsql-sql-error