com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/pdo_pgs ql/pgsql_driver.c ext/pgsql/tests/config.inc

From: Date: Fri, 31 Oct 2014 17:57:59 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/pdo_pgs ql/pgsql_driver.c ext/pgsql/tests/config.inc
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82917@lists.php.net to get a copy of this message
Commit: e797db890913924ae1d344c3bbd985169c42a87a Author: Matteo Beccati <mbeccati@php.net> Fri, 31 Oct 2014 18:57:59 +0100 Parents: d017c4bf3ae8c49340b56f9ab1d31d2793f65489 29ee69434122bcda8c904ff6fbde2b9c74332240 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e797db890913924ae1d344c3bbd985169c42a87a Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction Bugs: https://bugs.php.net/67462 Changed paths: MM ext/pdo_pgsql/pgsql_driver.c MM ext/pgsql/tests/config.inc Diff: diff --cc ext/pgsql/tests/config.inc index 367f1ef,224d055..e9944de --- a/ext/pgsql/tests/config.inc +++ b/ext/pgsql/tests/config.inc @@@ -1,17 -1,15 +1,19 @@@ <?php + // These vars are used to connect db and create test table. - // values can be set to meet your environment + // values can be set to meet your environment with the + // environment var PGSQL_TEST_CONNSTR + ++// "test" database must exist. i.e. "createdb test" before testing + $conn_str = getenv('PGSQL_TEST_CONNSTR') ?: "host=localhost dbname=test port=5432"; // connection string - // "test" database must be existed. i.e. "createdb test" before testing - // PostgreSQL uses login name as username, user must have access to "test" database. - $conn_str = "host=localhost dbname=test port=5432"; // connection string -$table_name = "php_pgsql_test"; // test table that should be exist -$num_test_record = 1000; // Number of records to create +$table_name = "php_pgsql_test"; // test table that will be created +$table_name_92 = "php_pgsql_test_92"; // test table that will be created +$num_test_record = 1000; // Number of records to create -$table_def = "CREATE TABLE php_pgsql_test (num int, str text, bin bytea);"; // Test table +// Test table +$table_def = "CREATE TABLE ${table_name} (num int, str text, bin bytea);"; +$table_def_92 = "CREATE TABLE ${table_name_92} (textary text[], jsn json);"; $field_name = "num"; // For pg_field_num() ?>

« previous php.cvs (#82917) next »