From 68227522657192d80ae2188a308c11b095174b9d Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 11 Jan 2007 11:51:57 +0000
Subject: [PATCH] Removed transaction driver exceptions (not needed anymore)

---
 .../Transaction/Firebird/Exception.php        | 34 -------------------
 .../Transaction/Informix/Exception.php        | 34 -------------------
 lib/Doctrine/Transaction/Mssql/Exception.php  | 34 -------------------
 lib/Doctrine/Transaction/Mysql.php            |  3 +-
 lib/Doctrine/Transaction/Mysql/Exception.php  | 34 -------------------
 lib/Doctrine/Transaction/Oracle/Exception.php | 34 -------------------
 lib/Doctrine/Transaction/Pgsql/Exception.php  | 34 -------------------
 lib/Doctrine/Transaction/Sqlite.php           |  2 +-
 lib/Doctrine/Transaction/Sqlite/Exception.php | 34 -------------------
 9 files changed, 2 insertions(+), 241 deletions(-)
 delete mode 100644 lib/Doctrine/Transaction/Firebird/Exception.php
 delete mode 100644 lib/Doctrine/Transaction/Informix/Exception.php
 delete mode 100644 lib/Doctrine/Transaction/Mssql/Exception.php
 delete mode 100644 lib/Doctrine/Transaction/Mysql/Exception.php
 delete mode 100644 lib/Doctrine/Transaction/Oracle/Exception.php
 delete mode 100644 lib/Doctrine/Transaction/Pgsql/Exception.php
 delete mode 100644 lib/Doctrine/Transaction/Sqlite/Exception.php

diff --git a/lib/Doctrine/Transaction/Firebird/Exception.php b/lib/Doctrine/Transaction/Firebird/Exception.php
deleted file mode 100644
index 929ad55ee..000000000
--- a/lib/Doctrine/Transaction/Firebird/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.com>.
- */
-Doctrine::autoload('Doctrine_Transaction_Exception');
-/**
- * Doctrine_Transaction_Firebird_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @since       1.0
- * @version     $Revision$
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- */
-class Doctrine_Transaction_Firebird_Exception extends Doctrine_Transaction_Exception
-{ }
diff --git a/lib/Doctrine/Transaction/Informix/Exception.php b/lib/Doctrine/Transaction/Informix/Exception.php
deleted file mode 100644
index 441065647..000000000
--- a/lib/Doctrine/Transaction/Informix/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.com>.
- */
-Doctrine::autoload('Doctrine_Transaction_Exception');
-/**
- * Doctrine_Transaction_Informix_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @since       1.0
- * @version     $Revision$
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- */
-class Doctrine_Transaction_Informix_Exception extends Doctrine_Transaction_Exception
-{ }
diff --git a/lib/Doctrine/Transaction/Mssql/Exception.php b/lib/Doctrine/Transaction/Mssql/Exception.php
deleted file mode 100644
index 4fa01c4d0..000000000
--- a/lib/Doctrine/Transaction/Mssql/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.com>.
- */
-Doctrine::autoload('Doctrine_Transaction_Exception');
-/**
- * Doctrine_Transaction_Mssql_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @since       1.0
- * @version     $Revision$
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- */
-class Doctrine_Transaction_Mssql_Exception extends Doctrine_Transaction_Exception
-{ }
diff --git a/lib/Doctrine/Transaction/Mysql.php b/lib/Doctrine/Transaction/Mysql.php
index 15ea269bf..d611e63e4 100644
--- a/lib/Doctrine/Transaction/Mysql.php
+++ b/lib/Doctrine/Transaction/Mysql.php
@@ -107,7 +107,6 @@ class Doctrine_Transaction_Mysql extends Doctrine_Transaction
      */
     public function getIsolation()
     {
-        $ret = $this->conn->execute('SELECT @@tx_isolation')->fetch(PDO::FETCH_NUM);
-        return current($ret);
+        return $this->conn->fetchOne('SELECT @@tx_isolation');
     }
 }
diff --git a/lib/Doctrine/Transaction/Mysql/Exception.php b/lib/Doctrine/Transaction/Mysql/Exception.php
deleted file mode 100644
index 359d51bd5..000000000
--- a/lib/Doctrine/Transaction/Mysql/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.com>.
- */
-Doctrine::autoload('Doctrine_Transaction_Exception');
-/**
- * Doctrine_Transaction_Mysql_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @since       1.0
- * @version     $Revision$
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- */
-class Doctrine_Transaction_Mysql_Exception extends Doctrine_Transaction_Exception
-{ }
diff --git a/lib/Doctrine/Transaction/Oracle/Exception.php b/lib/Doctrine/Transaction/Oracle/Exception.php
deleted file mode 100644
index 346acf7cb..000000000
--- a/lib/Doctrine/Transaction/Oracle/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.com>.
- */
-Doctrine::autoload('Doctrine_Transaction_Exception');
-/**
- * Doctrine_Transaction_Oracle_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @since       1.0
- * @version     $Revision$
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- */
-class Doctrine_Transaction_Oracle_Exception extends Doctrine_Transaction_Exception
-{ }
diff --git a/lib/Doctrine/Transaction/Pgsql/Exception.php b/lib/Doctrine/Transaction/Pgsql/Exception.php
deleted file mode 100644
index 436567e53..000000000
--- a/lib/Doctrine/Transaction/Pgsql/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.com>.
- */
-Doctrine::autoload('Doctrine_Transaction_Exception');
-/**
- * Doctrine_Transaction_Pgsql_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @since       1.0
- * @version     $Revision$
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- */
-class Doctrine_Transaction_Pgsql_Exception extends Doctrine_Transaction_Exception
-{ }
diff --git a/lib/Doctrine/Transaction/Sqlite.php b/lib/Doctrine/Transaction/Sqlite.php
index 39137abf1..76fa2e3ae 100644
--- a/lib/Doctrine/Transaction/Sqlite.php
+++ b/lib/Doctrine/Transaction/Sqlite.php
@@ -59,7 +59,7 @@ class Doctrine_Transaction_Sqlite extends Doctrine_Transaction
                 throw new Doctrine_Transaction_Exception('Isolation level ' . $isolation . 'is not supported.');
         }
 
-        $query = 'PRAGMA read_uncommitted = '.$isolation;
+        $query = 'PRAGMA read_uncommitted = ' . $isolation;
 
         return $this->conn->execute($query);
     }
diff --git a/lib/Doctrine/Transaction/Sqlite/Exception.php b/lib/Doctrine/Transaction/Sqlite/Exception.php
deleted file mode 100644
index 0c11619a9..000000000
--- a/lib/Doctrine/Transaction/Sqlite/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.com>.
- */
-Doctrine::autoload('Doctrine_Transaction_Exception');
-/**
- * Doctrine_Transaction_Sqlite_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @since       1.0
- * @version     $Revision$
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- */
-class Doctrine_Transaction_Sqlite_Exception extends Doctrine_Transaction_Exception
-{ }