Merge pull request IvorySQL#1214 from Data-Bene/upstream/fix-GB18030-C90

Move GB18030 skip after buffer setup in test_escape

Author: gaoxueyu

src/oracle_test/modules/test_escape/test_escape.c

@@ -633,10 +633,6 @@ test_psql_parse(pe_test_config *tc, PQExpBuffer testname,
 static void
 test_one_vector_escape(pe_test_config *tc, const pe_test_vector *tv, const pe_test_escape_func *ef)
 {
-	if (strcmp(tv->client_encoding, "GB18030") == 0 &&
-		(memchr(tv->escape, 0x81, tv->escape_len) != NULL)) {
-		goto out;
-	}
 	PQExpBuffer testname;
 	PQExpBuffer details;
 	PQExpBuffer raw_buf;
@@ -656,6 +652,10 @@ test_one_vector_escape(pe_test_config *tc, const pe_test_vector *tv, const pe_te
 	raw_buf = createPQExpBuffer();
 	escape_buf = createPQExpBuffer();
 
+	if (strcmp(tv->client_encoding, "GB18030") == 0 &&
+		(memchr(tv->escape, 0x81, tv->escape_len) != NULL))
+		goto out;
+
 	if (ef->supports_only_ascii_overlap &&
 		encoding_conflicts_ascii(PQclientEncoding(tc->conn)))
 	{

src/test/modules/test_escape/test_escape.c

@@ -633,10 +633,6 @@ test_psql_parse(pe_test_config *tc, PQExpBuffer testname,
 static void
 test_one_vector_escape(pe_test_config *tc, const pe_test_vector *tv, const pe_test_escape_func *ef)
 {
-	if (strcmp(tv->client_encoding, "GB18030") == 0 &&
-		(memchr(tv->escape, 0x81, tv->escape_len) != NULL)) {
-		goto out;
-	}
 	PQExpBuffer testname;
 	PQExpBuffer details;
 	PQExpBuffer raw_buf;
@@ -656,6 +652,10 @@ test_one_vector_escape(pe_test_config *tc, const pe_test_vector *tv, const pe_te
 	raw_buf = createPQExpBuffer();
 	escape_buf = createPQExpBuffer();
 
+	if (strcmp(tv->client_encoding, "GB18030") == 0 &&
+		(memchr(tv->escape, 0x81, tv->escape_len) != NULL))
+		goto out;
+
 	if (ef->supports_only_ascii_overlap &&
 		encoding_conflicts_ascii(PQclientEncoding(tc->conn)))
 	{