cvs: pear /MDB2/MDB2/Driver/Manager Common.php
| From: | Lukas Smith | Date: | Fri, 14 Oct 2005 10:42:52 +0000 |
| Subject: | cvs: pear /MDB2/MDB2/Driver/Manager Common.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-35518@lists.php.net to get a copy of this message | ||
lsmith Fri Oct 14 06:42:52 2005 EDT
Modified files:
/pear/MDB2/MDB2/Driver/Manager Common.php
Log:
- added contraint handling to dropIndex()
http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/Common.php?r1=1.24&r2=1.25&ty=u
Index: pear/MDB2/MDB2/Driver/Manager/Common.php
diff -u pear/MDB2/MDB2/Driver/Manager/Common.php:1.24 pear/MDB2/MDB2/Driver/Manager/Common.php:1.25
--- pear/MDB2/MDB2/Driver/Manager/Common.php:1.24 Thu Oct 13 10:23:36 2005
+++ pear/MDB2/MDB2/Driver/Manager/Common.php Fri Oct 14 06:42:51 2005
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
//
-// $Id: Common.php,v 1.24 2005/10/13 14:23:36 lsmith Exp $
+// $Id: Common.php,v 1.25 2005/10/14 10:42:51 lsmith Exp $
//
/**
@@ -536,7 +536,13 @@
return $db;
}
- return $db->query("DROP INDEX $name");
+ $db->expectError('*');
+ $result = $db->query("DROP INDEX $name");
+ $db->popExpect();
+ if (PEAR::isError($result)) {
+ $result = $db->query("ALTER TABLE $table DROP CONSTRAINT $name");
+ }
+ return $result;
}
// }}}