diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-12-21 19:07:19 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-12-21 19:07:19 +0100 |
| commit | 60fede4c90746ef3408ed27a15dd405b3a46a83b (patch) | |
| tree | 068e6a8018345664b5d0e8d838995a4a3e97cc3d /ext/pgsql | |
| parent | f40f1ce174885cd0f526c003eca3fa523e0ef269 (diff) | |
| download | php-upstream/5.6.4+dfsg.tar.gz | |
New upstream version 5.6.4+dfsgupstream/5.6.4+dfsg
Diffstat (limited to 'ext/pgsql')
| -rw-r--r-- | ext/pgsql/README | 2 | ||||
| -rw-r--r-- | ext/pgsql/pgsql.c | 6 | ||||
| -rw-r--r-- | ext/pgsql/tests/config.inc | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/ext/pgsql/README b/ext/pgsql/README index 785b4f034..86df804fb 100644 --- a/ext/pgsql/README +++ b/ext/pgsql/README @@ -43,7 +43,7 @@ module with specific version. You need to install PostgreSQL somewhere in your system to build PHP with PostgreSQL support. ==== Note For PostgreSQL 7.2 ==== -I've tested upto 7.2.2. +I've tested up to 7.2.2. ==== TODO List === Make pg_convert() smater. diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 6a433af0f..c0558e502 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1370,7 +1370,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /* ensure that the link did not die */ if (PGG(auto_reset_persistent) & 1) { /* need to send & get something from backend to - make sure we catch CONNECTION_BAD everytime */ + make sure we catch CONNECTION_BAD every time */ PGresult *pg_result; pg_result = PQexec(le->ptr, "select 1"); PQclear(pg_result); @@ -1478,7 +1478,7 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) } PGG(num_links)++; } - /* set notice processer */ + /* set notice processor */ if (! PGG(ignore_notices) && Z_TYPE_P(return_value) == IS_RESOURCE) { PQsetNoticeProcessor(pgsql, _php_pgsql_notice_handler, (void*)Z_RESVAL_P(return_value)); } @@ -4358,7 +4358,7 @@ PHP_FUNCTION(pg_escape_bytea) #endif to = (char *)PQescapeBytea((unsigned char*)from, from_len, &to_len); - RETVAL_STRINGL(to, to_len-1, 1); /* to_len includes addtional '\0' */ + RETVAL_STRINGL(to, to_len-1, 1); /* to_len includes additional '\0' */ PQfreemem(to); } /* }}} */ diff --git a/ext/pgsql/tests/config.inc b/ext/pgsql/tests/config.inc index 367f1ef9b..e9944de79 100644 --- a/ext/pgsql/tests/config.inc +++ b/ext/pgsql/tests/config.inc @@ -1,10 +1,12 @@ <?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 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 |