From 3007ac51dae751196128aba7d6d893e0e8767790 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Thu, 13 Jun 2019 15:32:20 +1000 Subject: [PATCH] Do prefix-only searching in ContactStoreImpl to impove results --- src/engine/common/common-contact-store-impl.vala | 4 ++-- test/engine/common/common-contact-store-impl-test.vala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/common/common-contact-store-impl.vala b/src/engine/common/common-contact-store-impl.vala index e8ae147d..257b80e3 100644 --- a/src/engine/common/common-contact-store-impl.vala +++ b/src/engine/common/common-contact-store-impl.vala @@ -97,9 +97,9 @@ internal class Geary.ContactStoreImpl : BaseObject, Geary.ContactStore { GLib.Cancellable? cancellable) throws GLib.Error { Gee.Collection contacts = new Gee.LinkedList(); - string normalised_query = query.make_valid().normalize(); + string normalised_query = query.make_valid().normalize().down(); if (!String.is_empty(normalised_query)) { - normalised_query = "%%%s%%".printf(normalised_query); + normalised_query = normalised_query + "%"; Db.Statement stmt = cx.prepare(""" SELECT * FROM ContactTable WHERE highest_importance >= ? AND ( diff --git a/test/engine/common/common-contact-store-impl-test.vala b/test/engine/common/common-contact-store-impl-test.vala index 1c864922..99530c87 100644 --- a/test/engine/common/common-contact-store-impl-test.vala +++ b/test/engine/common/common-contact-store-impl-test.vala @@ -112,7 +112,7 @@ INSERT INTO ContactTable ( public void search_email_match() throws GLib.Error { test_article.search.begin( - "example.com", + "Test@example", 0, 10, null,