support quoted strings

AlexErrant · Dec 14, 2023 · c96b275 · c96b275
1 parent b132935
commit c96b275
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/src/query2sql.test.ts b/app/src/query2sql.test.ts
@@ -15,6 +15,13 @@ test('not a', () => {
 	)
 })
 
+test('QuotedString is fts', () => {
+	const actual = convert('"a b"')
+	expect(actual).toEqual(
+		`(noteFtsFv.rowid IN (SELECT rowid FROM noteFtsFv WHERE noteFtsFv.fieldValues MATCH '"a b"'))`,
+	)
+})
+
 test('2 SimpleStrings are ANDed', () => {
 	const actual = convert('a b')
 	expect(actual).toEqual(

diff --git a/app/src/query2sql.ts b/app/src/query2sql.ts
@@ -33,12 +33,12 @@ export function convert(input: string) {
 }
 
 function astEnter(input: string, node: SyntaxNodeRef, context: Context) {
-	if (node.name === 'SimpleString') {
+	if (node.name === 'SimpleString' || node.name === 'QuotedString') {
 		const separator = andOrNothing(node.node)
 		if (separator !== '') context.current.attach({ type: separator })
 		const value = input.slice(node.from, node.to)
 		const negate = isNegated(node.node)
-		context.current.attach({ type: 'SimpleString', value, negate })
+		context.current.attach({ type: node.name, value, negate })
 	} else if (node.name === 'ParenthesizedExpression') {
 		const negate = isNegated(node.node)
 		const group = new Group(context.current, negate)
@@ -61,7 +61,7 @@ function astLeave(_input: string, node: SyntaxNodeRef, context: Context) {
 
 function serialize(node: Node, context: Context) {
 	const spaces = '  '.repeat(context.indent)
-	if (node.type === 'SimpleString') {
+	if (node.type === 'SimpleString' || node.type === 'QuotedString') {
 		const query = `(noteFtsFv.rowid ${
 			node.negate ? 'NOT ' : ''
 		}IN (SELECT rowid FROM noteFtsFv WHERE noteFtsFv.fieldValues MATCH '${