From 60eac2585cd3ab47b1491efe854fb3c222b0a654 Mon Sep 17 00:00:00 2001 From: Marco Villegas Date: Mon, 15 Nov 2010 05:37:52 -0500 Subject: [PATCH] bug #972058: Fixed Complete removing of {versioncontrol_operation_items()} table. - Add vc_op_id to operation entity. - Remove accidentally added lines to the wrong hook_update_N() function. --- includes/VersioncontrolItem.php | 7 +++++++ includes/VersioncontrolOperation.php | 1 + versioncontrol.install | 8 -------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git includes/VersioncontrolItem.php includes/VersioncontrolItem.php index 925c9ff..b9dfb3e 100644 --- includes/VersioncontrolItem.php +++ includes/VersioncontrolItem.php @@ -22,6 +22,13 @@ abstract class VersioncontrolItem extends VersioncontrolEntity { public $item_revision_id; /** + * Operation identifier. + * + * @var int + */ + public $vc_op_id; + + /** * The path of the item. * * @var string diff --git includes/VersioncontrolOperation.php includes/VersioncontrolOperation.php index 7179981..a5c0989 100644 --- includes/VersioncontrolOperation.php +++ includes/VersioncontrolOperation.php @@ -276,6 +276,7 @@ abstract class VersioncontrolOperation extends VersioncontrolEntity { foreach ($operation_items as $path => $item) { $item->sanitize(); + $item->vc_op_id = $this->vc_op_id; $item->ensure(); $this->insertOperationItem($item, VERSIONCONTROL_OPERATION_MEMBER_ITEM); diff --git versioncontrol.install versioncontrol.install index 324b30b..4f3b7d5 100644 --- versioncontrol.install +++ versioncontrol.install @@ -708,14 +708,6 @@ function versioncontrol_update_6303() { ); db_change_field($ret, 'versioncontrol_accounts', 'username', 'vcs_username', $spec); - $result = db_query("SELECT vc_op_id, item_revision_id FROM {versioncontrol_operation_items}"); - - $data = array(); - while ($row = db_fetch_object($result)) { - db_query('UPDATE {versioncontrol_operation_items} SET vc_op_id = %d WHERE item_revision_id = %d', $row->vc_op_id, $row->item_revision_id); - } - - db_drop_table($ret, 'versioncontrol_operation_items'); return $ret; } -- 1.7.2.3