|
From: Benjamin C. <bc...@us...> - 2002-10-11 20:54:46
|
Update of /cvsroot/phpbt/phpbt/inc/pear/DB
In directory usw-pr-cvs1:/tmp/cvs-serv14128/inc/pear/DB
Modified Files:
dbase.php fbsql.php ibase.php ifx.php msql.php mssql.php
mysql.php oci8.php odbc.php pgsql.php storage.php sybase.php
Log Message:
Added PEAR_PATH to avoid conflicts with system-wide PEAR.
Index: dbase.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/dbase.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbase.php 13 Sep 2002 18:07:51 -0000 1.1
+++ dbase.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -25,7 +25,7 @@
// You have to compile your PHP with the --enable-dbase option
//
-require_once "DB/common.php";
+require_once PEAR_PATH."DB/common.php";
class DB_dbase extends DB_common
{
Index: fbsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/fbsql.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fbsql.php 13 Sep 2002 18:07:51 -0000 1.1
+++ fbsql.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -29,7 +29,7 @@
// be registered here.
//
-require_once "DB/common.php";
+require_once PEAR_PATH."DB/common.php";
class DB_fbsql extends DB_common
{
Index: ibase.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/ibase.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibase.php 13 Sep 2002 18:07:51 -0000 1.1
+++ ibase.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -22,7 +22,7 @@
// extension.
//
-require_once 'DB/common.php';
+require_once PEAR_PATH.'DB/common.php';
class DB_ibase extends DB_common
{
@@ -573,7 +573,7 @@
}
$errmsg = $m[2] . ' ' . $m[3];
}
-
+
return $this->raiseError($errno, null, null, $errmsg,
$this->last_query);
}
Index: ifx.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/ifx.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ifx.php 13 Sep 2002 18:07:51 -0000 1.1
+++ ifx.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -30,7 +30,7 @@
// - set needed env Informix vars on connect
// - implement native prepare/execute
-require_once 'DB/common.php';
+require_once PEAR_PATH.'DB/common.php';
class DB_ifx extends DB_common
{
Index: msql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/msql.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- msql.php 13 Sep 2002 18:07:51 -0000 1.1
+++ msql.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -22,7 +22,7 @@
// extension.
//
-require_once 'DB/common.php';
+require_once PEAR_PATH.'DB/common.php';
class DB_msql extends DB_common
{
Index: mssql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/mssql.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mssql.php 13 Sep 2002 18:07:51 -0000 1.1
+++ mssql.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -22,9 +22,9 @@
// extension.
//
-require_once 'DB/common.php';
+require_once PEAR_PATH.'DB/common.php';
-class DB_mssql extends DB_common
+class DB_mssql PEAR_PATH.extends DB_common
{
var $connection;
var $phptype, $dbsyntax;
Index: mysql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/mysql.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql.php 13 Sep 2002 18:07:51 -0000 1.1
+++ mysql.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -29,7 +29,7 @@
// be registered here.
//
-require_once "DB/common.php";
+require_once PEAR_PATH."DB/common.php";
class DB_mysql extends DB_common
{
@@ -843,5 +843,5 @@
// longReadlen
// binmode
}
-
+//echo ':(';
?>
Index: oci8.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/oci8.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oci8.php 13 Sep 2002 18:07:51 -0000 1.1
+++ oci8.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -29,7 +29,7 @@
//
-require_once 'DB/common.php';
+require_once PEAR_PATH.'DB/common.php';
class DB_oci8 extends DB_common
{
Index: odbc.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/odbc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- odbc.php 13 Sep 2002 18:07:51 -0000 1.1
+++ odbc.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -31,7 +31,7 @@
// be registered here.
//
-require_once 'DB/common.php';
+require_once PEAR_PATH.'DB/common.php';
class DB_odbc extends DB_common
{
Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/pgsql.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pgsql.php 3 Oct 2002 15:18:57 -0000 1.2
+++ pgsql.php 11 Oct 2002 20:54:43 -0000 1.3
@@ -30,7 +30,7 @@
// be registered here.
//
-require_once 'DB/common.php';
+require_once PEAR_PATH.'DB/common.php';
class DB_pgsql extends DB_common
{
Index: storage.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/storage.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- storage.php 13 Sep 2002 18:07:51 -0000 1.1
+++ storage.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -22,8 +22,8 @@
// can be manipulated and that updates the database accordingly.
//
-require_once "PEAR.php";
-require_once "DB.php";
+require_once PEAR_PATH."PEAR.php";
+require_once PEAR_PATH."DB.php";
/**
* DB_storage provides an object interface to a table row. It lets
Index: sybase.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/pear/DB/sybase.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sybase.php 13 Sep 2002 18:07:51 -0000 1.1
+++ sybase.php 11 Oct 2002 20:54:43 -0000 1.2
@@ -22,7 +22,7 @@
// extension.
//
-require_once 'DB/common.php';
+require_once PEAR_PATH.'DB/common.php';
class DB_sybase extends DB_common
{
|