From 260558e0320b01162954d6cdd9632476c41b28e3 Mon Sep 17 00:00:00 2001 From: lsmith Date: Fri, 5 Jan 2007 22:04:24 +0000 Subject: [PATCH] - make more use of Doctrine internal methods --- lib/Doctrine/Connection.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/Connection.php b/lib/Doctrine/Connection.php index 044196868..c8120610a 100644 --- a/lib/Doctrine/Connection.php +++ b/lib/Doctrine/Connection.php @@ -319,7 +319,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun $seqPattern = '/^'.preg_replace('/%s/', '([a-z0-9_]+)', $this->getAttribute(Doctrine::ATTR_SEQNAME_FORMAT)).'$/i'; $seqName = preg_replace($seqPattern, '\\1', $sqn); - if ($seqName && ! strcasecmp($sqn, $db->getSequenceName($seqName))) { + if ($seqName && ! strcasecmp($sqn, $this->getSequenceName($seqName))) { return $seqName; } return $sqn; @@ -419,7 +419,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun } $query = 'DELETE FROM '. $table . ' WHERE ' . implode(' AND ', $condition); - $affectedRows = $this->dbh->exec($query); + $affectedRows = $this->exec($query); $this->insert($table, $values); @@ -525,7 +525,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun $result = $this->query($statement, $params)->fetchAll(PDO::FETCH_COLUMN); if ($this->options['portability'] & Doctrine::PORTABILITY_FIX_CASE) { - $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result); + $result = array_map(($this->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result); } return $result; }