Skip to content

ext/pdo_pgsql: Parse integer columns inline #24385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brainexe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ext/pdo_pgsql: Parse integer columns inline #24385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ext/pdo_pgsql/pgsql_statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,8 +753,17 @@ static int pgsql_stmt_get_col(pdo_stmt_t *stmt, int colno, zval *result, enum pd
#if SIZEOF_ZEND_LONG >= 8
case INT8OID:
#endif
ZVAL_LONG(result, ZEND_ATOL(ptr));
{
/* PostgreSQL sends integers in canonical decimal form, which the numeric array key
* parser handles without the overhead of strtoll() */
zend_ulong lval;
if (EXPECTED(ZEND_HANDLE_NUMERIC_STR(ptr, len, lval))) {
ZVAL_LONG(result, (zend_long) lval);
} else {
ZVAL_LONG(result, ZEND_ATOL(ptr));
}
break;
}
case FLOAT4OID:
case FLOAT8OID:
if (strncmp(ptr, "Infinity", len) == 0) {
Expand Down
56 changes: 56 additions & 0 deletions ext/pdo_pgsql/tests/fetch_integers.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
--TEST--
PDO PgSQL: integer columns at their boundaries
--EXTENSIONS--
pdo_pgsql
--SKIPIF--
<?php
if (PHP_INT_SIZE < 8) die('skip 64-bit only');
require __DIR__ . '/config.inc';
require dirname(__DIR__, 2) . '/pdo/tests/pdo_test.inc';
PDOTest::skip();
?>
--FILE--
<?php
require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);

$stmt = $db->query(<<<'SQL'
SELECT 0::int2, (-1)::int2, (-32768)::int2, 32767::int2,
(-2147483648)::int4, 2147483647::int4, 7::int4,
999999999999999999::int8, (-999999999999999999)::int8,
1000000000000000000::int8, (-1000000000000000000)::int8,
9223372036854775807::int8, '-9223372036854775808'::int8
SQL);
var_dump($stmt->fetch(PDO::FETCH_NUM));
?>
--EXPECT--
array(13) {
[0]=>
int(0)
[1]=>
int(-1)
[2]=>
int(-32768)
[3]=>
int(32767)
[4]=>
int(-2147483648)
[5]=>
int(2147483647)
[6]=>
int(7)
[7]=>
int(999999999999999999)
[8]=>
int(-999999999999999999)
[9]=>
int(1000000000000000000)
[10]=>
int(-1000000000000000000)
[11]=>
int(9223372036854775807)
[12]=>
int(-9223372036854775808)
}
Loading