kalle Fri, 07 Jan 2011 18:25:55 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307231
Log:
Implemented FR #39847 (mysqli_fetch_[field|fields|field_direct] need to return
db)
Bug: http://bugs.php.net/39847 (Assigned)
mysqli_fetch_[field|fields|field_direct] need to return db
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/UPGRADING
U php/php-src/trunk/ext/mysqli/mysqli_api.c
U php/php-src/trunk/ext/mysqli/tests/047.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_field_tell.phpt
U
php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/NEWS 2011-01-07 18:25:55 UTC (rev 307231)
@@ -158,6 +158,10 @@
. mysqlnd: Added named pipes support. FR #48082. (Andrey)
. MySQLi: Added iterator support in MySQLi. mysqli_result implements
Traversable. (Andrey, Johannes)
+ . MySQLi: Implemented FR #39847 (mysqli_fetch_[field|fields|field_direct]
+ need to return db). (Kalle)
+ . PDO_mysql: Implemented FR #47802 (Support for setting character sets in
+ DSN strings). (Kalle)
. PDO_mysql: Removed support for linking with MySQL client libraries older
than 4.1. (Johannes)
@@ -170,10 +174,6 @@
. Added nextRowset support.
. Fixed bug #50755 (PDO DBLIB Fails with OOM).
-- Improved PDO MySQL:
- . Implemented FR #47802 (Support for setting character sets in DSN strings).
- (Kalle)
-
- Improved Reflection extension: (Johannes)
. Added ReflectionExtension::isTemporary() and
ReflectionExtension::isPersistent() methods.
Modified: php/php-src/trunk/UPGRADING
===================================================================
--- php/php-src/trunk/UPGRADING 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/UPGRADING 2011-01-07 18:25:55 UTC (rev 307231)
@@ -163,6 +163,8 @@
present in the result.
- pdo_mysql now supports setting character sets when connecting in the DSN
string.
+- mysqli_fetch_[field|fields|field_direct] now returns an additional property
+ named 'db' that contains the database name of the associated result.
===================================
Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_api.c 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/mysqli_api.c 2011-01-07 18:25:55 UTC (rev 307231)
@@ -1052,6 +1052,7 @@
add_property_string(value, "table",(field->table ? field->table : ""), 1);
add_property_string(value, "orgtable",(field->org_table ? field->org_table : ""), 1);
add_property_string(value, "def",(field->def ? field->def : ""), 1);
+ add_property_string(value, "db",(field->db ? field->db : ""), 1);
add_property_long(value, "max_length", field->max_length);
add_property_long(value, "length", field->length);
Modified: php/php-src/trunk/ext/mysqli/tests/047.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/047.phpt 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/tests/047.phpt 2011-01-07 18:25:55 UTC (rev 307231)
@@ -60,7 +60,7 @@
=== fetch_fields ===
array(2) {
[0]=>
- object(stdClass)#5 (11) {
+ object(stdClass)#5 (12) {
[%u|b%"name"]=>
%unicode|string%(3) "foo"
[%u|b%"orgname"]=>
@@ -71,6 +71,8 @@
%unicode|string%(13) "test_affected"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
@@ -85,7 +87,7 @@
int(0)
}
[1]=>
- object(stdClass)#6 (11) {
+ object(stdClass)#6 (12) {
[%u|b%"name"]=>
%unicode|string%(3) "bar"
[%u|b%"orgname"]=>
@@ -96,6 +98,8 @@
%unicode|string%(13) "test_affected"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
@@ -112,7 +116,7 @@
}
=== fetch_field_direct ===
-object(stdClass)#6 (11) {
+object(stdClass)#6 (12) {
[%u|b%"name"]=>
%unicode|string%(3) "foo"
[%u|b%"orgname"]=>
@@ -123,6 +127,8 @@
%unicode|string%(13) "test_affected"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
@@ -136,7 +142,7 @@
[%u|b%"decimals"]=>
int(0)
}
-object(stdClass)#6 (11) {
+object(stdClass)#6 (12) {
[%u|b%"name"]=>
%unicode|string%(3) "bar"
[%u|b%"orgname"]=>
@@ -147,6 +153,8 @@
%unicode|string%(13) "test_affected"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
@@ -162,7 +170,7 @@
}
=== fetch_field ===
-object(stdClass)#6 (11) {
+object(stdClass)#6 (12) {
[%u|b%"name"]=>
%unicode|string%(3) "foo"
[%u|b%"orgname"]=>
@@ -173,6 +181,8 @@
%unicode|string%(13) "test_affected"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
@@ -186,7 +196,7 @@
[%u|b%"decimals"]=>
int(0)
}
-object(stdClass)#5 (11) {
+object(stdClass)#5 (12) {
[%u|b%"name"]=>
%unicode|string%(3) "bar"
[%u|b%"orgname"]=>
@@ -197,6 +207,8 @@
%unicode|string%(13) "test_affected"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt 2011-01-07 18:25:55 UTC (rev 307231)
@@ -79,7 +79,7 @@
require_once("clean_table.inc");
?>
--EXPECTF--
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(2) "ID"
[%u|b%"orgname"]=>
@@ -90,6 +90,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(1)
[%u|b%"length"]=>
@@ -103,7 +105,7 @@
[%u|b%"decimals"]=>
int(0)
}
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(5) "label"
[%u|b%"orgname"]=>
@@ -114,6 +116,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(%d)
[%u|b%"length"]=>
@@ -134,7 +138,7 @@
[%u|b%"_default_test"]=>
%unicode|string%(1) "2"
}
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(13) "_default_test"
[%u|b%"orgname"]=>
@@ -145,6 +149,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(1)
[%u|b%"length"]=>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct.phpt 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct.phpt 2011-01-07 18:25:55 UTC (rev 307231)
@@ -47,7 +47,7 @@
--EXPECTF--
Warning: mysqli_fetch_field_direct(): Field offset is invalid for resultset in %s on line %d
bool(false)
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(2) "ID"
[%u|b%"orgname"]=>
@@ -58,6 +58,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(%d)
[%u|b%"length"]=>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt 2011-01-07 18:25:55 UTC (rev 307231)
@@ -56,7 +56,7 @@
--EXPECTF--
Warning: mysqli_result::fetch_field_direct(): Field offset is invalid for resultset in %s on line %d
bool(false)
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(2) "ID"
[%u|b%"orgname"]=>
@@ -67,6 +67,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(%d)
[%u|b%"length"]=>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt 2011-01-07 18:25:55 UTC (rev 307231)
@@ -63,7 +63,7 @@
require_once("clean_table.inc");
?>
--EXPECTF--
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(2) "ID"
[%u|b%"orgname"]=>
@@ -74,6 +74,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(1)
[%u|b%"length"]=>
@@ -87,7 +89,7 @@
[%u|b%"decimals"]=>
int(0)
}
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(5) "label"
[%u|b%"orgname"]=>
@@ -98,6 +100,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(%d)
[%u|b%"length"]=>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt 2011-01-07 18:25:55 UTC (rev 307231)
@@ -60,7 +60,7 @@
require_once("clean_table.inc");
?>
--EXPECTF--
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(2) "ID"
[%u|b%"orgname"]=>
@@ -71,6 +71,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(1)
[%u|b%"length"]=>
@@ -84,7 +86,7 @@
[%u|b%"decimals"]=>
int(0)
}
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(5) "label"
[%u|b%"orgname"]=>
@@ -95,6 +97,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(1)
[%u|b%"length"]=>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt 2011-01-07 18:25:55 UTC (rev 307231)
@@ -122,7 +122,7 @@
--EXPECTF--
Warning: mysqli_field_seek(): Invalid field offset in %s on line %d
bool(false)
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(2) "id"
[%u|b%"orgname"]=>
@@ -133,6 +133,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
@@ -147,7 +149,7 @@
int(0)
}
bool(true)
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(2) "id"
[%u|b%"orgname"]=>
@@ -158,6 +160,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
@@ -172,7 +176,7 @@
int(0)
}
bool(true)
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(5) "label"
[%u|b%"orgname"]=>
@@ -183,6 +187,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(%d)
[%u|b%"length"]=>
@@ -205,7 +211,7 @@
Warning: mysqli_field_seek(): Invalid field offset in %s on line %d
bool(false)
bool(true)
-object(stdClass)#3 (11) {
+object(stdClass)#3 (12) {
[%u|b%"name"]=>
%unicode|string%(5) "_null"
[%u|b%"orgname"]=>
@@ -216,6 +222,8 @@
%unicode|string%(0) ""
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(0) ""
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_field_tell.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_field_tell.phpt 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_field_tell.phpt 2011-01-07 18:25:55 UTC (rev 307231)
@@ -64,7 +64,7 @@
Warning: mysqli_field_seek() expects exactly 2 parameters, 1 given in %s on line %d
NULL
int(0)
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(2) "id"
[%u|b%"orgname"]=>
@@ -75,6 +75,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt 2011-01-07 18:25:55 UTC (rev 307231)
@@ -61,7 +61,7 @@
require_once("clean_table.inc");
?>
--EXPECTF--
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(2) "id"
[%u|b%"orgname"]=>
@@ -72,6 +72,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
@@ -85,7 +87,7 @@
[%u|b%"decimals"]=>
int(0)
}
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(5) "label"
[%u|b%"orgname"]=>
@@ -96,6 +98,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(%d)
[%u|b%"length"]=>
@@ -109,7 +113,7 @@
[%u|b%"decimals"]=>
int(0)
}
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(3) "_id"
[%u|b%"orgname"]=>
@@ -120,6 +124,8 @@
%unicode|string%(0) ""
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(0) ""
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
@@ -133,7 +139,7 @@
[%u|b%"decimals"]=>
int(0)
}
-object(stdClass)#%d (11) {
+object(stdClass)#%d (12) {
[%u|b%"name"]=>
%unicode|string%(8) "___label"
[%u|b%"orgname"]=>
@@ -144,6 +150,8 @@
%unicode|string%(0) ""
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(0) ""
[%u|b%"max_length"]=>
int(%d)
[%u|b%"length"]=>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt 2011-01-07 17:45:12 UTC (rev 307230)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt 2011-01-07 18:25:55 UTC (rev 307231)
@@ -101,7 +101,7 @@
Warning: mysqli_stmt_result_metadata(): invalid object or resource mysqli_stmt
in %s on line %d
-object(stdClass)#5 (%d) {
+object(stdClass)#5 (12) {
[%u|b%"name"]=>
%unicode|string%(2) "id"
[%u|b%"orgname"]=>
@@ -112,6 +112,8 @@
%unicode|string%(4) "test"
[%u|b%"def"]=>
%unicode|string%(0) ""
+ [%u|b%"db"]=>
+ %unicode|string%(4) "test"
[%u|b%"max_length"]=>
int(0)
[%u|b%"length"]=>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
