From 3114ebd821020d5c72bb69d6d0fdc0352c6ff90c Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 25 Jan 2007 22:43:04 +0000
Subject: [PATCH] Removed futile datadict exception classes

---
 lib/Doctrine/DataDict/Firebird.php           |  2 +-
 lib/Doctrine/DataDict/Firebird/Exception.php | 34 --------------------
 lib/Doctrine/DataDict/Informix/Exception.php | 34 --------------------
 lib/Doctrine/DataDict/Mssql.php              |  6 ++--
 lib/Doctrine/DataDict/Mssql/Exception.php    | 34 --------------------
 lib/Doctrine/DataDict/Mysql.php              |  4 +--
 lib/Doctrine/DataDict/Mysql/Exception.php    | 34 --------------------
 lib/Doctrine/DataDict/Oracle.php             |  2 +-
 lib/Doctrine/DataDict/Oracle/Exception.php   | 34 --------------------
 lib/Doctrine/DataDict/Pgsql.php              |  4 +--
 lib/Doctrine/DataDict/Pgsql/Exception.php    | 34 --------------------
 lib/Doctrine/DataDict/Sqlite.php             |  4 +--
 lib/Doctrine/DataDict/Sqlite/Exception.php   | 34 --------------------
 13 files changed, 10 insertions(+), 250 deletions(-)
 delete mode 100644 lib/Doctrine/DataDict/Firebird/Exception.php
 delete mode 100644 lib/Doctrine/DataDict/Informix/Exception.php
 delete mode 100644 lib/Doctrine/DataDict/Mssql/Exception.php
 delete mode 100644 lib/Doctrine/DataDict/Mysql/Exception.php
 delete mode 100644 lib/Doctrine/DataDict/Oracle/Exception.php
 delete mode 100644 lib/Doctrine/DataDict/Pgsql/Exception.php
 delete mode 100644 lib/Doctrine/DataDict/Sqlite/Exception.php

diff --git a/lib/Doctrine/DataDict/Firebird.php b/lib/Doctrine/DataDict/Firebird.php
index 5fb5ee0b9..b3522016e 100644
--- a/lib/Doctrine/DataDict/Firebird.php
+++ b/lib/Doctrine/DataDict/Firebird.php
@@ -173,7 +173,7 @@ class Doctrine_DataDict_Firebird extends Doctrine_DataDict
                 $length = null;
                 break;
             default:
-                throw new Doctrine_DataDict_Firebird_Exception('unknown database attribute type: '.$dbType);
+                throw new Doctrine_DataDict_Exception('unknown database attribute type: '.$dbType);
         }
 
         return array($type, $length, $unsigned, $fixed);
