Merge pull request #50 from postgrespro/PGPRO-9047

sokolcati · web-flow · commit e3c570158c24 · 2023-11-23T11:32:28.000+03:00
Fixed parsing empty string into NULL
diff --git a/expected/jsquery.out b/expected/jsquery.out
@@ -3,6 +3,11 @@ set escape_string_warning=off;
 set standard_conforming_strings=on;
 CREATE TABLE test_jsquery (v jsonb);
 \copy test_jsquery from 'data/test_jsquery.data'
+select ''::jsquery;
+ERROR:  bad jsquery representation
+LINE 1: select ''::jsquery;
+               ^
+DETAIL:  No symbols read at the end of input
 select 'asd.zzz = 13'::jsquery;
      jsquery      
 ------------------
diff --git a/expected/jsquery_1.out b/expected/jsquery_1.out
@@ -3,6 +3,11 @@ set escape_string_warning=off;
 set standard_conforming_strings=on;
 CREATE TABLE test_jsquery (v jsonb);
 \copy test_jsquery from 'data/test_jsquery.data'
+select ''::jsquery;
+ERROR:  bad jsquery representation
+LINE 1: select ''::jsquery;
+               ^
+DETAIL:  No symbols read at the end of input
 select 'asd.zzz = 13'::jsquery;
      jsquery      
 ------------------
diff --git a/jsquery_gram.y b/jsquery_gram.y
@@ -258,7 +258,9 @@ result:
 										*result = $1;
 										(void) yynerrs;		/* suppress compiler warning */
 									}
-	| /* EMPTY */					{ *result = NULL; }
+	| /* EMPTY */					{
+										*result = NULL;
+										yyerror(NULL, "No symbols read"); }
 	;
 
 array:
diff --git a/jsquery_io.c b/jsquery_io.c
@@ -162,17 +162,12 @@ jsquery_in(PG_FUNCTION_ARGS)
 
 	appendStringInfoSpaces(&buf, VARHDRSZ);
 
-	if (jsquery != NULL)
-	{
-		flattenJsQueryParseItem(&buf, jsquery, false);
-
-		res = (JsQuery*)buf.data;
-		SET_VARSIZE(res, buf.len);
+	flattenJsQueryParseItem(&buf, jsquery, false);
 
-		PG_RETURN_JSQUERY(res);
-	}
+	res = (JsQuery*)buf.data;
+	SET_VARSIZE(res, buf.len);
 
-	PG_RETURN_NULL();
+	PG_RETURN_JSQUERY(res);
 }
 
 static void
diff --git a/jsquery_scan.l b/jsquery_scan.l
@@ -206,7 +206,7 @@ yyerror(JsQueryParseItem **result, const char *message)
 				(errcode(ERRCODE_SYNTAX_ERROR),
 				 errmsg("bad jsquery representation"),
 				 /* translator: %s is typically "syntax error" */
-				 errdetail("%s at end of input", message)));
+				 errdetail("%s at the end of input", message)));
 	}
 	else
 	{
diff --git a/sql/jsquery.sql b/sql/jsquery.sql
@@ -7,6 +7,7 @@ CREATE TABLE test_jsquery (v jsonb);
 
 \copy test_jsquery from 'data/test_jsquery.data'
 
+select ''::jsquery;
 select 'asd.zzz = 13'::jsquery;
 select 'asd.zzz < 13'::jsquery;
 select 'asd(zzz < 13)'::jsquery;

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,9 @@ result:`
`258`	`258`	`*result = $1;`
`259`	`259`	`(void) yynerrs; /* suppress compiler warning */`
`260`	`260`	`}`
`261`		`- \| /* EMPTY / { result = NULL; }`
	`261`	`+ \| /* EMPTY */ {`
	`262`	`+ *result = NULL;`
	`263`	`+ yyerror(NULL, "No symbols read"); }`
`262`	`264`	`;`
`263`	`265`
`264`	`266`	`array:`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ yyerror(JsQueryParseItem *result, const char message)`
`206`	`206`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`207`	`207`	`errmsg("bad jsquery representation"),`
`208`	`208`	`/* translator: %s is typically "syntax error" */`
`209`		`- errdetail("%s at end of input", message)));`
	`209`	`+ errdetail("%s at the end of input", message)));`
`210`	`210`	`}`
`211`	`211`	`else`
`212`	`212`	`{`