--no commit message

--no commit message

lib/Doctrine/Connection.php

@@ -463,17 +463,6 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
 
         return true;
     }
-    /**
-     * returns the next value in the given sequence
-     *
-     * @param string $sequence
-     * @throws PDOException     if something went wrong at database level
-     * @return integer
-     */
-    public function nextId($sequence)
-    {
-        throw new Doctrine_Connection_Exception('NextId() for sequences not supported by this driver.');
-    }
     /**
      * Set the charset on the current connection
      *
@@ -483,6 +472,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
      */
     public function setCharset($charset)
     {
+    	
     }
     /**
      * Set the date/time format for the current connection

lib/Doctrine/Import.php

@@ -174,4 +174,21 @@ class Doctrine_Import extends Doctrine_Connection_Module
 
         return $this->conn->fetchColumn($this->sql['listViews']);
     }
+    /**
+     * import
+     *
+     * method for importing existing schema to Doctrine_Record classes
+     *
+     * @param string $directory
+     * @param array $databases
+     */
+    public function import($directory, array $databases = array())
+    {
+        $builder = new Doctrine_Import_Builder();
+        $builder->setTargetPath($directory);
+
+        foreach ($this->listTables() as $table) {
+            $builder->buildRecord($table, $this->listTableColumns($table));
+        }
+    }
 }

lib/Doctrine/Import/Mssql.php

@@ -73,15 +73,15 @@ class Doctrine_Import_Mssql extends Doctrine_Import
             $decl = $this->conn->dataDict->getPortableDeclaration($val);
 
             $description  = array(
-                'name'    => $val['column_name'],
-                'type'    => $type,
+                'name'      => $val['column_name'],
+                'type'      => $type,
                 'ptype'     => $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'),
+                'notnull'   => (bool) ($val['is_nullable'] === 'NO'),
+                'default'   => $val['column_def'],
+                'primary'   => (strtolower($identity) == 'identity'),
             );
             $columns[$val['column_name']] = $description;
         }

lib/Doctrine/Record.php

@@ -1067,8 +1067,8 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
                     $a[$v] = $this->_data[$v];
             }
         }
-
-        foreach ($this->_table->inheritanceMap as $k => $v) {
+        $map = $this->_table->inheritanceMap;
+        foreach ($map as $k => $v) {
             $old = $this->get($k, false);
 
             if ((string) $old !== (string) $v || $old === null) {