diff --git a/lib/Doctrine/Import/Mssql.php b/lib/Doctrine/Import/Mssql.php
index b88a477f4..445d71844 100644
--- a/lib/Doctrine/Import/Mssql.php
+++ b/lib/Doctrine/Import/Mssql.php
@@ -1,199 +1,199 @@
-<?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_Import');
-/**
- * @package     Doctrine
- * @subpackage  Import
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @author      Frank M. Kromann <frank@kromann.info> (PEAR MDB2 Mssql driver)
- * @author      David Coallier <davidc@php.net> (PEAR MDB2 Mssql driver)
- * @version     $Revision$
- * @link        www.phpdoctrine.com
- * @since       1.0
- */
-class Doctrine_Import_Mssql extends Doctrine_Import
-{
-    /**
-     * lists all database sequences
-     *
-     * @param string|null $database
-     * @return array
-     */
-    public function listSequences($database = null)
-    {
-        $query = "SELECT name FROM sysobjects WHERE xtype = 'U'";
-        $tableNames = $this->conn->fetchColumn($query);
-
-        return array_map(array($this->conn->formatter, 'fixSequenceName'), $tableNames);
-    }
-
-    /**
-     * lists table constraints
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableColumns($table)
-    {
-        $sql     = 'EXEC sp_columns @table_name = ' . $this->conn->quoteIdentifier($table, true);
-        $result  = $this->conn->fetchAssoc($sql);
-        $columns = array();
-
-        foreach ($result as $key => $val) {
-            $val = array_change_key_case($val, CASE_LOWER);
-
-            if (strstr($val['type_name'], ' ')) {
-                list($type, $identity) = explode(' ', $val['type_name']);
-            } else {
-                $type = $val['type_name'];
-                $identity = '';
-            }
-
-            if ($type == 'varchar') {
-                $type .= '(' . $val['length'] . ')';
-            }
-
-            $decl = $this->conn->dataDict->getPortableDeclaration($val);
-
-            $description  = array(
-                'name'      => $val['column_name'],
-                'ntype'     => $type,
-                'type'      => $decl['type'][0],
-                'alltypes'  => $decl['type'],
-                'length'    => $decl['length'],
-                'fixed'     => $decl['fixed'],
-                'unsigned'  => $decl['unsigned'],
-                'notnull'   => (bool) ($val['is_nullable'] === 'NO'),
-                'default'   => $val['column_def'],
-                'primary'   => (strtolower($identity) == 'identity'),
-            );
-            $columns[$val['column_name']] = $description;
-        }
-
-        return $columns;
-    }
-
-    /**
-     * lists table constraints
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableIndexes($table)
-    {
-
-    }
-
-    /**
-     * lists tables
-     *
-     * @param string|null $database
-     * @return array
-     */
-    public function listTables($database = null)
-    {
-        $sql = "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name";
-
-        return $this->conn->fetchColumn($sql);
-    }
-
-    /**
-     * lists all triggers
-     *
-     * @return array
-     */
-    public function listTriggers($database = null)
-    {
-        $query = "SELECT name FROM sysobjects WHERE xtype = 'TR'";
-
-        $result = $this->conn->fetchColumn($query);
-
-        return $result;
-    }
-
-    /**
-     * lists table triggers
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableTriggers($table)
-    {
-        $table = $this->conn->quote($table, 'text');
-        $query = "SELECT name FROM sysobjects WHERE xtype = 'TR' AND object_name(parent_obj) = " . $table;
-
-        $result = $this->conn->fetchColumn($query);
-
-        return $result;
-    }
-
-    /**
-     * lists table views
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableViews($table)
-    {
-        $keyName = 'INDEX_NAME';
-        $pkName = 'PK_NAME';
-        if ($this->conn->options['portability'] & Doctrine::PORTABILITY_FIX_CASE) {
-            if ($this->conn->options['field_case'] == CASE_LOWER) {
-                $keyName = strtolower($keyName);
-                $pkName  = strtolower($pkName);
-            } else {
-                $keyName = strtoupper($keyName);
-                $pkName  = strtoupper($pkName);
-            }
-        }
-        $table = $this->conn->quote($table, 'text');
-        $query = 'EXEC sp_statistics @table_name = ' . $table;
-        $indexes = $this->conn->fetchColumn($query, $keyName);
-
-        $query = 'EXEC sp_pkeys @table_name = ' . $table;
-        $pkAll = $this->conn->fetchColumn($query, $pkName);
-
-        $result = array();
-
-        foreach ($indexes as $index) {
-            if ( ! in_array($index, $pkAll) && $index != null) {
-                $result[] = $this->conn->formatter->fixIndexName($index);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * lists database views
-     *
-     * @param string|null $database
-     * @return array
-     */
-    public function listViews($database = null)
-    {
-        $query = "SELECT name FROM sysobjects WHERE xtype = 'V'";
-
-        return $this->conn->fetchColumn($query);
-    }
+<?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_Import');
+/**
+ * @package     Doctrine
+ * @subpackage  Import
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
+ * @author      Frank M. Kromann <frank@kromann.info> (PEAR MDB2 Mssql driver)
+ * @author      David Coallier <davidc@php.net> (PEAR MDB2 Mssql driver)
+ * @version     $Revision$
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ */
+class Doctrine_Import_Mssql extends Doctrine_Import
+{
+    /**
+     * lists all database sequences
+     *
+     * @param string|null $database
+     * @return array
+     */
+    public function listSequences($database = null)
+    {
+        $query = "SELECT name FROM sysobjects WHERE xtype = 'U'";
+        $tableNames = $this->conn->fetchColumn($query);
+
+        return array_map(array($this->conn->formatter, 'fixSequenceName'), $tableNames);
+    }
+
+    /**
+     * lists table constraints
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableColumns($table)
+    {
+        $sql     = 'EXEC sp_columns @table_name = ' . $this->conn->quoteIdentifier($table, true);
+        $result  = $this->conn->fetchAssoc($sql);
+        $columns = array();
+
+        foreach ($result as $key => $val) {
+            $val = array_change_key_case($val, CASE_LOWER);
+
+            if (strstr($val['type_name'], ' ')) {
+                list($type, $identity) = explode(' ', $val['type_name']);
+            } else {
+                $type = $val['type_name'];
+                $identity = '';
+            }
+
+            if ($type == 'varchar') {
+                $type .= '(' . $val['length'] . ')';
+            }
+
+            $decl = $this->conn->dataDict->getPortableDeclaration($val);
+
+            $description  = array(
+                'name'      => $val['column_name'],
+                'ntype'     => $type,
+                'type'      => $decl['type'][0],
+                'alltypes'  => $decl['type'],
+                'length'    => $decl['length'],
+                'fixed'     => $decl['fixed'],
+                'unsigned'  => $decl['unsigned'],
+                'notnull'   => (bool) ($val['is_nullable'] === 'NO'),
+                'default'   => $val['column_def'],
+                'primary'   => (strtolower($identity) == 'identity'),
+            );
+            $columns[$val['column_name']] = $description;
+        }
+
+        return $columns;
+    }
+
+    /**
+     * lists table constraints
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableIndexes($table)
+    {
+
+    }
+
+    /**
+     * lists tables
+     *
+     * @param string|null $database
+     * @return array
+     */
+    public function listTables($database = null)
+    {
+        $sql = "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name";
+
+        return $this->conn->fetchColumn($sql);
+    }
+
+    /**
+     * lists all triggers
+     *
+     * @return array
+     */
+    public function listTriggers($database = null)
+    {
+        $query = "SELECT name FROM sysobjects WHERE xtype = 'TR'";
+
+        $result = $this->conn->fetchColumn($query);
+
+        return $result;
+    }
+
+    /**
+     * lists table triggers
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableTriggers($table)
+    {
+        $table = $this->conn->quote($table, 'text');
+        $query = "SELECT name FROM sysobjects WHERE xtype = 'TR' AND object_name(parent_obj) = " . $table;
+
+        $result = $this->conn->fetchColumn($query);
+
+        return $result;
+    }
+
+    /**
+     * lists table views
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableViews($table)
+    {
+        $keyName = 'INDEX_NAME';
+        $pkName = 'PK_NAME';
+        if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_FIX_CASE) {
+            if ($this->conn->getAttribute(Doctrine::ATTR_FIELD_CASE) == CASE_LOWER) {
+                $keyName = strtolower($keyName);
+                $pkName  = strtolower($pkName);
+            } else {
+                $keyName = strtoupper($keyName);
+                $pkName  = strtoupper($pkName);
+            }
+        }
+        $table = $this->conn->quote($table, 'text');
+        $query = 'EXEC sp_statistics @table_name = ' . $table;
+        $indexes = $this->conn->fetchColumn($query, $keyName);
+
+        $query = 'EXEC sp_pkeys @table_name = ' . $table;
+        $pkAll = $this->conn->fetchColumn($query, $pkName);
+
+        $result = array();
+
+        foreach ($indexes as $index) {
+            if ( ! in_array($index, $pkAll) && $index != null) {
+                $result[] = $this->conn->formatter->fixIndexName($index);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * lists database views
+     *
+     * @param string|null $database
+     * @return array
+     */
+    public function listViews($database = null)
+    {
+        $query = "SELECT name FROM sysobjects WHERE xtype = 'V'";
+
+        return $this->conn->fetchColumn($query);
+    }
 }
\ No newline at end of file
diff --git a/lib/Doctrine/Import/Mysql.php b/lib/Doctrine/Import/Mysql.php
index 947278076..d66e9b371 100644
--- a/lib/Doctrine/Import/Mysql.php
+++ b/lib/Doctrine/Import/Mysql.php
@@ -1,211 +1,211 @@
-<?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_Import');
-/**
- * @package     Doctrine
- * @subpackage  Import
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @version     $Revision$
- * @link        www.phpdoctrine.com
- * @since       1.0
- */
-class Doctrine_Import_Mysql extends Doctrine_Import
-{
-    protected $sql  = array(
-                            'showDatabases'   => 'SHOW DATABASES',
-                            'listTableFields' => 'DESCRIBE %s',
-                            'listSequences'   => 'SHOW TABLES',
-                            'listTables'      => 'SHOW TABLES',
-                            'listUsers'       => 'SELECT DISTINCT USER FROM USER',
-                            'listViews'       => "SHOW FULL TABLES %sWHERE Table_type = 'VIEW'",
-                            );
-
-    /**
-     * lists all database sequences
-     *
-     * @param string|null $database
-     * @return array
-     */
-    public function listSequences($database = null)
-    {
-        $query = 'SHOW TABLES';
-        if ( ! is_null($database)) {
-            $query .= ' FROM ' . $database;
-        }
-        $tableNames = $this->conn->fetchColumn($query);
-
-        return array_map(array($this->conn, 'fixSequenceName'), $tableNames);
-    }
-
-    /**
-     * lists table constraints
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableConstraints($table)
-    {
-        $keyName = 'Key_name';
-        $nonUnique = 'Non_unique';
-        if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_FIX_CASE) {
-            if ($this->conn->options['field_case'] == CASE_LOWER) {
-                $keyName = strtolower($keyName);
-                $nonUnique = strtolower($nonUnique);
-            } else {
-                $keyName = strtoupper($keyName);
-                $nonUnique = strtoupper($nonUnique);
-            }
-        }
-
-        $table = $this->conn->quoteIdentifier($table, true);
-        $query = 'SHOW INDEX FROM ' . $table;
-        $indexes = $this->conn->fetchAssoc($query);
-
-        $result = array();
-        foreach ($indexes as $indexData) {
-            if ( ! $indexData[$nonUnique]) {
-                if ($indexData[$keyName] !== 'PRIMARY') {
-                    $index = $this->conn->fixIndexName($indexData[$keyName]);
-                } else {
-                    $index = 'PRIMARY';
-                }
-                if ( ! empty($index)) {
-                    $result[] = $index;
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * lists table foreign keys
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableForeignKeys($table) 
-    {
-        $sql = 'SHOW CREATE TABLE ' . $this->conn->quoteIdentifier($table, true);    
-    }
-
-    /**
-     * lists table constraints
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableColumns($table)
-    {
-        $sql = 'DESCRIBE ' . $this->conn->quoteIdentifier($table, true);
-        $result = $this->conn->fetchAssoc($sql);
-
-        $description = array();
-        foreach ($result as $key => $val) {
-
-            $val = array_change_key_case($val, CASE_LOWER);
-
-            $decl = $this->conn->dataDict->getPortableDeclaration($val);
-
-            $values = isset($decl['values']) ? $decl['values'] : array();
-
-            $description = array(
-                'name'      => $val['field'],
-                'type'      => $decl['type'][0],
-                'alltypes'  => $decl['type'],
-                'ntype'     => $val['type'],
-                'length'    => $decl['length'],
-                'fixed'     => $decl['fixed'],
-                'unsigned'  => $decl['unsigned'],
-                'values'    => $values,
-                'primary'   => (strtolower($val['key']) == 'pri'),
-                'default'   => $val['default'],
-                'notnull'   => (bool) ($val['null'] != 'YES'),
-                'autoinc'   => (bool) (strpos($val['extra'], 'auto_increment') !== false),
-            );
-            $columns[$val['field']] = $description;
-        }
-
-
-        return $columns;
-    }
-
-    /**
-     * lists table constraints
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableIndexes($table)
-    {
-        $keyName = 'Key_name';
-        $nonUnique = 'Non_unique';
-        if ($this->conn->options['portability'] & Doctrine::PORTABILITY_FIX_CASE) {
-            if ($this->conn->options['field_case'] == CASE_LOWER) {
-                $keyName = strtolower($keyName);
-                $nonUnique = strtolower($nonUnique);
-            } else {
-                $keyName = strtoupper($keyName);
-                $nonUnique = strtoupper($nonUnique);
-            }
-        }
-
-        $table = $this->conn->quoteIdentifier($table, true);
-        $query = 'SHOW INDEX FROM ' . $table;
-        $indexes = $this->conn->fetchAssoc($query);
-
-
-        $result = array();
-        foreach ($indexes as $indexData) {
-            if ($indexData[$nonUnique] && ($index = $this->conn->fixIndexName($indexData[$keyName]))) {
-                $result[] = $index;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * lists tables
-     *
-     * @param string|null $database
-     * @return array
-     */
-    public function listTables($database = null)
-    {
-        return $this->conn->fetchColumn($this->sql['listTables']);
-    }
-
-    /**
-     * lists database views
-     *
-     * @param string|null $database
-     * @return array
-     */
-    public function listViews($database = null)
-    {
-        if ( ! is_null($database)) {
-            $query = sprintf($this->sql['listViews'], ' FROM ' . $database);
-        }
-
-        return $this->conn->fetchColumn($query);
-    }
+<?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_Import');
+/**
+ * @package     Doctrine
+ * @subpackage  Import
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
+ * @version     $Revision$
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ */
+class Doctrine_Import_Mysql extends Doctrine_Import
+{
+    protected $sql  = array(
+                            'showDatabases'   => 'SHOW DATABASES',
+                            'listTableFields' => 'DESCRIBE %s',
+                            'listSequences'   => 'SHOW TABLES',
+                            'listTables'      => 'SHOW TABLES',
+                            'listUsers'       => 'SELECT DISTINCT USER FROM USER',
+                            'listViews'       => "SHOW FULL TABLES %s WHERE Table_type = 'VIEW'",
+                            );
+
+    /**
+     * lists all database sequences
+     *
+     * @param string|null $database
+     * @return array
+     */
+    public function listSequences($database = null)
+    {
+        $query = 'SHOW TABLES';
+        if ( ! is_null($database)) {
+            $query .= ' FROM ' . $database;
+        }
+        $tableNames = $this->conn->fetchColumn($query);
+
+        return array_map(array($this->conn->formatter, 'fixSequenceName'), $tableNames);
+    }
+
+    /**
+     * lists table constraints
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableConstraints($table)
+    {
+        $keyName = 'Key_name';
+        $nonUnique = 'Non_unique';
+        if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_FIX_CASE) {
+            if ($this->conn->getAttribute(Doctrine::ATTR_FIELD_CASE) == CASE_LOWER) {
+                $keyName = strtolower($keyName);
+                $nonUnique = strtolower($nonUnique);
+            } else {
+                $keyName = strtoupper($keyName);
+                $nonUnique = strtoupper($nonUnique);
+            }
+        }
+
+        $table = $this->conn->quoteIdentifier($table, true);
+        $query = 'SHOW INDEX FROM ' . $table;
+        $indexes = $this->conn->fetchAssoc($query);
+
+        $result = array();
+        foreach ($indexes as $indexData) {
+            if ( ! $indexData[$nonUnique]) {
+                if ($indexData[$keyName] !== 'PRIMARY') {
+                    $index = $this->conn->formatter->fixIndexName($indexData[$keyName]);
+                } else {
+                    $index = 'PRIMARY';
+                }
+                if ( ! empty($index)) {
+                    $result[] = $index;
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * lists table foreign keys
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableForeignKeys($table) 
+    {
+        $sql = 'SHOW CREATE TABLE ' . $this->conn->quoteIdentifier($table, true);    
+    }
+
+    /**
+     * lists table constraints
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableColumns($table)
+    {
+        $sql = 'DESCRIBE ' . $this->conn->quoteIdentifier($table, true);
+        $result = $this->conn->fetchAssoc($sql);
+
+        $description = array();
+        foreach ($result as $key => $val) {
+
+            $val = array_change_key_case($val, CASE_LOWER);
+
+            $decl = $this->conn->dataDict->getPortableDeclaration($val);
+
+            $values = isset($decl['values']) ? $decl['values'] : array();
+
+            $description = array(
+                'name'      => $val['field'],
+                'type'      => $decl['type'][0],
+                'alltypes'  => $decl['type'],
+                'ntype'     => $val['type'],
+                'length'    => $decl['length'],
+                'fixed'     => $decl['fixed'],
+                'unsigned'  => $decl['unsigned'],
+                'values'    => $values,
+                'primary'   => (strtolower($val['key']) == 'pri'),
+                'default'   => $val['default'],
+                'notnull'   => (bool) ($val['null'] != 'YES'),
+                'autoinc'   => (bool) (strpos($val['extra'], 'auto_increment') !== false),
+            );
+            $columns[$val['field']] = $description;
+        }
+
+
+        return $columns;
+    }
+
+    /**
+     * lists table constraints
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableIndexes($table)
+    {
+        $keyName = 'Key_name';
+        $nonUnique = 'Non_unique';
+        if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_FIX_CASE) {
+            if ($this->conn->getAttribute(Doctrine::ATTR_FIELD_CASE) == CASE_LOWER) {
+                $keyName = strtolower($keyName);
+                $nonUnique = strtolower($nonUnique);
+            } else {
+                $keyName = strtoupper($keyName);
+                $nonUnique = strtoupper($nonUnique);
+            }
+        }
+
+        $table = $this->conn->quoteIdentifier($table, true);
+        $query = 'SHOW INDEX FROM ' . $table;
+        $indexes = $this->conn->fetchAssoc($query);
+
+
+        $result = array();
+        foreach ($indexes as $indexData) {
+            if ($indexData[$nonUnique] && ($index = $this->conn->formatter->fixIndexName($indexData[$keyName]))) {
+                $result[] = $index;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * lists tables
+     *
+     * @param string|null $database
+     * @return array
+     */
+    public function listTables($database = null)
+    {
+        return $this->conn->fetchColumn($this->sql['listTables']);
+    }
+
+    /**
+     * lists database views
+     *
+     * @param string|null $database
+     * @return array
+     */
+    public function listViews($database = null)
+    {
+        if ( ! is_null($database)) {
+            $query = sprintf($this->sql['listViews'], ' FROM ' . $database);
+        }
+
+        return $this->conn->fetchColumn($query);
+    }
 }
\ No newline at end of file
diff --git a/lib/Doctrine/Import/Sqlite.php b/lib/Doctrine/Import/Sqlite.php
index a7751a721..8630f7ec9 100644
--- a/lib/Doctrine/Import/Sqlite.php
+++ b/lib/Doctrine/Import/Sqlite.php
@@ -1,240 +1,240 @@
-<?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_Import');
-/**
- * @package     Doctrine
- * @subpackage  Import
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
- * @version     $Revision$
- * @link        www.phpdoctrine.com
- * @since       1.0
- */
-class Doctrine_Import_Sqlite extends Doctrine_Import
-{
-    /**
-     * lists all databases
-     *
-     * @return array
-     */
-    public function listDatabases()
-    {
-
-    }
-
-    /**
-     * lists all availible database functions
-     *
-     * @return array
-     */
-    public function listFunctions()
-    {
-
-    }
-
-    /**
-     * lists all database triggers
-     *
-     * @param string|null $database
-     * @return array
-     */
-    public function listTriggers($database = null)
-    {
-
-    }
-
-    /**
-     * lists all database sequences
-     *
-     * @param string|null $database
-     * @return array
-     */
-    public function listSequences($database = null)
-    {
-        $query      = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL ORDER BY name";
-        $tableNames = $this->conn->fetchColumn($query);
-
-        $result = array();
-        foreach ($tableNames as $tableName) {
-            if ($sqn = $this->conn->fixSequenceName($tableName, true)) {
-                $result[] = $sqn;
-            }
-        }
-        if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_FIX_CASE) {
-            $result = array_map(($this->conn->getAttribute(Doctrine::ATTR_FIELD_CASE) == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    /**
-     * lists table constraints
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableConstraints($table)
-    {
-        $table = $this->conn->quote($table, 'text');
-
-        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
-
-        if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_FIX_CASE) {
-            $query .= 'LOWER(tbl_name) = ' . strtolower($table);
-        } else {
-            $query .= 'tbl_name = ' . $table;
-        }
-        $query  .= ' AND sql NOT NULL ORDER BY name';
-        $indexes = $this->conn->fetchColumn($query);
-
-        $result = array();
-        foreach ($indexes as $sql) {
-            if (preg_match("/^create unique index ([^ ]+) on /i", $sql, $tmp)) {
-                $index = $this->conn->fixIndexName($tmp[1]);
-                if ( ! empty($index)) {
-                    $result[$index] = true;
-                }
-            }
-        }
-
-        if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_FIX_CASE) {
-            $result = array_change_key_case($result, $this->conn->getAttribute(Doctrine::ATTR_FIELD_CASE));
-        }
-        return array_keys($result);
-    }
-
-    /**
-     * lists table constraints
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableColumns($table)
-    {
-        $sql    = 'PRAGMA table_info(' . $table . ')';
-        $result = $this->conn->fetchAll($sql);
-
-        $description = array();
-        $columns     = array();
-        foreach ($result as $key => $val) {
-            $val = array_change_key_case($val, CASE_LOWER);
-            $decl = $this->conn->dataDict->getPortableDeclaration($val);
-
-            $description = array(
-                    'name'      => $val['name'],
-                    'ntype'     => $val['type'],
-                    'type'      => $decl['type'][0],
-                    'alltypes'  => $decl['type'],
-                    'notnull'   => (bool) $val['notnull'],
-                    'default'   => $val['dflt_value'],
-                    'primary'   => (bool) $val['pk'],
-                    'length'    => null,
-                    'scale'     => null,
-                    'precision' => null,
-                    'unsigned'  => null,
-                    );
-            $columns[$val['name']] = $description;
-        }
-        return $columns;
-    }
-
-    /**
-     * lists table constraints
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableIndexes($table)
-    {
-        $sql  = 'PRAGMA index_list(' . $table . ')';
-        return $this->conn->fetchColumn($sql);
-   }
-    /**
-     * lists tables
-     *
-     * @param string|null $database
-     * @return array
-     */
-    public function listTables($database = null)
-    {
-        $sql = "SELECT name FROM sqlite_master WHERE type = 'table' "
-             . "UNION ALL SELECT name FROM sqlite_temp_master "
-             . "WHERE type = 'table' ORDER BY name";
-
-        return $this->conn->fetchColumn($sql);
-    }
-
-    /**
-     * lists table triggers
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableTriggers($table)
-    {
-
-    }
-
-    /**
-     * lists table views
-     *
-     * @param string $table     database table name
-     * @return array
-     */
-    public function listTableViews($table)
-    {
-        $query = "SELECT name, sql FROM sqlite_master WHERE type='view' AND sql NOT NULL";
-        $views = $db->fetchAll($query);
-
-        $result = array();
-        foreach ($views as $row) {
-            if (preg_match("/^create view .* \bfrom\b\s+\b{$table}\b /i", $row['sql'])) {
-                if ( ! empty($row['name'])) {
-                    $result[$row['name']] = true;
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * lists database users
-     *
-     * @return array
-     */
-    public function listUsers()
-    {
-
-    }
-
-    /**
-     * lists database views
-     *
-     * @param string|null $database
-     * @return array
-     */
-    public function listViews($database = null)
-    {
-        $query = "SELECT name FROM sqlite_master WHERE type='view' AND sql NOT NULL";
-
-        return $this->conn->fetchColumn($query);
-    }
+<?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_Import');
+/**
+ * @package     Doctrine
+ * @subpackage  Import
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
+ * @version     $Revision$
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ */
+class Doctrine_Import_Sqlite extends Doctrine_Import
+{
+    /**
+     * lists all databases
+     *
+     * @return array
+     */
+    public function listDatabases()
+    {
+
+    }
+
+    /**
+     * lists all availible database functions
+     *
+     * @return array
+     */
+    public function listFunctions()
+    {
+
+    }
+
+    /**
+     * lists all database triggers
+     *
+     * @param string|null $database
+     * @return array
+     */
+    public function listTriggers($database = null)
+    {
+
+    }
+
+    /**
+     * lists all database sequences
+     *
+     * @param string|null $database
+     * @return array
+     */
+    public function listSequences($database = null)
+    {
+        $query      = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL ORDER BY name";
+        $tableNames = $this->conn->fetchColumn($query);
+
+        $result = array();
+        foreach ($tableNames as $tableName) {
+            if ($sqn = $this->conn->fixSequenceName($tableName, true)) {
+                $result[] = $sqn;
+            }
+        }
+        if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_FIX_CASE) {
+            $result = array_map(($this->conn->getAttribute(Doctrine::ATTR_FIELD_CASE) == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
+        }
+        return $result;
+    }
+
+    /**
+     * lists table constraints
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableConstraints($table)
+    {
+        $table = $this->conn->quote($table, 'text');
+
+        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
+
+        if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_FIX_CASE) {
+            $query .= 'LOWER(tbl_name) = ' . strtolower($table);
+        } else {
+            $query .= 'tbl_name = ' . $table;
+        }
+        $query  .= ' AND sql NOT NULL ORDER BY name';
+        $indexes = $this->conn->fetchColumn($query);
+
+        $result = array();
+        foreach ($indexes as $sql) {
+            if (preg_match("/^create unique index ([^ ]+) on /i", $sql, $tmp)) {
+                $index = $this->conn->formatter->fixIndexName($tmp[1]);
+                if ( ! empty($index)) {
+                    $result[$index] = true;
+                }
+            }
+        }
+
+        if ($this->conn->getAttribute(Doctrine::ATTR_PORTABILITY) & Doctrine::PORTABILITY_FIX_CASE) {
+            $result = array_change_key_case($result, $this->conn->getAttribute(Doctrine::ATTR_FIELD_CASE));
+        }
+        return array_keys($result);
+    }
+
+    /**
+     * lists table constraints
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableColumns($table)
+    {
+        $sql    = 'PRAGMA table_info(' . $table . ')';
+        $result = $this->conn->fetchAll($sql);
+
+        $description = array();
+        $columns     = array();
+        foreach ($result as $key => $val) {
+            $val = array_change_key_case($val, CASE_LOWER);
+            $decl = $this->conn->dataDict->getPortableDeclaration($val);
+
+            $description = array(
+                    'name'      => $val['name'],
+                    'ntype'     => $val['type'],
+                    'type'      => $decl['type'][0],
+                    'alltypes'  => $decl['type'],
+                    'notnull'   => (bool) $val['notnull'],
+                    'default'   => $val['dflt_value'],
+                    'primary'   => (bool) $val['pk'],
+                    'length'    => null,
+                    'scale'     => null,
+                    'precision' => null,
+                    'unsigned'  => null,
+                    );
+            $columns[$val['name']] = $description;
+        }
+        return $columns;
+    }
+
+    /**
+     * lists table constraints
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableIndexes($table)
+    {
+        $sql  = 'PRAGMA index_list(' . $table . ')';
+        return $this->conn->fetchColumn($sql);
+   }
+    /**
+     * lists tables
+     *
+     * @param string|null $database
+     * @return array
+     */
+    public function listTables($database = null)
+    {
+        $sql = "SELECT name FROM sqlite_master WHERE type = 'table' "
+             . "UNION ALL SELECT name FROM sqlite_temp_master "
+             . "WHERE type = 'table' ORDER BY name";
+
+        return $this->conn->fetchColumn($sql);
+    }
+
+    /**
+     * lists table triggers
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableTriggers($table)
+    {
+
+    }
+
+    /**
+     * lists table views
+     *
+     * @param string $table     database table name
+     * @return array
+     */
+    public function listTableViews($table)
+    {
+        $query = "SELECT name, sql FROM sqlite_master WHERE type='view' AND sql NOT NULL";
+        $views = $db->fetchAll($query);
+
+        $result = array();
+        foreach ($views as $row) {
+            if (preg_match("/^create view .* \bfrom\b\s+\b{$table}\b /i", $row['sql'])) {
+                if ( ! empty($row['name'])) {
+                    $result[$row['name']] = true;
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * lists database users
+     *
+     * @return array
+     */
+    public function listUsers()
+    {
+
+    }
+
+    /**
+     * lists database views
+     *
+     * @param string|null $database
+     * @return array
+     */
+    public function listViews($database = null)
+    {
+        $query = "SELECT name FROM sqlite_master WHERE type='view' AND sql NOT NULL";
+
+        return $this->conn->fetchColumn($query);
+    }
 }
\ No newline at end of file