@@ -106,8+106,9 @@ class EntryRepository extends EntityRepository
$qb->andWhere('e.isArchived = true');
}
$qb->andWhere('e.isArchived = true');
}
+ // We lower() all parts here because PostgreSQL 'LIKE' verb is case-sensitive
$qb
$qb
- ->andWhere('e.content LIKE :term OR e.title LIKE :term')->setParameter('term', '%'.$term.'%')
+ ->andWhere('lower(e.content) LIKE lower(:term) OR lower(e.title) LIKE lower(:term) OR lower(e.url) LIKE lower(:term)')->setParameter('term', '%'.$term.'%')
->leftJoin('e.tags', 't')
->groupBy('e.id');
->leftJoin('e.tags', 't')
->groupBy('e.id');
@@ -125,9+126,7 @@ class EntryRepository extends EntityRepository
{
return $this
->getBuilderByUser($userId)
{
return $this
->getBuilderByUser($userId)
- ->leftJoin('e.tags', 't')
- ->groupBy('e.id')
- ->having('count(t.id) = 0');
+ ->andWhere('size(e.tags) = 0');
}
/**
}
/**
@@ -173,7+172,7 @@ class EntryRepository extends EntityRepository
$qb->orderBy('e.updatedAt', $order);
}
$qb->orderBy('e.updatedAt', $order);
}
- $pagerAdapter = new DoctrineORMAdapter($qb);
+ $pagerAdapter = new DoctrineORMAdapter($qb, true, false);