cvs: pear /MDB2/MDB2/Driver/Reverse fbsql.php mysql.php
| From: | Lukas Smith | Date: | Fri, 10 Jun 2005 14:17:29 +0000 |
| Subject: | cvs: pear /MDB2/MDB2/Driver/Reverse fbsql.php mysql.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-32458@lists.php.net to get a copy of this message | ||
lsmith Fri Jun 10 10:17:29 2005 EDT
Modified files:
/pear/MDB2/MDB2/Driver/Reverse mysql.php fbsql.php
Log:
- ensure that instance is connected before using connection property in tableInfo()
http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Reverse/mysql.php?r1=1.23&r2=1.24&ty=u
Index: pear/MDB2/MDB2/Driver/Reverse/mysql.php
diff -u pear/MDB2/MDB2/Driver/Reverse/mysql.php:1.23 pear/MDB2/MDB2/Driver/Reverse/mysql.php:1.24
--- pear/MDB2/MDB2/Driver/Reverse/mysql.php:1.23 Tue Jun 7 06:12:16 2005
+++ pear/MDB2/MDB2/Driver/Reverse/mysql.php Fri Jun 10 10:17:28 2005
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@backendmedia.com> |
// +----------------------------------------------------------------------+
//
-// $Id: mysql.php,v 1.23 2005/06/07 10:12:16 lsmith Exp $
+// $Id: mysql.php,v 1.24 2005/06/10 14:17:28 lsmith Exp $
//
require_once 'MDB2/Driver/Reverse/Common.php';
@@ -233,6 +233,10 @@
* Probably received a table name.
* Create a result resource identifier.
*/
+ $connected = $db->connect();
+ if (PEAR::isError($connected)) {
+ return $connected;
+ }
$id = @mysql_list_fields($db->database_name, $result, $db->connection);
$got_string = true;
} elseif (MDB2::isResultCommon($result)) {
http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Reverse/fbsql.php?r1=1.9&r2=1.10&ty=u
Index: pear/MDB2/MDB2/Driver/Reverse/fbsql.php
diff -u pear/MDB2/MDB2/Driver/Reverse/fbsql.php:1.9 pear/MDB2/MDB2/Driver/Reverse/fbsql.php:1.10
--- pear/MDB2/MDB2/Driver/Reverse/fbsql.php:1.9 Fri Mar 4 07:37:58 2005
+++ pear/MDB2/MDB2/Driver/Reverse/fbsql.php Fri Jun 10 10:17:28 2005
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@backendmedia.com> |
// +----------------------------------------------------------------------+
//
-// $Id: fbsql.php,v 1.9 2005/03/04 12:37:58 lsmith Exp $
+// $Id: fbsql.php,v 1.10 2005/06/10 14:17:28 lsmith Exp $
//
require_once 'MDB2/Driver/Reverse/Common.php';
@@ -82,6 +82,11 @@
* Probably received a table name.
* Create a result resource identifier.
*/
+
+ $connected = $db->connect();
+ if (PEAR::isError($connected)) {
+ return $connected;
+ }
$id = @fbsql_list_fields($db->database_name, $result, $db->connection);
$got_string = true;
} elseif (MDB2::isResultCommon($result)) {