Skip to content
Snippets Groups Projects
Unverified Commit 701936e5 authored by Álvaro GR's avatar Álvaro GR Committed by GitHub
Browse files

Fix ListRecords throwing QueryException when backslashes were used

This commit fixes Doctrine\ORM\Query\QueryException:
[Syntax Error] line 0, col 35: Error: Expected Doctrine\ORM\Query\Lexer::T_IDENTIFIER, got 'Omeka\Entity\Item'
parent 106468fa
No related branches found
No related tags found
No related merge requests found
...@@ -622,8 +622,8 @@ class ResponseGenerator extends AbstractXmlGenerator ...@@ -622,8 +622,8 @@ class ResponseGenerator extends AbstractXmlGenerator
$entityManager = $this->serviceLocator->get('Omeka\EntityManager'); $entityManager = $this->serviceLocator->get('Omeka\EntityManager');
$itemRepository = $entityManager->getRepository('Omeka\Entity\Item'); $itemRepository = $entityManager->getRepository('Omeka\Entity\Item');
$qb = $itemRepository->createQueryBuilder('Omeka\Entity\Item'); $qb = $itemRepository->createQueryBuilder('Item');
$qb->select('Omeka\Entity\Item'); $qb->select('Item');
$query = new ArrayObject; $query = new ArrayObject;
...@@ -667,12 +667,12 @@ class ResponseGenerator extends AbstractXmlGenerator ...@@ -667,12 +667,12 @@ class ResponseGenerator extends AbstractXmlGenerator
if ($from) { if ($from) {
$qb->andWhere($qb->expr()->orX( $qb->andWhere($qb->expr()->orX(
$qb->expr()->andX( $qb->expr()->andX(
$qb->expr()->isNotNull('Omeka\Entity\Item.modified'), $qb->expr()->isNotNull('Item.modified'),
$qb->expr()->gte('Omeka\Entity\Item.modified', ':from_1') $qb->expr()->gte('Item.modified', ':from_1')
), ),
$qb->expr()->andX( $qb->expr()->andX(
$qb->expr()->isNull('Omeka\Entity\Item.modified'), $qb->expr()->isNull('Item.modified'),
$qb->expr()->gte('Omeka\Entity\Item.created', ':from_2') $qb->expr()->gte('Item.created', ':from_2')
) )
)); ));
$qb->setParameter('from_1', $from); $qb->setParameter('from_1', $from);
...@@ -682,18 +682,18 @@ class ResponseGenerator extends AbstractXmlGenerator ...@@ -682,18 +682,18 @@ class ResponseGenerator extends AbstractXmlGenerator
$qb->andWhere($qb->expr()->orX( $qb->andWhere($qb->expr()->orX(
$qb->expr()->andX( $qb->expr()->andX(
$qb->expr()->isNotNull('Omeka\Entity\Item.modified'), $qb->expr()->isNotNull('Omeka\Entity\Item.modified'),
$qb->expr()->lte('Omeka\Entity\Item.modified', ':until_1') $qb->expr()->lte('Item.modified', ':until_1')
), ),
$qb->expr()->andX( $qb->expr()->andX(
$qb->expr()->isNull('Omeka\Entity\Item.modified'), $qb->expr()->isNull('Omeka\Entity\Item.modified'),
$qb->expr()->lte('Omeka\Entity\Item.created', ':until_2') $qb->expr()->lte('Item.created', ':until_2')
) )
)); ));
$qb->setParameter('until_1', $until); $qb->setParameter('until_1', $until);
$qb->setParameter('until_2', $until); $qb->setParameter('until_2', $until);
} }
$qb->groupBy('Omeka\Entity\Item.id'); $qb->groupBy('Item.id');
// This limit call will form the basis of the flow control // This limit call will form the basis of the flow control
$qb->setMaxResults($this->_listLimit); $qb->setMaxResults($this->_listLimit);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment