From 98c1f66b640544b77524b45624ba0ccf820f1915 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 23 Nov 2006 15:30:22 +0000
Subject: [PATCH] small fixes for transaction drivers

---
 lib/Doctrine/Transaction/Firebird.php | 6 +++---
 lib/Doctrine/Transaction/Oracle.php   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/Transaction/Firebird.php b/lib/Doctrine/Transaction/Firebird.php
index ea22bf4a3..2b82e2aab 100644
--- a/lib/Doctrine/Transaction/Firebird.php
+++ b/lib/Doctrine/Transaction/Firebird.php
@@ -106,7 +106,7 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction {
             switch ($options['wait']) {
                 case 'WAIT':
                 case 'NO WAIT':
-                    $wait = $options['wait'];
+                    $wait = ' ' . $options['wait'];
                 break;
                 default:
                     throw new Doctrine_Transaction_Exception('wait option is not supported: ' . $options['wait']);
@@ -117,14 +117,14 @@ class Doctrine_Transaction_Firebird extends Doctrine_Transaction {
             switch ($options['rw']) {
                 case 'READ ONLY':
                 case 'READ WRITE':
-                    $rw = $options['wait'];
+                    $rw = ' ' . $options['wait'];
                 break;
                 default:
                     throw new Doctrine_Transaction_Exception('wait option is not supported: ' . $options['rw']);
             }
         }
 
-        $query = 'SET TRANSACTION ' . $rw . ' ' . $wait .' ISOLATION LEVEL ' . $nativeIsolation;
+        $query = 'SET TRANSACTION' . $rw . $wait .' ISOLATION LEVEL ' . $nativeIsolation;
 
         $this->conn->getDbh()->query($query);
     }
diff --git a/lib/Doctrine/Transaction/Oracle.php b/lib/Doctrine/Transaction/Oracle.php
index e73a26b2e..050193fda 100644
--- a/lib/Doctrine/Transaction/Oracle.php
+++ b/lib/Doctrine/Transaction/Oracle.php
@@ -93,6 +93,6 @@ class Doctrine_Transaction_Oracle extends Doctrine_Transaction {
         }
 
         $query = 'ALTER SESSION ISOLATION LEVEL ' . $isolation;
-        return $this->dbh->query($query);
+        return $this->conn->getDbh()->query($query);
     }
 }