sql: add support for rollback-only to transaction, only wrap the outermost transaction's exception with an exception with message 'transaction rolled back'

1 files changed, 7 insertions, 4 deletions

diff --git a/src/clojure/contrib/sql.clj b/src/clojure/contrib/sql.clj
index ea9d8f0d..c3615efd 100644
--- a/src/clojure/contrib/sql.clj
+++ b/src/clojure/contrib/sql.clj
@@ -16,12 +16,11 @@
 ;;  Created 2 April 2008
 
 (ns clojure.contrib.sql
-  (:use [clojure.contrib.def :only (defvar)])
+  (:use [clojure.contrib.def :only (defalias)])
   (:use clojure.contrib.sql.internal))
 
-(defvar connection connection*
-  "Returns the current database connection (or throws if there is none)")
-
+(defalias connection connection*)
+  
 (defmacro with-connection
   "Evaluates body in the context of a new connection to a database then
   closes the connection. db-spec is a map containing string values for
@@ -42,6 +41,10 @@
   [& body]
   `(transaction* (fn [] ~@body)))
 
+(defalias set-rollback-only set-rollback-only*)
+
+(defalias is-rollback-only is-rollback-only*)
+
 (defn do-commands
   "Executes SQL commands on the open database connection."
   [& commands]