cvs: pear /MDB2/MDB2/Driver/Manager ibase.php
| From: | Lorenzo Alberton | Date: | Mon, 18 Jul 2005 19:01:35 +0000 |
| Subject: | cvs: pear /MDB2/MDB2/Driver/Manager ibase.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-33135@lists.php.net to get a copy of this message | ||
quipo Mon Jul 18 15:01:35 2005 EDT
Modified files:
/pear/MDB2/MDB2/Driver/Manager ibase.php
Log:
added missing error check (take two)
http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/ibase.php?r1=1.22&r2=1.23&ty=u
Index: pear/MDB2/MDB2/Driver/Manager/ibase.php
diff -u pear/MDB2/MDB2/Driver/Manager/ibase.php:1.22 pear/MDB2/MDB2/Driver/Manager/ibase.php:1.23
--- pear/MDB2/MDB2/Driver/Manager/ibase.php:1.22 Mon Jul 18 15:00:46 2005
+++ pear/MDB2/MDB2/Driver/Manager/ibase.php Mon Jul 18 15:01:35 2005
@@ -42,7 +42,7 @@
// | Author: Lorenzo Alberton <l.alberton@quipo.it> |
// +----------------------------------------------------------------------+
//
-// $Id: ibase.php,v 1.22 2005/07/18 19:00:46 quipo Exp $
+// $Id: ibase.php,v 1.23 2005/07/18 19:01:35 quipo Exp $
require_once 'MDB2/Driver/Manager/Common.php';
@@ -262,17 +262,21 @@
if (isset($changes['added_fields'])) {
$fields = $changes['added_fields'];
foreach ($fields as $field_name => $field) {
- if ($query) {
+ $type_declaration = $db->getDeclaration($field['type'], $field_name,
$field);
+ if (PEAR::isError($type_declaration)) {
+ return $err;
+ }
+ if (strlen($query)) {
$query .= ', ';
}
- $query .= 'ADD ' . $db->getDeclaration($field['type'],
$field_name, $field);
+ $query .= 'ADD ' . $type_declaration;
}
}
if (isset($changes['removed_fields'])) {
$fields = $changes['removed_fields'];
foreach ($fields as $field_name => $field) {
- if ($query) {
+ if (strlen($query)) {
$query .= ', ';
}
$query .= 'DROP ' . $field_name;
@@ -282,7 +286,7 @@
if (isset($changes['renamed_fields'])) {
$fields = $changes['renamed_fields'];
foreach ($fields as $field_name => $field) {
- if ($query) {
+ if (strlen($query)) {
$query .= ', ';
}
$query .= 'ALTER ' . $field_name . ' TO ' .
$field['name'];
@@ -295,7 +299,7 @@
if (PEAR::isError($err = $this->checkSupportedChanges($field))) {
return $err;
}
- if ($query) {
+ if (strlen($query)) {
$query .= ', ';
}
$db->loadModule('Datatype');
@@ -303,7 +307,7 @@
}
}
- if (!$query) {
+ if (!strlen($query)) {
return MDB2_OK;
}