From 279f3d69f95b674288443cb8eb93354694a15410 Mon Sep 17 00:00:00 2001 From: zYne Date: Wed, 27 Jun 2007 18:03:16 +0000 Subject: [PATCH] --- lib/Doctrine/Query.php | 7 +++++-- tests/Query/SubqueryTestCase.php | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php index b9042fa61..52f22a15b 100644 --- a/lib/Doctrine/Query.php +++ b/lib/Doctrine/Query.php @@ -928,8 +928,11 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable if (strpos($part, '.') !== false) { $separator = '.'; } - if (strpos($part, '__') !== false) { - $separator = '__'; + + if ($driverName == 'mysql' || $driverName == 'pgsql') { + if (strpos($part, '__') !== false) { + $separator = '__'; + } } if ($separator) { diff --git a/tests/Query/SubqueryTestCase.php b/tests/Query/SubqueryTestCase.php index ab064e134..63d3e38bc 100644 --- a/tests/Query/SubqueryTestCase.php +++ b/tests/Query/SubqueryTestCase.php @@ -102,7 +102,6 @@ class Doctrine_Query_Subquery_TestCase extends Doctrine_UnitTestCase $count = $users->count(); } catch (Doctrine_Exception $e) { - $this->fail(); }