\u* now works as expected, improve parse rules for \

Author: feodor

expected/jsquery.out

@@ -861,6 +861,103 @@ select 'a\r = "\n\""'::jsquery;
  "a\r" = "\n\""
 (1 row)
 
+select 'a\r = "\u0000"'::jsquery;
+     jsquery      
+------------------
+ "a\r" = "\u0000"
+(1 row)
+
+select 'a\r = \u0000'::jsquery;
+     jsquery      
+------------------
+ "a\r" = "\u0000"
+(1 row)
+
+select 'a\r = "\abcd"'::jsquery AS err;
+ERROR:  bad jsquery representation
+LINE 1: select 'a\r = "\abcd"'::jsquery AS err;
+               ^
+DETAIL:  Escape sequence is invalid at or near "\a"
+select 'a\r = "\\abcd"'::jsquery;
+     jsquery      
+------------------
+ "a\r" = "\\abcd"
+(1 row)
+
+select 'a\r = "x\u0000"'::jsquery;
+      jsquery      
+-------------------
+ "a\r" = "x\u0000"
+(1 row)
+
+select 'a\r = x\u0000'::jsquery;
+      jsquery      
+-------------------
+ "a\r" = "x\u0000"
+(1 row)
+
+select 'a\r = "x\abcd"'::jsquery AS err;
+ERROR:  bad jsquery representation
+LINE 1: select 'a\r = "x\abcd"'::jsquery AS err;
+               ^
+DETAIL:  Escape sequence is invalid at or near "\a"
+select 'a\r = "x\\abcd"'::jsquery;
+      jsquery      
+-------------------
+ "a\r" = "x\\abcd"
+(1 row)
+
+select 'a\r = "x\u0000x"'::jsquery;
+      jsquery       
+--------------------
+ "a\r" = "x\u0000x"
+(1 row)
+
+select 'a\r = x\u0000x'::jsquery;
+      jsquery       
+--------------------
+ "a\r" = "x\u0000x"
+(1 row)
+
+select 'a\r = "x\abcdx"'::jsquery AS err;
+ERROR:  bad jsquery representation
+LINE 1: select 'a\r = "x\abcdx"'::jsquery AS err;
+               ^
+DETAIL:  Escape sequence is invalid at or near "\a"
+select 'a\r = "x\\abcdx"'::jsquery;
+      jsquery       
+--------------------
+ "a\r" = "x\\abcdx"
+(1 row)
+
+select 'a\r = "\u0000x"'::jsquery;
+      jsquery      
+-------------------
+ "a\r" = "\u0000x"
+(1 row)
+
+select 'a\r = \u0000x'::jsquery;
+      jsquery      
+-------------------
+ "a\r" = "\u0000x"
+(1 row)
+
+select 'a\r = "\abcdx"'::jsquery AS err;
+ERROR:  bad jsquery representation
+LINE 1: select 'a\r = "\abcdx"'::jsquery AS err;
+               ^
+DETAIL:  Escape sequence is invalid at or near "\a"
+select 'a\r = "\\abcdx"'::jsquery;
+      jsquery      
+-------------------
+ "a\r" = "\\abcdx"
+(1 row)
+
+select 'a\r = x"\\abcd"'::jsquery AS err;
+ERROR:  bad jsquery representation
+LINE 1: select 'a\r = x"\\abcd"'::jsquery AS err;
+               ^
+DETAIL:  syntax error, unexpected STRING_P, expecting $end at or near """
 ---table and index
 select count(*) from test_jsquery where (v->>'review_helpful_votes')::int4 > 0;
  count 

jsquery_scan.l

@@ -96,6 +96,12 @@ unicode     \\u[0-9A-Fa-f]{4}
 									BEGIN xQUOTED;
 								}
 
+<INITIAL>\\						{
+									yyless(0);
+									addstring(true, "", 0);
+									BEGIN xNONQUOTED;
+								}
+
 <xNONQUOTED>{any}+				{ 
 									addstring(false, yytext, yyleng); 
 								}
@@ -120,27 +126,27 @@ unicode     \\u[0-9A-Fa-f]{4}
 									return checkSpecialVal();
 								}
 
-<INITIAL,xNONQUOTED,xQUOTED>\\[\"\\\/]	{ 
+<xNONQUOTED,xQUOTED>\\[\"\\\/]	{ 
 									addchar(false, yytext[1]); 
 								}
 
-<INITIAL,xNONQUOTED,xQUOTED>\\b { addchar(false, '\b'); }
+<xNONQUOTED,xQUOTED>\\b 		{ addchar(false, '\b'); }
 
-<INITIAL,xNONQUOTED,xQUOTED>\\f { addchar(false, '\f'); }
+<xNONQUOTED,xQUOTED>\\f 		{ addchar(false, '\f'); }
 
-<INITIAL,xNONQUOTED,xQUOTED>\\n { addchar(false, '\n'); }
+<xNONQUOTED,xQUOTED>\\n 		{ addchar(false, '\n'); }
 
-<INITIAL,xNONQUOTED,xQUOTED>\\r { addchar(false, '\r'); }
+<xNONQUOTED,xQUOTED>\\r 		{ addchar(false, '\r'); }
 
-<INITIAL,xNONQUOTED,xQUOTED>\\t { addchar(false, '\t'); }
+<xNONQUOTED,xQUOTED>\\t 		{ addchar(false, '\t'); }
 
-<INITIAL,xNONQUOTED,xQUOTED>{unicode}+ { parseUnicode(yytext, yyleng); }
+<xNONQUOTED,xQUOTED>{unicode}+	{ parseUnicode(yytext, yyleng); }
 
-<INITIAL,xNONQUOTED,xQUOTED>\\u { yyerror("Unicode sequence is invalid"); }
+<xNONQUOTED,xQUOTED>\\u 		{ yyerror("Unicode sequence is invalid"); }
 
-<INITIAL,xNONQUOTED,xQUOTED>\\. { yyerror("Escape sequence is invalid"); }
+<xNONQUOTED,xQUOTED>\\. 		{ yyerror("Escape sequence is invalid"); }
 
-<INITIAL,xNONQUOTED,xQUOTED>\\ 	{ yyerror("Unexpected end after backslesh"); }
+<xNONQUOTED,xQUOTED>\\ 			{ yyerror("Unexpected end after backslesh"); }
 
 <xQUOTED><<EOF>>				{ yyerror("Unexpected end of quoted string"); }
 

sql/jsquery.sql

@@ -175,6 +175,23 @@ select '{ "a":  "dollar \u0024 character" }'::jsonb @@ '* = "dollar \u0024 chara
 select '{ "a":  "dollar \u0024 character" }'::jsonb @@ '* = "dollar $ character"';
 select '{ "a":  "dollar $ character" }'::jsonb @@ '* = "dollar \u0024 character"';
 select 'a\r = "\n\""'::jsquery;
+select 'a\r = "\u0000"'::jsquery;
+select 'a\r = \u0000'::jsquery;
+select 'a\r = "\abcd"'::jsquery AS err;
+select 'a\r = "\\abcd"'::jsquery;
+select 'a\r = "x\u0000"'::jsquery;
+select 'a\r = x\u0000'::jsquery;
+select 'a\r = "x\abcd"'::jsquery AS err;
+select 'a\r = "x\\abcd"'::jsquery;
+select 'a\r = "x\u0000x"'::jsquery;
+select 'a\r = x\u0000x'::jsquery;
+select 'a\r = "x\abcdx"'::jsquery AS err;
+select 'a\r = "x\\abcdx"'::jsquery;
+select 'a\r = "\u0000x"'::jsquery;
+select 'a\r = \u0000x'::jsquery;
+select 'a\r = "\abcdx"'::jsquery AS err;
+select 'a\r = "\\abcdx"'::jsquery;
+select 'a\r = x"\\abcd"'::jsquery AS err;
 
 ---table and index