Skip to content
This repository was archived by the owner on Sep 12, 2018. It is now read-only.

Commit 376bcd3

Browse files
committed
Merge pull request #720 from wking/queryless-search
docker_registry.lib.index.db: Support empty-query searches
2 parents 3a65d9c + 341ccb2 commit 376bcd3

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

docker_registry/lib/index/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def _handle_repository_updated(
6262
def _handle_repository_deleted(self, sender, namespace, repository):
6363
pass
6464

65-
def results(self, search_term):
65+
def results(self, search_term=None):
6666
"""Return a list of results matching search_term
6767
6868
The list elements should be dictionaries:

docker_registry/lib/index/db.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,15 @@ def _handle_repository_deleted(self, sender, namespace, repository):
114114
session.commit()
115115
session.close()
116116

117-
def results(self, search_term):
117+
def results(self, search_term=None):
118118
session = self._session()
119-
like_term = '%%%s%%' % search_term
120-
repositories = session.query(Repository).filter(
121-
sqlalchemy.sql.or_(
122-
Repository.name.like(like_term),
123-
Repository.description.like(like_term)))
119+
repositories = session.query(Repository)
120+
if search_term:
121+
like_term = '%%%s%%' % search_term
122+
repositories = repositories.filter(
123+
sqlalchemy.sql.or_(
124+
Repository.name.like(like_term),
125+
Repository.description.like(like_term)))
124126
return [
125127
{
126128
'name': repo.name,

0 commit comments

Comments
 (0)