diff --git a/lib/Doctrine/DataDict/Firebird/Exception.php b/lib/Doctrine/DataDict/Firebird/Exception.php
deleted file mode 100644
index 6b8ca8ab2..000000000
--- a/lib/Doctrine/DataDict/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_DataDict_Exception');
-/**
- * Doctrine_DataDict_Sqlite_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- * @since       1.0
- * @version     $Revision$
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_DataDict_Firebird_Exception extends Doctrine_DataDict_Exception
-{ }
diff --git a/lib/Doctrine/DataDict/Informix/Exception.php b/lib/Doctrine/DataDict/Informix/Exception.php
deleted file mode 100644
index cf4fe7a08..000000000
--- a/lib/Doctrine/DataDict/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_DataDict_Informix_Exception');
-/**
- * Doctrine_DataDict_Sqlite_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- * @since       1.0
- * @version     $Revision$
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_DataDict_Informix_Exception extends Doctrine_DataDict_Exception
-{ }
diff --git a/lib/Doctrine/DataDict/Mssql.php b/lib/Doctrine/DataDict/Mssql.php
index 205d9cacd..7af719899 100644
--- a/lib/Doctrine/DataDict/Mssql.php
+++ b/lib/Doctrine/DataDict/Mssql.php
@@ -170,11 +170,9 @@ class Doctrine_DataDict_Mssql extends Doctrine_DataDict
                 $length = null;
             break;
             default:
-                throw new Doctrine_DataDict_Mssql_Exception('unknown database attribute type: '.$db_type);
+                throw new Doctrine_DataDict_Exception('unknown database attribute type: '.$db_type);
         }
-
-
-
+        
         return array($type, $length, $unsigned, $fixed);
     }
 }
diff --git a/lib/Doctrine/DataDict/Mssql/Exception.php b/lib/Doctrine/DataDict/Mssql/Exception.php
deleted file mode 100644
index 2c106287f..000000000
--- a/lib/Doctrine/DataDict/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_DataDict_Exception');
-/**
- * Doctrine_DataDict_Mssql_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- * @since       1.0
- * @version     $Revision$
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_DataDict_Mssql_Exception extends Doctrine_DataDict_Exception
-{ }
diff --git a/lib/Doctrine/DataDict/Mysql.php b/lib/Doctrine/DataDict/Mysql.php
index c94c3625d..fdd336684 100644
--- a/lib/Doctrine/DataDict/Mysql.php
+++ b/lib/Doctrine/DataDict/Mysql.php
@@ -356,7 +356,7 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
                 $length = null;
             break;
             default:
-                throw new Doctrine_DataDict_Mysql_Exception('unknown database attribute type: '.$dbType);
+                throw new Doctrine_DataDict_Exception('unknown database attribute type: '.$dbType);
         }
 
         $length = ((int) $length == 0) ? null : (int) $length;
@@ -422,7 +422,7 @@ class Doctrine_DataDict_Mysql extends Doctrine_DataDict
             if ($field['default'] === '') {
                 $field['default'] = empty($field['notnull']) ? null : 0;
             }
-            $default = ' DEFAULT '.$this->conn->getDbh()->quote($field['default']);
+            $default = ' DEFAULT '.$this->conn->quote($field['default']);
         }
         /**
         elseif (empty($field['notnull'])) {
diff --git a/lib/Doctrine/DataDict/Mysql/Exception.php b/lib/Doctrine/DataDict/Mysql/Exception.php
deleted file mode 100644
index e3804e3fa..000000000
--- a/lib/Doctrine/DataDict/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_DataDict_Exception');
-/**
- * Doctrine_DataDict_Mysql_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- * @since       1.0
- * @version     $Revision$
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_DataDict_Mysql_Exception extends Doctrine_DataDict_Exception
-{ }
diff --git a/lib/Doctrine/DataDict/Oracle.php b/lib/Doctrine/DataDict/Oracle.php
index 126e6d770..22054ec9b 100644
--- a/lib/Doctrine/DataDict/Oracle.php
+++ b/lib/Doctrine/DataDict/Oracle.php
@@ -174,7 +174,7 @@ class Doctrine_DataDict_Oracle extends Doctrine_DataDict
             case 'rowid':
             case 'urowid':
             default:
-                throw new Doctrine_DataDict_Oracle_Exception('unknown database attribute type: '.$db_type);
+                throw new Doctrine_DataDict_Exception('unknown database attribute type: '.$db_type);
         }
 
         return array($type, $length, $unsigned, $fixed);
diff --git a/lib/Doctrine/DataDict/Oracle/Exception.php b/lib/Doctrine/DataDict/Oracle/Exception.php
deleted file mode 100644
index 1584a85cc..000000000
--- a/lib/Doctrine/DataDict/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_DataDict_Exception');
-/**
- * Doctrine_DataDict_Oracle_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- * @since       1.0
- * @version     $Revision$
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_DataDict_Oracle_Exception extends Doctrine_DataDict_Exception
-{ }
diff --git a/lib/Doctrine/DataDict/Pgsql.php b/lib/Doctrine/DataDict/Pgsql.php
index 75706593b..4ff2ff19b 100644
--- a/lib/Doctrine/DataDict/Pgsql.php
+++ b/lib/Doctrine/DataDict/Pgsql.php
@@ -412,7 +412,7 @@ class Doctrine_DataDict_Pgsql extends Doctrine_DataDict
                 $length = !empty($field['length']) ? $field['length'] : 18;
                 return 'NUMERIC(' . $length . ',' . $this->conn->getAttribute(Doctrine::ATTR_DECIMAL_PLACES) . ')';
             default:
-                throw new Doctrine_DataDict_Pgsql_Exception('Unknown field type '. $field['type']);
+                throw new Doctrine_DataDict_Exception('Unknown field type '. $field['type']);
         }
     }
     /**
@@ -537,7 +537,7 @@ class Doctrine_DataDict_Pgsql extends Doctrine_DataDict
                 $length = null;
                 break;
             default:
-                throw new Doctrine_DataDict_Pgsql_Exception('unknown database attribute type: '.$db_type);
+                throw new Doctrine_DataDict_Exception('unknown database attribute type: '.$db_type);
         }
 
         return array($type, $length, $unsigned, $fixed);
diff --git a/lib/Doctrine/DataDict/Pgsql/Exception.php b/lib/Doctrine/DataDict/Pgsql/Exception.php
deleted file mode 100644
index 65f33d53a..000000000
--- a/lib/Doctrine/DataDict/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_DataDict_Exception');
-/**
- * Doctrine_DataDict_Pgsql_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- * @since       1.0
- * @version     $Revision$
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_DataDict_Pgsql_Exception extends Doctrine_DataDict_Exception
-{ }
diff --git a/lib/Doctrine/DataDict/Sqlite.php b/lib/Doctrine/DataDict/Sqlite.php
index 19e92e519..669c854ff 100644
--- a/lib/Doctrine/DataDict/Sqlite.php
+++ b/lib/Doctrine/DataDict/Sqlite.php
@@ -112,7 +112,7 @@ class Doctrine_DataDict_Sqlite extends Doctrine_DataDict
                 $length = !empty($field['length']) ? $field['length'] : 18;
                 return 'DECIMAL('.$length.','.$this->conn->options['decimal_places'].')';
         }
-        throw new Doctrine_DataDict_Sqlite_Exception('Unknown datatype ' . $field['type']);
+        throw new Doctrine_DataDict_Exception('Unknown datatype ' . $field['type']);
     }
     /**
      * Maps a native array description of a field to Doctrine datatype and length
@@ -227,7 +227,7 @@ class Doctrine_DataDict_Sqlite extends Doctrine_DataDict
                 $length = null;
                 break;
             default:
-                throw new Doctrine_DataDict_Sqlite_Exception('unknown database attribute type: '.$dbType);
+                throw new Doctrine_DataDict_Exception('unknown database attribute type: '.$dbType);
         }
 
         return array($type, $length, $unsigned, $fixed);
diff --git a/lib/Doctrine/DataDict/Sqlite/Exception.php b/lib/Doctrine/DataDict/Sqlite/Exception.php
deleted file mode 100644
index ddf9a8f0f..000000000
--- a/lib/Doctrine/DataDict/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_DataDict_Exception');
-/**
- * Doctrine_DataDict_Sqlite_Exception
- *
- * @package     Doctrine
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- * @since       1.0
- * @version     $Revision$
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- */
-class Doctrine_DataDict_Sqlite_Exception extends Doctrine_DataDict_Exception
-{ }