php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* PHP-5.6:
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  News entry for new curl constants
This commit is contained in:
Matteo Beccati
2014-10-17 16:23:25 +02:00
parent f2fa7a41cf 8c5e2e66bc
commit 9935bf7df7
2 changed files with 115 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/pdo_pgsql/pgsql_driver.c
View File

@@ -1061,10 +1061,16 @@ static PHP_METHOD(PDO, pgsqlGetNotify)
if (result_type == PDO_FETCH_NUM || result_type == PDO_FETCH_BOTH) {
add_index_string(return_value, 0, pgsql_notify->relname);
add_index_long(return_value, 1, pgsql_notify->be_pid);
if (pgsql_notify->extra && pgsql_notify->extra[0]) {
add_index_string(return_value, 2, pgsql_notify->extra, 1);
}
}
if (result_type == PDO_FETCH_ASSOC || result_type == PDO_FETCH_BOTH) {
add_assoc_string(return_value, "message", pgsql_notify->relname);
add_assoc_long(return_value, "pid", pgsql_notify->be_pid);
if (pgsql_notify->extra && pgsql_notify->extra[0]) {
add_assoc_string(return_value, "payload", pgsql_notify->extra, 1);
}
}
PQfreemem(pgsql_notify);

109
ext/pdo_pgsql/tests/bug68199.phpt Normal file
View File

@@ -0,0 +1,109 @@
--TEST--
Bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
--SKIPIF--
<?php # vim:se ft=php:
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
require dirname(__FILE__) . '/config.inc';
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
$db = PDOTest::factory();
if (version_compare($db->getAttribute(PDO::ATTR_SERVER_VERSION), '9.0.0') < 0) {
die("skip Requires 9.0+");
}
?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
// pgsqlGetPid should return something meaningful
$pid = $db->pgsqlGetPid();
var_dump($pid > 0);
// No listen, no notifies
var_dump($db->pgsqlGetNotify());
// Listen started, no notifies
$db->exec("LISTEN notifies_phpt");
var_dump($db->pgsqlGetNotify());
// No parameters with payload, use default PDO::FETCH_NUM
$db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_NUM);
$db->exec("NOTIFY notifies_phpt, 'payload'");
$notify = $db->pgsqlGetNotify();
var_dump(count($notify));
var_dump($notify[0]);
var_dump($notify[1] == $pid);
var_dump($notify[2]);
// No parameters with payload, use default PDO::FETCH_ASSOC
$db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
$db->exec("NOTIFY notifies_phpt, 'payload'");
$notify = $db->pgsqlGetNotify();
var_dump(count($notify));
var_dump($notify['message']);
var_dump($notify['pid'] == $pid);
var_dump($notify['payload']);
// Test PDO::FETCH_NUM as parameter with payload
$db->exec("NOTIFY notifies_phpt, 'payload'");
$notify = $db->pgsqlGetNotify(PDO::FETCH_NUM);
var_dump(count($notify));
var_dump($notify[0]);
var_dump($notify[1] == $pid);
var_dump($notify[2]);
// Test PDO::FETCH_ASSOC as parameter with payload
$db->exec("NOTIFY notifies_phpt, 'payload'");
$notify = $db->pgsqlGetNotify(PDO::FETCH_ASSOC);
var_dump(count($notify));
var_dump($notify['message']);
var_dump($notify['pid'] == $pid);
var_dump($notify['payload']);
// Test PDO::FETCH_BOTH as parameter with payload
$db->exec("NOTIFY notifies_phpt, 'payload'");
$notify = $db->pgsqlGetNotify(PDO::FETCH_BOTH);
var_dump(count($notify));
var_dump($notify['message']);
var_dump($notify['pid'] == $pid);
var_dump($notify['payload']);
var_dump($notify[0]);
var_dump($notify[1] == $pid);
var_dump($notify[2]);
// Verify that there are no notifies queued
var_dump($db->pgsqlGetNotify());
?>
--EXPECT--
bool(true)
bool(false)
bool(false)
int(3)
string(13) "notifies_phpt"
bool(true)
string(7) "payload"
int(3)
string(13) "notifies_phpt"
bool(true)
string(7) "payload"
int(3)
string(13) "notifies_phpt"
bool(true)
string(7) "payload"
int(3)
string(13) "notifies_phpt"
bool(true)
string(7) "payload"
int(6)
string(13) "notifies_phpt"
bool(true)
string(7) "payload"
string(13) "notifies_phpt"
bool(true)
string(7) "payload"
bool(false)