Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 892f833

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents d87b670 + 5adeed3 commit 892f833

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

‎NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ PHP NEWS
4141
- PDO ODBC:
4242
. Fixed missing and inconsistent error checks on SQLAllocHandle. (nielsdos)
4343

44+
- PGSQL:
45+
. Fixed typo in the array returned from pg_meta_data (extended mode).
46+
(David Carlier)
47+
4448
- SPL:
4549
. Fixed bug GH-10519 (Array Data Address Reference Issue). (Nathan Freeman)
4650

‎ext/pgsql/pgsql.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4243,7 +4243,7 @@ PHP_PGSQL_API zend_result php_pgsql_meta_data(PGconn *pg_link, const zend_string
42434243
/* pg_type.typtype */
42444244
add_assoc_bool_ex(&elem, "is base", sizeof("is base") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "b"));
42454245
add_assoc_bool_ex(&elem, "is composite", sizeof("is composite") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "c"));
4246-
add_assoc_bool_ex(&elem, "is pesudo", sizeof("is pesudo") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "p"));
4246+
add_assoc_bool_ex(&elem, "is pseudo", sizeof("is pseudo") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "p"));
42474247
/* pg_description.description */
42484248
add_assoc_string_ex(&elem, "description", sizeof("description") - 1, PQgetvalue(pg_result, i, 8));
42494249
}

‎ext/pgsql/tests/pg_meta_data_001.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ array(2) {
122122
bool(true)
123123
["is composite"]=>
124124
bool(false)
125-
["is pesudo"]=>
125+
["is pseudo"]=>
126126
bool(false)
127127
["description"]=>
128128
string(0) ""
@@ -147,7 +147,7 @@ array(2) {
147147
bool(true)
148148
["is composite"]=>
149149
bool(false)
150-
["is pesudo"]=>
150+
["is pseudo"]=>
151151
bool(false)
152152
["description"]=>
153153
string(0) ""

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /