FTS: Rebase + fix tests

Nozbe · May 10, 2021 · c8d7ff3 · c8d7ff3
1 parent 06d4166
commit c8d7ff3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/QueryDescription/index.js b/src/QueryDescription/index.js
@@ -235,7 +235,8 @@ export function sanitizeLikeString(value: string): string {
 }
 
 export function textMatches(value: string): Comparison {
-  return { operator: 'match', right: { value } }
+  invariant(typeof value === 'string', 'Value passed to Q.textMatches() is not a string')
+  return { operator: 'match', right: { value }, type: comparisonSymbol }
 }
 
 export function column(name: ColumnName): ColumnDescription {

diff --git a/src/QueryDescription/test.js b/src/QueryDescription/test.js
@@ -637,19 +637,23 @@ describe('queryWithoutDeleted', () => {
   })
 
   it('supports textMatches as fts join', () => {
-    const query = Q.buildQueryDescription([
-      Q.textMatches('searchable', 'hello world'),
-    ])
+    const query = Q.buildQueryDescription([Q.where('searchable', Q.textMatches('hello world'))])
     expect(query).toEqual({
-      'where': [
+      where: [
         {
-          'operator': 'match',
-          'right': {
-            'value': 'searchable',
+          type: 'where',
+          left: 'searchable',
+          comparison: {
+            operator: 'match',
+            right: {
+              value: 'hello world',
+            },
           },
         },
       ],
-      'join': [],
+      joinTables: [],
+      nestedJoinTables: [],
+      sortBy: [],
     })
   })
 })