Throw a warning rather than an error on invalid character from UTF8 to

bmomjian · bmomjian · commit 2a5180c26e47 · 2006-02-12T21:15:19.000Z
Latin1, like we do for other Latin encodings.
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c,v 1.13 2005/12/25 02:14:18 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c,v 1.14 2006/02/12 21:15:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -84,8 +84,10 @@ utf8_to_iso8859_1(PG_FUNCTION_ARGS)
 			len -= 2;
 		}
 		else if ((c & 0xe0) == 0xe0)
-			elog(ERROR, "could not convert UTF8 character 0x%04x to ISO8859-1",
-				 c);
+			ereport(WARNING,
+					(errcode(ERRCODE_UNTRANSLATABLE_CHARACTER),
+					 errmsg("ignoring unconvertible UTF-8 character 0x%04x",
+							c)));
 		else
 		{
 			*dest++ = c;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c,v 1.13 2005/12/25 02:14:18 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c,v 1.14 2006/02/12 21:15:19 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -84,8 +84,10 @@ utf8_to_iso8859_1(PG_FUNCTION_ARGS)`
`84`	`84`	`len -= 2;`
`85`	`85`	`}`
`86`	`86`	`else if ((c & 0xe0) == 0xe0)`
`87`		`- elog(ERROR, "could not convert UTF8 character 0x%04x to ISO8859-1",`
`88`		`- c);`
	`87`	`+ ereport(WARNING,`
	`88`	`+ (errcode(ERRCODE_UNTRANSLATABLE_CHARACTER),`
	`89`	`+ errmsg("ignoring unconvertible UTF-8 character 0x%04x",`
	`90`	`+ c)));`
`89`	`91`	`else`
`90`	`92`	`{`
`91`	`93`	`*dest++ = c;`