projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9471: 5 May 2004 Kevin Rosenberg <kevin@rosenberg.net>
[clsql.git]
/
db-oracle
/
oracle-sql.lisp
diff --git
a/db-oracle/oracle-sql.lisp
b/db-oracle/oracle-sql.lisp
index b5876d44cbff9d96a6358d544af5e1728d65a43c..8ef460229a203916744008f860aa007f7e5b4ed8 100644
(file)
--- a/
db-oracle/oracle-sql.lisp
+++ b/
db-oracle/oracle-sql.lisp
@@
-139,8
+139,7
@@
the length of that format.")
(defun handle-oci-error (&key database nulls-ok)
(cond (database
(defun handle-oci-error (&key database nulls-ok)
(cond (database
- (with-slots (errhp)
- database
+ (with-slots (errhp) database
(uffi:with-foreign-objects ((errbuf '(:array :unsigned-char
#.+errbuf-len+))
(errcode :long))
(uffi:with-foreign-objects ((errbuf '(:array :unsigned-char
#.+errbuf-len+))
(errcode :long))
@@
-924,8
+923,8
@@
the length of that format.")
(defmethod database-execute-command (sql-expression (database oracle-database))
(database-query sql-expression database nil nil)
(defmethod database-execute-command (sql-expression (database oracle-database))
(database-query sql-expression database nil nil)
- ;; HACK HACK HACK
-
(database-query "commit" database nil nil
)
+ (when (database-autocommit database)
+
(oracle-commit database)
)
t)
t)
@@
-993,27
+992,30
@@
the length of that format.")
do (setf (nth i list) (nth i row)))
list)))
do (setf (nth i list) (nth i row)))
list)))
-(defmethod
clsql-sys:
database-start-transaction ((database oracle-database))
+(defmethod database-start-transaction ((database oracle-database))
(call-next-method)
(call-next-method)
- )
-
-;;(with-slots (svchp errhp) database
-;; (osucc (oci-trans-start (uffi:deref-pointer svchp)
-;; (uffi:deref-pointer errhp)
-;; 60
-;; +oci-trans-new+)))
-;; t)
-
+ ;; Not needed with simple transaction
+ #+ignore
+ (with-slots (svchp errhp) database
+ (oci-trans-start (deref-vp svchp)
+ (deref-vp errhp)
+ 60
+ +oci-trans-new+))
+ t)
-(defmethod clsql-sys:database-commit-transaction ((database oracle-database))
-
(call-next-method
)
+
+
(defun oracle-commit (database
)
(with-slots (svchp errhp) database
(with-slots (svchp errhp) database
- (osucc (oci-trans-commit (deref-vp svchp)
- (deref-vp errhp)
- 0)))
+ (osucc (oci-trans-commit (deref-vp svchp)
+ (deref-vp errhp)
+ 0))))
+
+(defmethod database-commit-transaction ((database oracle-database))
+ (call-next-method)
+ (oracle-commit database)
t)
t)
-(defmethod
clsql-sys:
database-abort-transaction ((database oracle-database))
+(defmethod database-abort-transaction ((database oracle-database))
(call-next-method)
(osucc (oci-trans-rollback (deref-vp (svchp database))
(deref-vp (errhp database))
(call-next-method)
(osucc (oci-trans-rollback (deref-vp (svchp database))
(deref-vp (errhp database))