cvs: php4 /pear DB.php /pear/DB msql.php mssql.php mysql.php odbc.php pgsql.php

chagenbu Tue Jun 20 19:22:05 2000 EDT Modified files: /php4/pear DB.php /php4/pear/DB msql.php mssql.php mysql.php odbc.php pgsql.php Log: Here is a brief start towards getting the DB stuff up to speed and working (I need it to move forward on some stuff, and I really do want to see PEAR succeed, so I'm going to work with the official code to get it working. Hope that's okay). I've replaced all instances of 'use' and 'import' with 'include_once' (and added the .php extension where necessary). This gets my short test script working. More possibly to come. Index: php4/pear/DB.php diff -u php4/pear/DB.php:1.18 php4/pear/DB.php:1.19 --- php4/pear/DB.php:1.18 Thu Mar 9 13:57:14 2000 +++ php4/pear/DB.php Tue Jun 20 19:22:04 2000 @@ -17,7 +17,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: DB.php,v 1.18 2000/03/09 21:57:14 ssb Exp $ +// $Id: DB.php,v 1.19 2000/06/21 02:22:04 chagenbu Exp $ // // Database independent query interface. // @@ -161,7 +161,7 @@ * error */ function &factory($type) { - if (!@import("DB/${type}.php")) { + if (!@include_once("DB/${type}.php")) { return DB_ERROR_NOT_FOUND; } $classname = 'DB_' . $type; @@ -190,7 +190,7 @@ $dsninfo = DB::parseDSN($dsn); $type = $dsninfo['phptype']; - if (!@import("DB/${type}.php")) { + if (!@include_once("DB/${type}.php")) { return DB_ERROR_NOT_FOUND; } $classname = 'DB_' . $type; Index: php4/pear/DB/msql.php diff -u php4/pear/DB/msql.php:1.1 php4/pear/DB/msql.php:1.2 --- php4/pear/DB/msql.php:1.1 Sun Apr 23 13:52:26 2000 +++ php4/pear/DB/msql.php Tue Jun 20 19:22:04 2000 @@ -17,13 +17,13 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: msql.php,v 1.1 2000/04/23 20:52:26 sterling Exp $ +// $Id: msql.php,v 1.2 2000/06/21 02:22:04 chagenbu Exp $ // // Database independent query interface definition for PHP's Mini-SQL // extension. // -use "DB/common"; +include_once 'DB/common.php'; class DB_msql extends DB_common { @@ -196,4 +196,4 @@ } } -?> \ No newline at end of file +?> Index: php4/pear/DB/mssql.php diff -u php4/pear/DB/mssql.php:1.4 php4/pear/DB/mssql.php:1.5 --- php4/pear/DB/mssql.php:1.4 Thu Mar 9 13:57:14 2000 +++ php4/pear/DB/mssql.php Tue Jun 20 19:22:04 2000 @@ -17,13 +17,13 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: mssql.php,v 1.4 2000/03/09 21:57:14 ssb Exp $ +// $Id: mssql.php,v 1.5 2000/06/21 02:22:04 chagenbu Exp $ // // Database independent query interface definition for PHP's Microsoft SQL Server // extension. // -use "DB/common"; +include_once 'DB/common.php'; class DB_mssql extends DB_common { Index: php4/pear/DB/mysql.php diff -u php4/pear/DB/mysql.php:1.14 php4/pear/DB/mysql.php:1.15 --- php4/pear/DB/mysql.php:1.14 Thu Mar 9 13:57:14 2000 +++ php4/pear/DB/mysql.php Tue Jun 20 19:22:04 2000 @@ -28,7 +28,7 @@ // be registered here. // -use "DB/common"; +include_once 'DB/common.php'; class DB_mysql extends DB_common { // {{{ properties Index: php4/pear/DB/odbc.php diff -u php4/pear/DB/odbc.php:1.6 php4/pear/DB/odbc.php:1.7 --- php4/pear/DB/odbc.php:1.6 Thu Mar 9 13:57:14 2000 +++ php4/pear/DB/odbc.php Tue Jun 20 19:22:04 2000 @@ -31,7 +31,7 @@ // a reference. // -use "DB/common"; +include_once 'DB/common.php'; class DB_odbc extends DB_common { // {{{ properties Index: php4/pear/DB/pgsql.php diff -u php4/pear/DB/pgsql.php:1.5 php4/pear/DB/pgsql.php:1.6 --- php4/pear/DB/pgsql.php:1.5 Thu Mar 9 13:57:14 2000 +++ php4/pear/DB/pgsql.php Tue Jun 20 19:22:05 2000 @@ -46,7 +46,7 @@ // be registered here. // -use "DB/common"; +include_once 'DB/common.php'; class DB_pgsql extends DB_common { // {{{ properties