Fix broken tests when not using shared mysql socket within docker containers

Author: thePanz

tests/QueryTestCase.php

@@ -307,11 +307,11 @@ public function testParseTableAliasesWithBetweenInWhereClause()
         $q1 = Doctrine_Query::create()
             ->select('u.id')
             ->from('QueryTest_User u')
-            ->where("CURRENT_DATE() BETWEEN u.QueryTest_Subscription.begin AND u.QueryTest_Subscription.begin")
+            ->where("now() BETWEEN u.QueryTest_Subscription.begin AND u.QueryTest_Subscription.begin")
             ->addWhere( 'u.id != 5' )
             ;
 
-        $expected = 'SELECT q.id AS q__id FROM query_test__user q LEFT JOIN query_test__subscription q2 ON q.subscriptionid = q2.id WHERE (CURRENT_DATE() BETWEEN q2.begin AND q2.begin AND q.id != 5)';
+        $expected = 'SELECT q.id AS q__id FROM query_test__user q LEFT JOIN query_test__subscription q2 ON q.subscriptionid = q2.id WHERE (datetime(\'now\') BETWEEN q2.begin AND q2.begin AND q.id != 5)';
 
         $this->assertEqual( $q1->getSqlQuery(), $expected );
 

tests/Ticket/2355TestCase.php

@@ -32,6 +32,12 @@
  */
 class Doctrine_Ticket_2355_TestCase extends Doctrine_UnitTestCase 
 {
+    public function setUp()
+    {
+        Doctrine_Manager::getInstance()->reset();
+        parent::setUp();
+    }
+
     public function prepareTables()
     {
         $this->tables[] = 'News';