diff --git a/lib/Doctrine/Import/Mssql.php b/lib/Doctrine/Import/Mssql.php index 21b9b61f5..3e14307c5 100644 --- a/lib/Doctrine/Import/Mssql.php +++ b/lib/Doctrine/Import/Mssql.php @@ -44,7 +44,7 @@ class Doctrine_Import_Mssql extends Doctrine_Import $query = "SELECT name FROM sysobjects WHERE xtype = 'U'"; $tableNames = $this->conn->fetchColumn($query); - return array_map(array($this->conn, 'fixSequenceName'), $tableNames); + return array_map(array($this->conn->formatter, 'fixSequenceName'), $tableNames); } /** * lists table constraints @@ -168,7 +168,7 @@ class Doctrine_Import_Mssql extends Doctrine_Import foreach ($indexes as $index) { if (!in_array($index, $pkAll) && $index != null) { - $result[] = $this->_fixIndexName($index); + $result[] = $this->conn->formatter->fixIndexName($index); } } diff --git a/lib/Doctrine/Import/Oracle.php b/lib/Doctrine/Import/Oracle.php index 7107fac07..b044fe6ca 100644 --- a/lib/Doctrine/Import/Oracle.php +++ b/lib/Doctrine/Import/Oracle.php @@ -88,7 +88,7 @@ class Doctrine_Import_Oracle extends Doctrine_Import $tableNames = $this->conn->fetchColumn($query); - return array_map(array($this->conn, 'fixSequenceName'), $tableNames); + return array_map(array($this->conn->formatter, 'fixSequenceName'), $tableNames); } /** * lists table constraints @@ -105,7 +105,7 @@ class Doctrine_Import_Oracle extends Doctrine_Import $constraints = $this->conn->fetchColumn($query); - return array_map(array($this->conn, 'fixIndexName'), $constraints); + return array_map(array($this->conn->formatter, 'fixIndexName'), $constraints); } /** * lists table constraints @@ -154,7 +154,7 @@ class Doctrine_Import_Oracle extends Doctrine_Import $indexes = $this->conn->fetchColumn($query); - return array_map(array($this->conn, 'fixIndexName'), $indexes); + return array_map(array($this->conn->formatter, 'fixIndexName'), $indexes); } /** * lists tables