[2.0] DDC-341 - Added Composite Model-Set and 3 tests, fixed two bugs in SqlWalker with Composite Key support
This commit is contained in:
parent
c9f1954044
commit
304cc2e0cc
@ -78,6 +78,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
|
|||||||
'Doctrine\Tests\Models\Routing\RoutingRoute',
|
'Doctrine\Tests\Models\Routing\RoutingRoute',
|
||||||
'Doctrine\Tests\Models\Routing\RoutingRouteBooking',
|
'Doctrine\Tests\Models\Routing\RoutingRouteBooking',
|
||||||
),
|
),
|
||||||
|
'navigation' => array(
|
||||||
|
'Doctrine\Tests\Models\Navigation\NavCountry',
|
||||||
|
'Doctrine\Tests\Models\Navigation\NavPhotos',
|
||||||
|
'Doctrine\Tests\Models\Navigation\NavTour',
|
||||||
|
'Doctrine\Tests\Models\Navigation\NavPointOfInterest',
|
||||||
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
protected function useModelSet($setName)
|
protected function useModelSet($setName)
|
||||||
@ -144,6 +150,14 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
|
|||||||
$conn->executeUpdate('DELETE FROM RoutingLocation');
|
$conn->executeUpdate('DELETE FROM RoutingLocation');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(isset($this->_usedModelSets['navigation'])) {
|
||||||
|
$conn->executeUpdate('DELETE FROM navigation_tour_pois');
|
||||||
|
$conn->executeUpdate('DELETE FROM navigation_photos');
|
||||||
|
$conn->executeUpdate('DELETE FROM navigation_pois');
|
||||||
|
$conn->executeUpdate('DELETE FROM navigation_tours');
|
||||||
|
$conn->executeUpdate('DELETE FROM navigation_countries');
|
||||||
|
}
|
||||||
|
|
||||||
$this->_em->clear();
|
$this->_em->clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user