Check for unsupported tsqueries.

Alexander Korotkov · Alexander Korotkov · commit b18d5ca47f72 · 2016-05-16T14:15:08.000+03:00
diff --git a/expected/ruminv.out b/expected/ruminv.out
@@ -267,3 +267,7 @@ SELECT * FROM test_invrum WHERE q @@ 'a c d'::tsvector;
  ( 'a' | 'b' ) & ( 'c' | 'd' )
 (5 rows)
 
+INSERT INTO test_invrum VALUES ('a:*'::tsquery);
+ERROR:  Indexing of prefix tsqueries isn't supported yet
+INSERT INTO test_invrum VALUES ('a <-> b'::tsquery);
+ERROR:  Indexing of phrase tsqueries isn't supported yet
diff --git a/rumtsquery.c b/rumtsquery.c
@@ -73,6 +73,10 @@ make_query_item_wrap(QueryItem *item, QueryItemWrap *parent, bool not)
 	{
 		QueryOperand   *operand = (QueryOperand *) item;
 		QueryItemWrap  *wrap = add_child(parent);
+
+		if (operand->prefix)
+			elog(ERROR, "Indexing of prefix tsqueries isn't supported yet");
+
 		wrap->type = QI_VAL;
 		wrap->distance = operand->distance;
 		wrap->length = operand->length;
@@ -111,6 +115,7 @@ make_query_item_wrap(QueryItem *item, QueryItemWrap *parent, bool not)
 			}
 		}
 		case OP_PHRASE:
+			elog(ERROR, "Indexing of phrase tsqueries isn't supported yet");
 		default:
 			elog(ERROR, "Invalid tsquery operator");
 	}
diff --git a/sql/ruminv.sql b/sql/ruminv.sql
@@ -43,3 +43,6 @@ SELECT * FROM test_invrum WHERE q @@ 'b d'::tsvector;
 SELECT * FROM test_invrum WHERE q @@ 'a b d'::tsvector;
 SELECT * FROM test_invrum WHERE q @@ 'c d'::tsvector;
 SELECT * FROM test_invrum WHERE q @@ 'a c d'::tsvector;
+
+INSERT INTO test_invrum VALUES ('a:*'::tsquery);
+INSERT INTO test_invrum VALUES ('a <-> b'::tsquery);

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,10 @@ make_query_item_wrap(QueryItem item, QueryItemWrap parent, bool not)`
`73`	`73`	`{`
`74`	`74`	`QueryOperand operand = (QueryOperand ) item;`
`75`	`75`	`QueryItemWrap *wrap = add_child(parent);`
	`76`	`+`
	`77`	`+ if (operand->prefix)`
	`78`	`+ elog(ERROR, "Indexing of prefix tsqueries isn't supported yet");`
	`79`	`+`
`76`	`80`	`wrap->type = QI_VAL;`
`77`	`81`	`wrap->distance = operand->distance;`
`78`	`82`	`wrap->length = operand->length;`
`@@ -111,6 +115,7 @@ make_query_item_wrap(QueryItem item, QueryItemWrap parent, bool not)`
`111`	`115`	`}`
`112`	`116`	`}`
`113`	`117`	`case OP_PHRASE:`
	`118`	`+ elog(ERROR, "Indexing of phrase tsqueries isn't supported yet");`
`114`	`119`	`default:`
`115`	`120`	`elog(ERROR, "Invalid tsquery operator");`
`116`	`121`	`}`