postgrespro
diff --git a/‎expected/jsquery.out
Copy file name to clipboardExpand all lines: expected/jsquery.out
+32-40Lines changed: 32 additions & 40 deletions b/‎expected/jsquery.out
Copy file name to clipboardExpand all lines: expected/jsquery.out
+32-40Lines changed: 32 additions & 40 deletions
diff --git a/‎jsquery_scan.l
Copy file name to clipboardExpand all lines: jsquery_scan.l
+6-4Lines changed: 6 additions & 4 deletions b/‎jsquery_scan.l
Copy file name to clipboardExpand all lines: jsquery_scan.l
+6-4Lines changed: 6 additions & 4 deletions
@@ -1035,17 +1035,15 @@ select 'a\r = "\n\""'::jsquery;
 (1 row)
 
 select 'a\r = "\u0000"'::jsquery;
-     jsquery      
-------------------
- "a\r" = "\u0000"
-(1 row)
-
+ERROR:  unsupported Unicode escape sequence
+LINE 1: select 'a\r = "\u0000"'::jsquery;
+               ^
+DETAIL:  \u0000 cannot be converted to text.
 select 'a\r = \u0000'::jsquery;
-     jsquery      
-------------------
- "a\r" = "\u0000"
-(1 row)
-
+ERROR:  unsupported Unicode escape sequence
+LINE 1: select 'a\r = \u0000'::jsquery;
+               ^
+DETAIL:  \u0000 cannot be converted to text.
 select 'a\r = "\abcd"'::jsquery AS err;
 ERROR:  bad jsquery representation
 LINE 1: select 'a\r = "\abcd"'::jsquery AS err;
@@ -1058,17 +1056,15 @@ select 'a\r = "\\abcd"'::jsquery;
 (1 row)
 
 select 'a\r = "x\u0000"'::jsquery;
-      jsquery      
--------------------
- "a\r" = "x\u0000"
-(1 row)
-
+ERROR:  unsupported Unicode escape sequence
+LINE 1: select 'a\r = "x\u0000"'::jsquery;
+               ^
+DETAIL:  \u0000 cannot be converted to text.
 select 'a\r = x\u0000'::jsquery;
-      jsquery      
--------------------
- "a\r" = "x\u0000"
-(1 row)
-
+ERROR:  unsupported Unicode escape sequence
+LINE 1: select 'a\r = x\u0000'::jsquery;
+               ^
+DETAIL:  \u0000 cannot be converted to text.
 select 'a\r = "x\abcd"'::jsquery AS err;
 ERROR:  bad jsquery representation
 LINE 1: select 'a\r = "x\abcd"'::jsquery AS err;
@@ -1081,17 +1077,15 @@ select 'a\r = "x\\abcd"'::jsquery;
 (1 row)
 
 select 'a\r = "x\u0000x"'::jsquery;
-      jsquery       
---------------------
- "a\r" = "x\u0000x"
-(1 row)
-
+ERROR:  unsupported Unicode escape sequence
+LINE 1: select 'a\r = "x\u0000x"'::jsquery;
+               ^
+DETAIL:  \u0000 cannot be converted to text.
 select 'a\r = x\u0000x'::jsquery;
-      jsquery       
---------------------
- "a\r" = "x\u0000x"
-(1 row)
-
+ERROR:  unsupported Unicode escape sequence
+LINE 1: select 'a\r = x\u0000x'::jsquery;
+               ^
+DETAIL:  \u0000 cannot be converted to text.
 select 'a\r = "x\abcdx"'::jsquery AS err;
 ERROR:  bad jsquery representation
 LINE 1: select 'a\r = "x\abcdx"'::jsquery AS err;
@@ -1104,17 +1098,15 @@ select 'a\r = "x\\abcdx"'::jsquery;
 (1 row)
 
 select 'a\r = "\u0000x"'::jsquery;
-      jsquery      
--------------------
- "a\r" = "\u0000x"
-(1 row)
-
+ERROR:  unsupported Unicode escape sequence
+LINE 1: select 'a\r = "\u0000x"'::jsquery;
+               ^
+DETAIL:  \u0000 cannot be converted to text.
 select 'a\r = \u0000x'::jsquery;
-      jsquery      
--------------------
- "a\r" = "\u0000x"
-(1 row)
-
+ERROR:  unsupported Unicode escape sequence
+LINE 1: select 'a\r = \u0000x'::jsquery;
+               ^
+DETAIL:  \u0000 cannot be converted to text.
 select 'a\r = "\abcdx"'::jsquery AS err;
 ERROR:  bad jsquery representation
 LINE 1: select 'a\r = "\abcdx"'::jsquery AS err;
 
@@ -458,14 +458,16 @@ parseUnicode(char *s, int l)
 		 * For UTF8, replace the escape sequence by the actual
 		 * utf8 character in lex->strval. Do this also for other
 		 * encodings if the escape designates an ASCII character,
-		 * otherwise raise an error. We don't ever unescape a
-		 * \u0000, since that would result in an impermissible nul
-		 * byte.
+		 * otherwise raise an error.
 		 */
 
 		if (ch == 0)
 		{
-			addstring(false, "\\u0000", 6);
+			/* We can't allow this, since our TEXT type doesn't */
+			ereport(ERROR,
+					(errcode(ERRCODE_UNTRANSLATABLE_CHARACTER),
+					 errmsg("unsupported Unicode escape sequence"),
+					  errdetail("\\u0000 cannot be converted to text.")));
 		}
 		else if (GetDatabaseEncoding() == PG_UTF8)
 		{