From: Andrey Hristov <andrey@php.net>
Date: Thu, 28 May 2009 09:58:36 +0000 (+0000)
Subject: MFH: Fix failures when the server is running with ANSI_QUOTES
X-Git-Tag: php-5.3.0RC3~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04d8609e9fdf3087f98211e3cc5e4878a54a276c;p=php

MFH: Fix failures when the server is running with ANSI_QUOTES
---

diff --git a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
index 95831baa5d..c2cf980e28 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
@@ -44,7 +44,7 @@ mysqli_close($link);
 	if ("§ä¨ì¥H¤U¤º®e\\0§ä¨ì¥H¤U¤º®e" !== ($tmp = mysqli_real_escape_string($link, "§ä¨ì¥H¤U¤º®e" . chr(0) . "§ä¨ì¥H¤U¤º®e")))
 		printf("[009] Expecting %s, got %s\n", "§ä¨ì¥H¤U¤º®e\\0§ä¨ì¥H¤U¤º®e", $tmp);
 
-	var_dump(mysqli_query($link, 'INSERT INTO test(id, label) VALUES (100, "§ä")'));
+	var_dump(mysqli_query($link, "INSERT INTO test(id, label) VALUES (100, '§ä')"));
 
 	mysqli_close($link);
 	print "done!";
@@ -52,4 +52,4 @@ mysqli_close($link);
 --EXPECTF--
 bool(true)
 bool(true)
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
index 1ac5a67c33..09f8099c6e 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
@@ -43,7 +43,7 @@ mysqli_close($link);
 	if ("¤³¤ÎÁȤ߹ç¤ï¤»¤Ç¤Ï\\0¤³¤ÎÁȤ߹ç¤ï¤»¤Ç¤Ï" !== ($tmp = mysqli_real_escape_string($link, "¤³¤ÎÁȤ߹ç¤ï¤»¤Ç¤Ï" . chr(0) . "¤³¤ÎÁȤ߹ç¤ï¤»¤Ç¤Ï")))
 		printf("[009] Expecting %s, got %s\n", "¤³¤ÎÁȤ߹ç¤ï¤»¤Ç¤Ï\\0¤³¤ÎÁȤ߹ç¤ï¤»¤Ç¤Ï", $tmp);
 
-	var_dump(mysqli_query($link, 'INSERT INTO test(id, label) VALUES (100, "¤³")'));
+	var_dump(mysqli_query($link, "INSERT INTO test(id, label) VALUES (100, '¤³')"));
 
 	mysqli_close($link);
 	print "done!";
@@ -51,4 +51,4 @@ mysqli_close($link);
 --EXPECTF--
 bool(true)
 bool(true)
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
index c6fc799f7e..6384d9fca7 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
@@ -43,7 +43,7 @@ mysqli_close($link);
 	if ("±Ç´ë¼º\\0±Ç´ë¼º" !== ($tmp = mysqli_real_escape_string($link, "±Ç´ë¼º" . chr(0) . "±Ç´ë¼º")))
 		printf("[009] Expecting %s, got %s\n", "±Ç´ë¼º\\0±Ç´ë¼º", $tmp);
 
-	var_dump(mysqli_query($link, 'INSERT INTO test(id, label) VALUES (100, "±Ç")'));
+	var_dump(mysqli_query($link, "INSERT INTO test(id, label) VALUES (100, '±Ç')"));
 
 	mysqli_close($link);
 	print "done!";
@@ -51,4 +51,4 @@ mysqli_close($link);
 --EXPECTF--
 bool(true)
 bool(true)
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
index 39c2934482..0994b49fbd 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
@@ -44,7 +44,7 @@ mysqli_close($link);
 	if ("Ê×ÏÈ\\0Ê×ÏÈ" !== ($tmp = mysqli_real_escape_string($link, "Ê×ÏÈ" . chr(0) . "Ê×ÏÈ")))
 		printf("[009] Expecting %s, got %s\n", "Ê×ÏÈ\\0Ê×ÏÈ", $tmp);
 
-	var_dump(mysqli_query($link, 'INSERT INTO test(id, label) VALUES (100, "Ê×")'));
+	var_dump(mysqli_query($link, "INSERT INTO test(id, label) VALUES (100, 'Ê×')"));
 
 	mysqli_close($link);
 	print "done!";
@@ -52,4 +52,4 @@ mysqli_close($link);
 --EXPECTF--
 bool(true)
 bool(true)
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
index dd3672ca62..2e2f15fd16 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
@@ -44,7 +44,7 @@ mysqli_close($link);
 	if ("�İ汾\\0�İ汾" !== ($tmp = mysqli_real_escape_string($link, "�İ汾" . chr(0) . "�İ汾")))
 		printf("[009] Expecting %s, got %s\n", "�İ汾\\0�İ汾", $tmp);
 
-	var_dump(mysqli_query($link, 'INSERT INTO test(id, label) VALUES (100, "��")'));
+	var_dump(mysqli_query($link, "INSERT INTO test(id, label) VALUES (100, '��')"));
 
 	mysqli_close($link);
 	print "done!";
@@ -52,4 +52,4 @@ mysqli_close($link);
 --EXPECTF--
 bool(true)
 bool(true)
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
index 1b2eaf3a70..604b0b17c1 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
@@ -44,7 +44,7 @@ mysqli_close($link);
 	if ("?p??\\0?p??" !== ($tmp = mysqli_real_escape_string($link, "?p??" . chr(0) . "?p??")))
 		printf("[009] Expecting %s, got %s\n", "?p??\\0?p??", $tmp);
 
-	var_dump(mysqli_query($link, 'INSERT INTO test(id, label) VALUES (100, "?p")'));
+	var_dump(mysqli_query($link, "INSERT INTO test(id, label) VALUES (100, '?p')"));
 
 	mysqli_close($link);
 	print "done!";
@@ -52,4 +52,4 @@ mysqli_close($link);
 --EXPECTF--
 bool(true)
 bool(true)
-done!
\ No newline at end of file
+done!