cvs: pear /MDB2_Schema/MDB2 Schema.php

ifeghali Wed May 9 17:33:51 2007 UTC

Modified files:
/pear/MDB2_Schema/MDB2 Schema.php
Log:
- alterDatabaseTables() should add tables first so we can grab data that will be lost on a remove
- added an option to control whether updateDatabase() should overwrite the old schema file


http://cvs.php.net/viewvc.cgi/pear/M...&diff_format=u
Index: pear/MDB2_Schema/MDB2/Schema.php
diff -u pear/MDB2_Schema/MDB2/Schema.php:1.109 pear/MDB2_Schema/MDB2/Schema.php:1.110
--- pear/MDB2_Schema/MDB2/Schema.php:1.109 Wed May 9 03:40:17 2007
+++ pear/MDB2_Schema/MDB2/Schema.php Wed May 9 17:33:51 2007
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
//
-// $Id: Schema.php,v 1.109 2007/05/09 03:40:17 ifeghali Exp $
+// $Id: Schema.php,v 1.110 2007/05/09 17:33:51 ifeghali Exp $
//

require_once 'MDB2.php';
@@ -1694,14 +1694,15 @@
*/
function alterDatabaseTables($current_definition, $previous_definition, $changes)
{
+ /* FIXME: tables marked to be added are initialized by createTable(), others don't */
$alterations = 0;
if (empty($changes)) {
return $alterations;
}

- if (!empty($changes['remove']) && is_array($changes['remove'])) {
- foreach ($changes['remove'] as $table_name => $table) {
- $result = $this->db->manager->dropTable($table_name);
+ if (!empty($changes['add']) && is_array($changes['add'])) {
+ foreach ($changes['add'] as $table_name => $table) {
+ $result = $this->createTable($table_name, $current_definition[$table_name]);
if (PEAR::isError($result)) {
return $result;
}
@@ -1709,9 +1710,9 @@
}
}

- if (!empty($changes['add']) && is_array($changes['add'])) {
- foreach ($changes['add'] as $table_name => $table) {
- $result = $this->createTable($table_name, $current_definition[$table_name]);
+ if (!empty($changes['remove']) && is_array($changes['remove'])) {
+ foreach ($changes['remove'] as $table_name => $table) {
+ $result = $this->db->manager->dropTable($table_name);
if (PEAR::isError($result)) {
return $result;
}
@@ -2225,7 +2226,7 @@
* @access public
*/
function updateDatabase($current_schema, $previous_schema = false
- , $variables = array(), $disable_query = false)
+ , $variables = array(), $disable_query = false, $overwrite_old_schema_file = false)
{
$current_definition = $this->parseDatabaseDefinition(
$current_schema, false, $variables, $this->options['fail_on_invalid_names']
@@ -2289,7 +2290,8 @@
}
}

- if (!$disable_query
+ if ($overwrite_old_schema_file
+ && !$disable_query
&& is_string($previous_schema) && is_string($current_schema)
&& !copy($current_schema, $previous_schema)
) {