diff options
| author | Felipe Pena <felipensp@gmail.com> | 2013-07-03 15:02:39 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2013-07-03 15:02:39 -0300 |
| commit | 00293fec05fb5c7ab2591138e83d2aeb0cbeb3df (patch) | |
| tree | f009b7bf62d8aef2862fd9eb67fa9c4f07ecd734 /ext | |
| parent | 9aa7343ae0828d881e8438a5a9146fd4a95a93d9 (diff) | |
| parent | 7549beb1022c6821a279df03e0dfcbf0df5eef97 (diff) | |
| download | php-git-00293fec05fb5c7ab2591138e83d2aeb0cbeb3df.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed build on FreeTDS 0.82
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pdo_dblib/dblib_driver.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c index 9ed5087369..c54cd73d84 100644 --- a/ext/pdo_dblib/dblib_driver.c +++ b/ext/pdo_dblib/dblib_driver.c @@ -274,9 +274,13 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ ,{"5.0",DBVERSION_70} /* FIXME: This does not work with Sybase, but environ will */ ,{"6.0",DBVERSION_70} ,{"7.0",DBVERSION_70} +#ifdef DBVERSION_71 ,{"7.1",DBVERSION_71} +#endif +#ifdef DBVERSION_72 ,{"7.2",DBVERSION_72} ,{"8.0",DBVERSION_72} +#endif ,{"10.0",DBVERSION_100} ,{"auto",0} /* Only works with FreeTDS. Other drivers will bork */ @@ -361,9 +365,11 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ /* allow double quoted indentifiers */ DBSETOPT(H->link, DBQUOTEDIDENT, "1"); +#ifdef DBSETLDBNAME if (vars[3].optval) { DBSETLDBNAME(H->login, vars[3].optval); } +#endif ret = 1; dbh->max_escaped_char_length = 2; |