fix: add max matches option to riddle query select

https://jira.railsc.ru/browse/BPC-10212
abak-press · Apr 19, 2017 · 0a53cd6 · 0a53cd6
1 parent fc78d46
commit 0a53cd6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/sphinx/integration/mysql/client.rb b/lib/sphinx/integration/mysql/client.rb
@@ -42,6 +42,7 @@ def select(values, index_name, where, limit = nil)
             from(index_name).
             where(where).
             limit(limit).
+            with_options(max_matches: ThinkingSphinx.max_matches).
             to_sql
 
           read(sql).to_a
@@ -62,6 +63,7 @@ def find_in_batches(index_name, options = {})
             where_not(where_not).
             order_by(batch_order).
             limit(batch_size).
+            with_options(max_matches: ThinkingSphinx.max_matches).
             matching(options[:matching])
 
           records = read(query.to_sql).to_a

diff --git a/spec/sphinx/integration/mysql/client_spec.rb b/spec/sphinx/integration/mysql/client_spec.rb
@@ -69,7 +69,9 @@
 
   describe "#select" do
     it do
-      expect(connection).to receive(:execute).with("SELECT company_id FROM product WHERE `id` = 1").once
+      expect(connection).to receive(:execute).with(
+        "SELECT company_id FROM product WHERE `id` = 1 OPTION max_matches=#{ThinkingSphinx.max_matches}"
+      ).once
       client.select("company_id", "product", id: 1)
     end
   end
@@ -81,15 +83,17 @@
         "FROM product " +
         "WHERE MATCH('@company_id_idx 1') " +
         "AND `company_id` = 1 AND `sphinx_internal_id` > 0 " +
-        "ORDER BY `sphinx_internal_id` ASC LIMIT 1"
+        "ORDER BY `sphinx_internal_id` ASC LIMIT 1 " +
+        "OPTION max_matches=#{ThinkingSphinx.max_matches}"
       ).and_return([{"sphinx_internal_id" => "1"}])
 
       expect(connection).to receive(:execute).with(
         "SELECT sphinx_internal_id " +
         "FROM product " +
         "WHERE MATCH('@company_id_idx 1') " +
         "AND `company_id` = 1 AND `sphinx_internal_id` > 1 " +
-        "ORDER BY `sphinx_internal_id` ASC LIMIT 1"
+        "ORDER BY `sphinx_internal_id` ASC LIMIT 1 " +
+        "OPTION max_matches=#{ThinkingSphinx.max_matches}"
       ).and_return([])
 
       result = []