diff --git a/VERSIONS_HOTLINE/173646 b/VERSIONS_HOTLINE/173646 new file mode 100644 index 0000000000000000000000000000000000000000..b21b1790986b24111c7793f38b09e1a27b4732f5 --- /dev/null +++ b/VERSIONS_HOTLINE/173646 @@ -0,0 +1 @@ + - correctif #173646 : Thème historique : erreur sql lors de l'affichage de la boîte de tags \ No newline at end of file diff --git a/library/Class/Catalogue/Loader.php b/library/Class/Catalogue/Loader.php index 7db97e347deb19780a7dafbcee59f067a78caa72..b93f737a882b5ddd47433f3e46104819a6b49245 100644 --- a/library/Class/Catalogue/Loader.php +++ b/library/Class/Catalogue/Loader.php @@ -214,7 +214,7 @@ class Class_Catalogue_Loader extends Storm_Model_Loader { return $tri instanceof Class_MoteurRecherche_OrderCriteria ? sprintf(' order by %s ', $tri->getOrder()) - : ''; + : ' '; } diff --git a/tests/library/Class/CatalogueTest.php b/tests/library/Class/CatalogueTest.php index 3db001b59f7928d32736abb77caede93b4e22c49..ae77c5a2e0415539adf54cc69bbbae5fa2e882a3 100644 --- a/tests/library/Class/CatalogueTest.php +++ b/tests/library/Class/CatalogueTest.php @@ -330,6 +330,23 @@ class CatalogueGetRequetesWithFacettesAndNoCatalogueTest extends ModelTestCase { 'req_ids' => 'select notices.id_notice from notices Where (MATCH(facettes) AGAINST(\'+T1 +Y1\' IN BOOLEAN MODE)) and type=1 order by alpha_titre LIMIT 0,5000'], Class_Catalogue::getRequetes(['facettes' => 'T1, Y1'])); } + + + /** @test */ + public function shouldReturnProperSQLIfOrderNotFound() { + $this->assertEquals(['req_liste' => "select * from notices Where (url_vignette > '' and url_vignette != 'NO' ) and type=1 LIMIT 0,50", + 'req_comptage' => "select count(*) from notices Where (url_vignette > '' and url_vignette != 'NO' ) and type=1", + 'req_ids' => "select notices.id_notice from notices Where (url_vignette > '' and url_vignette != 'NO' ) and type=1 LIMIT 0,50", + 'req_facettes' => "select notices.id_notice, notices.type_doc, facettes from notices Where (url_vignette > '' and url_vignette != 'NO' ) and type=1 LIMIT 0,50" + ], + Class_Catalogue::getRequetes([ 'id_catalogue' => 7, + 'titre' => 'Nouveautés', + 'nb_notices' => 30, + 'only_img' => 1, + 'aleatoire' => 1, + 'tri' => -1, + 'nb_analyse' => 50])); + } } @@ -382,7 +399,6 @@ class CatalogueGetNoticesByPreferencesNotRandomTest extends ModelTestCase { protected $_cache_key = 'fixed_seed_49bf9a6f25091b7aa8d8cfc5451399e8'; - public function setUp() { parent::setUp(); @@ -502,13 +518,13 @@ class CatalogueParentTest extends ModelTestCase { parent::setUp(); $this->_histoire = Class_Catalogue::newInstanceWithId(100, [ 'libelle' => 'Histoire', - 'parent_id' => 0]); + 'parent_id' => 0]); $this->_jeux = Class_Catalogue::newInstanceWithId(600, [ 'libelle' => 'Jeux>', - 'parent_id' => 0]); + 'parent_id' => 0]); $this->_politique = Class_Catalogue::newInstanceWithId(200, [ 'libelle' => 'Politique', - 'parent_id' => 100]); + 'parent_id' => 100]); $this->_moyenage = Class_Catalogue::newInstanceWithId(300, [ 'libelle'=>'Moyen-age', - 'parent_id' => 100]); + 'parent_id' => 100]); Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Catalogue') ->whenCalled('findAllBy') ->with(['role' => 'domaine_parent', @@ -684,7 +700,6 @@ class CatalogueThesaurusCRUDTest extends CatalogueParentTest { $this->mock_sql = Storm_Test_ObjectWrapper::mock(); Zend_Registry::set('sql', $this->mock_sql); - $this->_thesaurus = $this->fixture('Class_CodifThesaurus', ['id' => 200, 'id_thesaurus' => 'YYYYHIST0001', @@ -892,7 +907,6 @@ class CatalogueGetAllNoticesIdsForDomaineTest extends ModelTestCase { protected $_catalogue; - public function setUp() { parent::setUp(); @@ -912,8 +926,8 @@ class CatalogueGetAllNoticesIdsForDomaineTest extends ModelTestCase { ->whenCalled('fetchAll') ->with('select id_notice from notices Where (MATCH(facettes) AGAINST(\'+T1\' IN BOOLEAN MODE)) and type=1 order by alpha_titre limit 50,5') ->answers([ ['id_notice' => 23, 'titre' => 'POTTER'], - ['id_notice' => 45, 'titre' => 'POTTER2'], - ]) + ['id_notice' => 45, 'titre' => 'POTTER2'], + ]) ->beStrict(); $this->assertEquals([23, 45], $this->_catalogue->getAllNoticeIdsForDomaine(5, 10)); @@ -990,7 +1004,6 @@ class CatalogueGetAllNoticeIdsForDomaineTest extends ModelTestCase { protected $_catalogue; - public function setUp() { parent::setUp(); @@ -1037,8 +1050,6 @@ class CatalogueWithNoveltyTest extends ModelTestCase { } - - /** @see #72286 */ class CatalogueFetchAllNoticeByPrefWithRandomTest extends ModelTestCase { @@ -1059,8 +1070,6 @@ class CatalogueFetchAllNoticeByPrefWithRandomTest extends ModelTestCase { } - - /** @see #128828 **/ class CatalogueEmptyFacetTestCase extends ModelTestCase { @@ -1095,8 +1104,6 @@ class CatalogueEmptyFacetTestCase extends ModelTestCase { } - - /** @see #153857 **/ class CatalogueGetRequetesWith0NbNoticesTest extends ModelTestCase {