Revert "Bug 1953666: Add prefix matching for Yelp modifiers"

This reverts commit adc7143.

Author: dadaa

components/suggest/src/store.rs

@@ -2068,38 +2068,6 @@ pub(crate) mod tests {
             .has_location_sign(false)
             .subject_exact_match(false)],
         );
-        // Test for prefix match.
-        assert_eq!(
-            store.fetch_suggestions(SuggestionQuery::yelp("ramen D")),
-            vec![ramen_suggestion(
-                "ramen Delivery",
-                "https://www.yelp.com/search?find_desc=ramen+Delivery"
-            )
-            .has_location_sign(false)],
-        );
-        assert_eq!(
-            store.fetch_suggestions(SuggestionQuery::yelp("ramen I")),
-            vec![ramen_suggestion(
-                "ramen In",
-                "https://www.yelp.com/search?find_desc=ramen"
-            )],
-        );
-        assert_eq!(
-            store.fetch_suggestions(SuggestionQuery::yelp("ramen Y")),
-            vec![
-                ramen_suggestion("ramen", "https://www.yelp.com/search?find_desc=ramen")
-                    .has_location_sign(false)
-            ],
-        );
-        // Prefix match is available only for last words.
-        assert_eq!(
-            store.fetch_suggestions(SuggestionQuery::yelp("ramen I Tokyo")),
-            vec![ramen_suggestion(
-                "ramen I Tokyo",
-                "https://www.yelp.com/search?find_desc=ramen&find_loc=I+Tokyo"
-            )
-            .has_location_sign(false)],
-        );
 
         Ok(())
     }

components/suggest/src/yelp.rs

@@ -237,29 +237,20 @@ impl SuggestDao<'_> {
             let candidate = candidate_chunk
                 .map(|chunk| chunk.join(" "))
                 .unwrap_or_default();
-            if let Some(keyword_lowercase) = self.conn.try_query_one::<String, _>(
-                if n == query_words.len() {
-                    "
-                    SELECT keyword FROM yelp_modifiers
-                    WHERE type = :type AND keyword BETWEEN :word AND :word || x'FFFF'
-                    LIMIT 1
-                    "
-                } else {
-                    "
-                    SELECT keyword FROM yelp_modifiers
-                    WHERE type = :type AND keyword = :word
-                    LIMIT 1
-                    "
-                },
+            if self.conn.query_row_and_then_cachable(
+                "
+                SELECT EXISTS (
+                    SELECT 1 FROM yelp_modifiers WHERE type = :type AND keyword = :word LIMIT 1
+                )
+                ",
                 named_params! {
                     ":type": modifier_type,
                     ":word": candidate.to_lowercase(),
                 },
+                |row| row.get::<_, bool>(0),
                 true,
             )? {
-                // Preserve the query as the user typed it including its case.
-                let keyword = format!("{}{}", candidate, &keyword_lowercase[candidate.len()..]);
-                return Ok(Some((keyword, n)));
+                return Ok(Some((candidate, n)));
             }
         }
 
@@ -345,28 +336,19 @@ impl SuggestDao<'_> {
                 .next()
                 .map(|chunk| chunk.join(" "))
                 .unwrap_or_default();
-            if let Some(keyword_lowercase) = self.conn.try_query_one::<String, _>(
-                if n == query_words.len() {
-                    "
-                    SELECT keyword FROM yelp_location_signs
-                    WHERE keyword BETWEEN :word AND :word || x'FFFF'
-                    LIMIT 1
-                    "
-                } else {
-                    "
-                    SELECT keyword FROM yelp_location_signs
-                    WHERE keyword = :word
-                    LIMIT 1
-                    "
-                },
+            if self.conn.query_row_and_then_cachable(
+                "
+                SELECT EXISTS (
+                    SELECT 1 FROM yelp_location_signs WHERE keyword = :word LIMIT 1
+                )
+                ",
                 named_params! {
                     ":word": candidate.to_lowercase(),
                 },
+                |row| row.get::<_, bool>(0),
                 true,
             )? {
-                // Preserve the query as the user typed it including its case.
-                let keyword = format!("{}{}", candidate, &keyword_lowercase[candidate.len()..]);
-                return Ok(Some((keyword, n)));
+                return Ok(Some((candidate, n)));
             }
         }