cvs: pear /DB/DB dbase.php fbsql.php ibase.php ifx.php msql.php mssql.php mysql.php mysqli.php oci8.php pgsql.php sqlite.php sybase.php
| From: | Daniel Convissor | Date: | Tue, 05 Oct 2004 00:06:48 +0000 |
| Subject: | cvs: pear /DB/DB dbase.php fbsql.php ibase.php ifx.php msql.php mssql.php mysql.php mysqli.php oci8.php pgsql.php sqlite.php sybase.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-24607@lists.php.net to get a copy of this message | ||
danielc Mon Oct 4 20:06:48 2004 EDT
Modified files:
/pear/DB/DB dbase.php fbsql.php ibase.php ifx.php msql.php
mssql.php mysql.php mysqli.php oci8.php pgsql.php
sqlite.php sybase.php
Log:
* If DSN contains "dbsyntax", always use that for $this->dbsyntax.
http://cvs.php.net/diff.php/pear/DB/DB/dbase.php?r1=1.21&r2=1.22&ty=u Index: pear/DB/DB/dbase.php diff -u pear/DB/DB/dbase.php:1.21 pear/DB/DB/dbase.php:1.22 --- pear/DB/DB/dbase.php:1.21 Mon Aug 2 21:46:17 2004 +++ pear/DB/DB/dbase.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: dbase.php,v 1.21 2004/08/03 01:46:17 danielc Exp $ +// $Id: dbase.php,v 1.22 2004/10/05 00:06:48 danielc Exp $ // XXX legend: @@ -31,7 +31,7 @@ * extension. * * @package DB - * @version $Id: dbase.php,v 1.21 2004/08/03 01:46:17 danielc Exp $ + * @version $Id: dbase.php,v 1.22 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Stig Bakken <ssb@php.net> */ @@ -76,7 +76,11 @@ if (!DB::assertExtension('dbase')) { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } $ini = ini_get('track_errors'); if ($ini) { http://cvs.php.net/diff.php/pear/DB/DB/fbsql.php?r1=1.36&r2=1.37&ty=u Index: pear/DB/DB/fbsql.php diff -u pear/DB/DB/fbsql.php:1.36 pear/DB/DB/fbsql.php:1.37 --- pear/DB/DB/fbsql.php:1.36 Thu Jun 24 11:24:56 2004 +++ pear/DB/DB/fbsql.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: fbsql.php,v 1.36 2004/06/24 15:24:56 danielc Exp $ +// $Id: fbsql.php,v 1.37 2004/10/05 00:06:48 danielc Exp $ // XXX legend: @@ -37,7 +37,7 @@ * extension. * * @package DB - * @version $Id: fbsql.php,v 1.36 2004/06/24 15:24:56 danielc Exp $ + * @version $Id: fbsql.php,v 1.37 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Frank M. Kromann <frank@frontbase.com> */ @@ -108,6 +108,10 @@ } $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost'; $php_errormsg = ''; http://cvs.php.net/diff.php/pear/DB/DB/ibase.php?r1=1.69&r2=1.70&ty=u Index: pear/DB/DB/ibase.php diff -u pear/DB/DB/ibase.php:1.69 pear/DB/DB/ibase.php:1.70 --- pear/DB/DB/ibase.php:1.69 Thu Jun 24 11:24:56 2004 +++ pear/DB/DB/ibase.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: ibase.php,v 1.69 2004/06/24 15:24:56 danielc Exp $ +// $Id: ibase.php,v 1.70 2004/10/05 00:06:48 danielc Exp $ // Bugs: @@ -31,7 +31,7 @@ * extension. * * @package DB - * @version $Id: ibase.php,v 1.69 2004/06/24 15:24:56 danielc Exp $ + * @version $Id: ibase.php,v 1.70 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Sterling Hughes <sterling@php.net> */ @@ -97,7 +97,12 @@ if (!DB::assertExtension('interbase')) { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $dbhost = $dsninfo['hostspec'] ? ($dsninfo['hostspec'] . ':' . $dsninfo['database']) : $dsninfo['database']; http://cvs.php.net/diff.php/pear/DB/DB/ifx.php?r1=1.47&r2=1.48&ty=u Index: pear/DB/DB/ifx.php diff -u pear/DB/DB/ifx.php:1.47 pear/DB/DB/ifx.php:1.48 --- pear/DB/DB/ifx.php:1.47 Thu Mar 4 20:46:53 2004 +++ pear/DB/DB/ifx.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: ifx.php,v 1.47 2004/03/05 01:46:53 danielc Exp $ +// $Id: ifx.php,v 1.48 2004/10/05 00:06:48 danielc Exp $ // Legend: @@ -36,7 +36,7 @@ * extension. * * @package DB - * @version $Id: ifx.php,v 1.47 2004/03/05 01:46:53 danielc Exp $ + * @version $Id: ifx.php,v 1.48 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Tomas V.V.Cox <cox@idecnet.com> */ @@ -108,7 +108,12 @@ { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $dbhost = $dsninfo['hostspec'] ? '@' . $dsninfo['hostspec'] : ''; $dbname = $dsninfo['database'] ? $dsninfo['database'] . $dbhost : ''; $user = $dsninfo['username'] ? $dsninfo['username'] : ''; http://cvs.php.net/diff.php/pear/DB/DB/msql.php?r1=1.24&r2=1.25&ty=u Index: pear/DB/DB/msql.php diff -u pear/DB/DB/msql.php:1.24 pear/DB/DB/msql.php:1.25 --- pear/DB/DB/msql.php:1.24 Thu Mar 4 20:46:53 2004 +++ pear/DB/DB/msql.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: msql.php,v 1.24 2004/03/05 01:46:53 danielc Exp $ +// $Id: msql.php,v 1.25 2004/10/05 00:06:48 danielc Exp $ require_once 'DB/common.php'; @@ -26,7 +26,7 @@ * extension. * * @package DB - * @version $Id: msql.php,v 1.24 2004/03/05 01:46:53 danielc Exp $ + * @version $Id: msql.php,v 1.25 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Sterling Hughes <sterling@php.net> */ @@ -65,6 +65,10 @@ } $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost'; $connect_function = $persistent ? 'msql_pconnect' : 'msql_connect'; http://cvs.php.net/diff.php/pear/DB/DB/mssql.php?r1=1.55&r2=1.56&ty=u Index: pear/DB/DB/mssql.php diff -u pear/DB/DB/mssql.php:1.55 pear/DB/DB/mssql.php:1.56 --- pear/DB/DB/mssql.php:1.55 Fri Aug 20 13:10:53 2004 +++ pear/DB/DB/mssql.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: mssql.php,v 1.55 2004/08/20 17:10:53 danielc Exp $ +// $Id: mssql.php,v 1.56 2004/10/05 00:06:48 danielc Exp $ require_once 'DB/common.php'; @@ -26,7 +26,7 @@ * extension. * * @package DB - * @version $Id: mssql.php,v 1.55 2004/08/20 17:10:53 danielc Exp $ + * @version $Id: mssql.php,v 1.56 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Sterling Hughes <sterling@php.net> */ @@ -81,7 +81,12 @@ { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost'; $dbhost .= $dsninfo['port'] ? ',' . $dsninfo['port'] : ''; http://cvs.php.net/diff.php/pear/DB/DB/mysql.php?r1=1.74&r2=1.75&ty=u Index: pear/DB/DB/mysql.php diff -u pear/DB/DB/mysql.php:1.74 pear/DB/DB/mysql.php:1.75 --- pear/DB/DB/mysql.php:1.74 Thu Apr 29 18:42:57 2004 +++ pear/DB/DB/mysql.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: mysql.php,v 1.74 2004/04/29 22:42:57 danielc Exp $ +// $Id: mysql.php,v 1.75 2004/10/05 00:06:48 danielc Exp $ // XXX legend: @@ -39,7 +39,7 @@ * This is for MySQL versions 4.0 and below. * * @package DB - * @version $Id: mysql.php,v 1.74 2004/04/29 22:42:57 danielc Exp $ + * @version $Id: mysql.php,v 1.75 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Stig Bakken <ssb@php.net> */ @@ -115,7 +115,12 @@ if (!DB::assertExtension('mysql')) { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + if ($dsninfo['protocol'] && $dsninfo['protocol'] == 'unix') { $dbhost = ':' . $dsninfo['socket']; } else { http://cvs.php.net/diff.php/pear/DB/DB/mysqli.php?r1=1.31&r2=1.32&ty=u Index: pear/DB/DB/mysqli.php diff -u pear/DB/DB/mysqli.php:1.31 pear/DB/DB/mysqli.php:1.32 --- pear/DB/DB/mysqli.php:1.31 Mon Jul 12 13:51:24 2004 +++ pear/DB/DB/mysqli.php Mon Oct 4 20:06:48 2004 @@ -16,7 +16,7 @@ // | Author: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: mysqli.php,v 1.31 2004/07/12 17:51:24 danielc Exp $ +// $Id: mysqli.php,v 1.32 2004/10/05 00:06:48 danielc Exp $ // EXPERIMENTAL @@ -33,7 +33,7 @@ * Note that persistent connections no longer exist. * * @package DB - * @version $Id: mysqli.php,v 1.31 2004/07/12 17:51:24 danielc Exp $ + * @version $Id: mysqli.php,v 1.32 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Daniel Convissor <danielc@php.net> * @since Class functional since Release 1.6.3 @@ -167,7 +167,11 @@ } $this->dsn = $dsninfo; - $conn = false; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + + $conn = false; @ini_set('track_errors', true); if ($this->getOption('ssl') === true) { http://cvs.php.net/diff.php/pear/DB/DB/oci8.php?r1=1.67&r2=1.68&ty=u Index: pear/DB/DB/oci8.php diff -u pear/DB/DB/oci8.php:1.67 pear/DB/DB/oci8.php:1.68 --- pear/DB/DB/oci8.php:1.67 Thu Jun 24 11:24:56 2004 +++ pear/DB/DB/oci8.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: oci8.php,v 1.67 2004/06/24 15:24:56 danielc Exp $ +// $Id: oci8.php,v 1.68 2004/10/05 00:06:48 danielc Exp $ // be aware... OCIError() only appears to return anything when given a @@ -34,7 +34,7 @@ * Definitely works with versions 8 and 9 of Oracle. * * @package DB - * @version $Id: oci8.php,v 1.67 2004/06/24 15:24:56 danielc Exp $ + * @version $Id: oci8.php,v 1.68 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author James L. Pine <jlp@valinux.com> */ @@ -112,7 +112,11 @@ if (!DB::assertExtension('oci8')) { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } $connect_function = $persistent ? 'OCIPLogon' : 'OCILogon'; http://cvs.php.net/diff.php/pear/DB/DB/pgsql.php?r1=1.83&r2=1.84&ty=u Index: pear/DB/DB/pgsql.php diff -u pear/DB/DB/pgsql.php:1.83 pear/DB/DB/pgsql.php:1.84 --- pear/DB/DB/pgsql.php:1.83 Mon Oct 4 13:53:09 2004 +++ pear/DB/DB/pgsql.php Mon Oct 4 20:06:48 2004 @@ -18,7 +18,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: pgsql.php,v 1.83 2004/10/04 17:53:09 danielc Exp $ +// $Id: pgsql.php,v 1.84 2004/10/05 00:06:48 danielc Exp $ require_once 'DB/common.php'; @@ -27,7 +27,7 @@ * extension. * * @package DB - * @version $Id: pgsql.php,v 1.83 2004/10/04 17:53:09 danielc Exp $ + * @version $Id: pgsql.php,v 1.84 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Rui Hirokawa <hirokawa@php.net> * @author Stig Bakken <ssb@php.net> @@ -85,6 +85,10 @@ } $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $protocol = $dsninfo['protocol'] ? $dsninfo['protocol'] : 'tcp'; $connstr = ''; http://cvs.php.net/diff.php/pear/DB/DB/sqlite.php?r1=1.66&r2=1.67&ty=u Index: pear/DB/DB/sqlite.php diff -u pear/DB/DB/sqlite.php:1.66 pear/DB/DB/sqlite.php:1.67 --- pear/DB/DB/sqlite.php:1.66 Wed Apr 28 16:13:10 2004 +++ pear/DB/DB/sqlite.php Mon Oct 4 20:06:48 2004 @@ -18,7 +18,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: sqlite.php,v 1.66 2004/04/28 20:13:10 danielc Exp $ +// $Id: sqlite.php,v 1.67 2004/10/05 00:06:48 danielc Exp $ require_once 'DB/common.php'; @@ -27,7 +27,7 @@ * PECL extension. * * @package DB - * @version $Id: sqlite.php,v 1.66 2004/04/28 20:13:10 danielc Exp $ + * @version $Id: sqlite.php,v 1.67 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Urs Gehrig <urs@circle.ch> * @author Mika Tuupola <tuupola@appelsiini.net> @@ -111,6 +111,9 @@ } $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } if ($dsninfo['database']) { if (!file_exists($dsninfo['database'])) { http://cvs.php.net/diff.php/pear/DB/DB/sybase.php?r1=1.52&r2=1.53&ty=u Index: pear/DB/DB/sybase.php diff -u pear/DB/DB/sybase.php:1.52 pear/DB/DB/sybase.php:1.53 --- pear/DB/DB/sybase.php:1.52 Mon Jul 12 15:07:34 2004 +++ pear/DB/DB/sybase.php Mon Oct 4 20:06:48 2004 @@ -18,7 +18,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: sybase.php,v 1.52 2004/07/12 19:07:34 danielc Exp $ +// $Id: sybase.php,v 1.53 2004/10/05 00:06:48 danielc Exp $ // TODO @@ -33,7 +33,7 @@ * extension. * * @package DB - * @version $Id: sybase.php,v 1.52 2004/07/12 19:07:34 danielc Exp $ + * @version $Id: sybase.php,v 1.53 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Sterling Hughes <sterling@php.net> * @author Antônio Carlos Venâncio Júnior <floripa@php.net> @@ -93,6 +93,9 @@ } $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } $interface = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost'; $connect_function = $persistent ? 'sybase_pconnect' : 'sybase_connect';
http://cvs.php.net/diff.php/pear/DB/DB/dbase.php?r1=1.21&r2=1.22&ty=u Index: pear/DB/DB/dbase.php diff -u pear/DB/DB/dbase.php:1.21 pear/DB/DB/dbase.php:1.22 --- pear/DB/DB/dbase.php:1.21 Mon Aug 2 21:46:17 2004 +++ pear/DB/DB/dbase.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: dbase.php,v 1.21 2004/08/03 01:46:17 danielc Exp $ +// $Id: dbase.php,v 1.22 2004/10/05 00:06:48 danielc Exp $ // XXX legend: @@ -31,7 +31,7 @@ * extension. * * @package DB - * @version $Id: dbase.php,v 1.21 2004/08/03 01:46:17 danielc Exp $ + * @version $Id: dbase.php,v 1.22 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Stig Bakken <ssb@php.net> */ @@ -76,7 +76,11 @@ if (!DB::assertExtension('dbase')) { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } $ini = ini_get('track_errors'); if ($ini) { http://cvs.php.net/diff.php/pear/DB/DB/fbsql.php?r1=1.36&r2=1.37&ty=u Index: pear/DB/DB/fbsql.php diff -u pear/DB/DB/fbsql.php:1.36 pear/DB/DB/fbsql.php:1.37 --- pear/DB/DB/fbsql.php:1.36 Thu Jun 24 11:24:56 2004 +++ pear/DB/DB/fbsql.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: fbsql.php,v 1.36 2004/06/24 15:24:56 danielc Exp $ +// $Id: fbsql.php,v 1.37 2004/10/05 00:06:48 danielc Exp $ // XXX legend: @@ -37,7 +37,7 @@ * extension. * * @package DB - * @version $Id: fbsql.php,v 1.36 2004/06/24 15:24:56 danielc Exp $ + * @version $Id: fbsql.php,v 1.37 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Frank M. Kromann <frank@frontbase.com> */ @@ -108,6 +108,10 @@ } $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost'; $php_errormsg = ''; http://cvs.php.net/diff.php/pear/DB/DB/ibase.php?r1=1.69&r2=1.70&ty=u Index: pear/DB/DB/ibase.php diff -u pear/DB/DB/ibase.php:1.69 pear/DB/DB/ibase.php:1.70 --- pear/DB/DB/ibase.php:1.69 Thu Jun 24 11:24:56 2004 +++ pear/DB/DB/ibase.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: ibase.php,v 1.69 2004/06/24 15:24:56 danielc Exp $ +// $Id: ibase.php,v 1.70 2004/10/05 00:06:48 danielc Exp $ // Bugs: @@ -31,7 +31,7 @@ * extension. * * @package DB - * @version $Id: ibase.php,v 1.69 2004/06/24 15:24:56 danielc Exp $ + * @version $Id: ibase.php,v 1.70 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Sterling Hughes <sterling@php.net> */ @@ -97,7 +97,12 @@ if (!DB::assertExtension('interbase')) { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $dbhost = $dsninfo['hostspec'] ? ($dsninfo['hostspec'] . ':' . $dsninfo['database']) : $dsninfo['database']; http://cvs.php.net/diff.php/pear/DB/DB/ifx.php?r1=1.47&r2=1.48&ty=u Index: pear/DB/DB/ifx.php diff -u pear/DB/DB/ifx.php:1.47 pear/DB/DB/ifx.php:1.48 --- pear/DB/DB/ifx.php:1.47 Thu Mar 4 20:46:53 2004 +++ pear/DB/DB/ifx.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: ifx.php,v 1.47 2004/03/05 01:46:53 danielc Exp $ +// $Id: ifx.php,v 1.48 2004/10/05 00:06:48 danielc Exp $ // Legend: @@ -36,7 +36,7 @@ * extension. * * @package DB - * @version $Id: ifx.php,v 1.47 2004/03/05 01:46:53 danielc Exp $ + * @version $Id: ifx.php,v 1.48 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Tomas V.V.Cox <cox@idecnet.com> */ @@ -108,7 +108,12 @@ { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $dbhost = $dsninfo['hostspec'] ? '@' . $dsninfo['hostspec'] : ''; $dbname = $dsninfo['database'] ? $dsninfo['database'] . $dbhost : ''; $user = $dsninfo['username'] ? $dsninfo['username'] : ''; http://cvs.php.net/diff.php/pear/DB/DB/msql.php?r1=1.24&r2=1.25&ty=u Index: pear/DB/DB/msql.php diff -u pear/DB/DB/msql.php:1.24 pear/DB/DB/msql.php:1.25 --- pear/DB/DB/msql.php:1.24 Thu Mar 4 20:46:53 2004 +++ pear/DB/DB/msql.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: msql.php,v 1.24 2004/03/05 01:46:53 danielc Exp $ +// $Id: msql.php,v 1.25 2004/10/05 00:06:48 danielc Exp $ require_once 'DB/common.php'; @@ -26,7 +26,7 @@ * extension. * * @package DB - * @version $Id: msql.php,v 1.24 2004/03/05 01:46:53 danielc Exp $ + * @version $Id: msql.php,v 1.25 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Sterling Hughes <sterling@php.net> */ @@ -65,6 +65,10 @@ } $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost'; $connect_function = $persistent ? 'msql_pconnect' : 'msql_connect'; http://cvs.php.net/diff.php/pear/DB/DB/mssql.php?r1=1.55&r2=1.56&ty=u Index: pear/DB/DB/mssql.php diff -u pear/DB/DB/mssql.php:1.55 pear/DB/DB/mssql.php:1.56 --- pear/DB/DB/mssql.php:1.55 Fri Aug 20 13:10:53 2004 +++ pear/DB/DB/mssql.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: mssql.php,v 1.55 2004/08/20 17:10:53 danielc Exp $ +// $Id: mssql.php,v 1.56 2004/10/05 00:06:48 danielc Exp $ require_once 'DB/common.php'; @@ -26,7 +26,7 @@ * extension. * * @package DB - * @version $Id: mssql.php,v 1.55 2004/08/20 17:10:53 danielc Exp $ + * @version $Id: mssql.php,v 1.56 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Sterling Hughes <sterling@php.net> */ @@ -81,7 +81,12 @@ { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost'; $dbhost .= $dsninfo['port'] ? ',' . $dsninfo['port'] : ''; http://cvs.php.net/diff.php/pear/DB/DB/mysql.php?r1=1.74&r2=1.75&ty=u Index: pear/DB/DB/mysql.php diff -u pear/DB/DB/mysql.php:1.74 pear/DB/DB/mysql.php:1.75 --- pear/DB/DB/mysql.php:1.74 Thu Apr 29 18:42:57 2004 +++ pear/DB/DB/mysql.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: mysql.php,v 1.74 2004/04/29 22:42:57 danielc Exp $ +// $Id: mysql.php,v 1.75 2004/10/05 00:06:48 danielc Exp $ // XXX legend: @@ -39,7 +39,7 @@ * This is for MySQL versions 4.0 and below. * * @package DB - * @version $Id: mysql.php,v 1.74 2004/04/29 22:42:57 danielc Exp $ + * @version $Id: mysql.php,v 1.75 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Stig Bakken <ssb@php.net> */ @@ -115,7 +115,12 @@ if (!DB::assertExtension('mysql')) { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + if ($dsninfo['protocol'] && $dsninfo['protocol'] == 'unix') { $dbhost = ':' . $dsninfo['socket']; } else { http://cvs.php.net/diff.php/pear/DB/DB/mysqli.php?r1=1.31&r2=1.32&ty=u Index: pear/DB/DB/mysqli.php diff -u pear/DB/DB/mysqli.php:1.31 pear/DB/DB/mysqli.php:1.32 --- pear/DB/DB/mysqli.php:1.31 Mon Jul 12 13:51:24 2004 +++ pear/DB/DB/mysqli.php Mon Oct 4 20:06:48 2004 @@ -16,7 +16,7 @@ // | Author: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: mysqli.php,v 1.31 2004/07/12 17:51:24 danielc Exp $ +// $Id: mysqli.php,v 1.32 2004/10/05 00:06:48 danielc Exp $ // EXPERIMENTAL @@ -33,7 +33,7 @@ * Note that persistent connections no longer exist. * * @package DB - * @version $Id: mysqli.php,v 1.31 2004/07/12 17:51:24 danielc Exp $ + * @version $Id: mysqli.php,v 1.32 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Daniel Convissor <danielc@php.net> * @since Class functional since Release 1.6.3 @@ -167,7 +167,11 @@ } $this->dsn = $dsninfo; - $conn = false; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + + $conn = false; @ini_set('track_errors', true); if ($this->getOption('ssl') === true) { http://cvs.php.net/diff.php/pear/DB/DB/oci8.php?r1=1.67&r2=1.68&ty=u Index: pear/DB/DB/oci8.php diff -u pear/DB/DB/oci8.php:1.67 pear/DB/DB/oci8.php:1.68 --- pear/DB/DB/oci8.php:1.67 Thu Jun 24 11:24:56 2004 +++ pear/DB/DB/oci8.php Mon Oct 4 20:06:48 2004 @@ -17,7 +17,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: oci8.php,v 1.67 2004/06/24 15:24:56 danielc Exp $ +// $Id: oci8.php,v 1.68 2004/10/05 00:06:48 danielc Exp $ // be aware... OCIError() only appears to return anything when given a @@ -34,7 +34,7 @@ * Definitely works with versions 8 and 9 of Oracle. * * @package DB - * @version $Id: oci8.php,v 1.67 2004/06/24 15:24:56 danielc Exp $ + * @version $Id: oci8.php,v 1.68 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author James L. Pine <jlp@valinux.com> */ @@ -112,7 +112,11 @@ if (!DB::assertExtension('oci8')) { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); } + $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } $connect_function = $persistent ? 'OCIPLogon' : 'OCILogon'; http://cvs.php.net/diff.php/pear/DB/DB/pgsql.php?r1=1.83&r2=1.84&ty=u Index: pear/DB/DB/pgsql.php diff -u pear/DB/DB/pgsql.php:1.83 pear/DB/DB/pgsql.php:1.84 --- pear/DB/DB/pgsql.php:1.83 Mon Oct 4 13:53:09 2004 +++ pear/DB/DB/pgsql.php Mon Oct 4 20:06:48 2004 @@ -18,7 +18,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: pgsql.php,v 1.83 2004/10/04 17:53:09 danielc Exp $ +// $Id: pgsql.php,v 1.84 2004/10/05 00:06:48 danielc Exp $ require_once 'DB/common.php'; @@ -27,7 +27,7 @@ * extension. * * @package DB - * @version $Id: pgsql.php,v 1.83 2004/10/04 17:53:09 danielc Exp $ + * @version $Id: pgsql.php,v 1.84 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Rui Hirokawa <hirokawa@php.net> * @author Stig Bakken <ssb@php.net> @@ -85,6 +85,10 @@ } $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } + $protocol = $dsninfo['protocol'] ? $dsninfo['protocol'] : 'tcp'; $connstr = ''; http://cvs.php.net/diff.php/pear/DB/DB/sqlite.php?r1=1.66&r2=1.67&ty=u Index: pear/DB/DB/sqlite.php diff -u pear/DB/DB/sqlite.php:1.66 pear/DB/DB/sqlite.php:1.67 --- pear/DB/DB/sqlite.php:1.66 Wed Apr 28 16:13:10 2004 +++ pear/DB/DB/sqlite.php Mon Oct 4 20:06:48 2004 @@ -18,7 +18,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: sqlite.php,v 1.66 2004/04/28 20:13:10 danielc Exp $ +// $Id: sqlite.php,v 1.67 2004/10/05 00:06:48 danielc Exp $ require_once 'DB/common.php'; @@ -27,7 +27,7 @@ * PECL extension. * * @package DB - * @version $Id: sqlite.php,v 1.66 2004/04/28 20:13:10 danielc Exp $ + * @version $Id: sqlite.php,v 1.67 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Urs Gehrig <urs@circle.ch> * @author Mika Tuupola <tuupola@appelsiini.net> @@ -111,6 +111,9 @@ } $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } if ($dsninfo['database']) { if (!file_exists($dsninfo['database'])) { http://cvs.php.net/diff.php/pear/DB/DB/sybase.php?r1=1.52&r2=1.53&ty=u Index: pear/DB/DB/sybase.php diff -u pear/DB/DB/sybase.php:1.52 pear/DB/DB/sybase.php:1.53 --- pear/DB/DB/sybase.php:1.52 Mon Jul 12 15:07:34 2004 +++ pear/DB/DB/sybase.php Mon Oct 4 20:06:48 2004 @@ -18,7 +18,7 @@ // | Maintainer: Daniel Convissor <danielc@php.net> | // +----------------------------------------------------------------------+ // -// $Id: sybase.php,v 1.52 2004/07/12 19:07:34 danielc Exp $ +// $Id: sybase.php,v 1.53 2004/10/05 00:06:48 danielc Exp $ // TODO @@ -33,7 +33,7 @@ * extension. * * @package DB - * @version $Id: sybase.php,v 1.52 2004/07/12 19:07:34 danielc Exp $ + * @version $Id: sybase.php,v 1.53 2004/10/05 00:06:48 danielc Exp $ * @category Database * @author Sterling Hughes <sterling@php.net> * @author Antônio Carlos Venâncio Júnior <floripa@php.net> @@ -93,6 +93,9 @@ } $this->dsn = $dsninfo; + if ($dsninfo['dbsyntax']) { + $this->dbsyntax = $dsninfo['dbsyntax']; + } $interface = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost'; $connect_function = $persistent ? 'sybase_pconnect' : 'sybase_connect';