Skip to content

Commit d012bdc

Browse files
author
Stanley Sufficool
committed
Fix Bug #65219
DBSETLDBNAME should be called before login to set DBNAME in login record
1 parent ebad517 commit d012bdc

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ext/pdo_dblib/dblib_driver.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,12 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
350350

351351
DBSETLAPP(H->login, vars[1].optval);
352352

353+
#ifdef DBSETLDBNAME
354+
if (vars[3].optval) {
355+
DBSETLDBNAME(H->login, vars[3].optval);
356+
}
357+
#endif
358+
353359
H->link = dbopen(H->login, vars[2].optval);
354360

355361
if (!H->link) {
@@ -365,12 +371,6 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
365371
/* allow double quoted indentifiers */
366372
DBSETOPT(H->link, DBQUOTEDIDENT, "1");
367373

368-
#ifdef DBSETLDBNAME
369-
if (vars[3].optval) {
370-
DBSETLDBNAME(H->login, vars[3].optval);
371-
}
372-
#endif
373-
374374
ret = 1;
375375
dbh->max_escaped_char_length = 2;
376376
dbh->alloc_own_columns = 1;

0 commit comments

Comments
 (0)