diff --git a/setup/db/db/schema-2214to30.sql b/setup/db/db/schema-2214to30.sql index 4be6486aa7f..4cf26fbedde 100755 --- a/setup/db/db/schema-2214to30.sql +++ b/setup/db/db/schema-2214to30.sql @@ -292,7 +292,13 @@ ALTER TABLE `cloud_usage`.`user_statistics` ADD COLUMN `agg_bytes_received` bigi ALTER TABLE `cloud_usage`.`user_statistics` ADD COLUMN `agg_bytes_sent` bigint unsigned NOT NULL default '0'; ALTER TABLE `cloud_usage`.`usage_network` ADD COLUMN `agg_bytes_received` bigint unsigned NOT NULL default '0'; ALTER TABLE `cloud_usage`.`usage_network` ADD COLUMN `agg_bytes_sent` bigint unsigned NOT NULL default '0'; -UPDATE `cloud_usage`.`usage_network` set agg_bytes_received = net_bytes_received + current_bytes_received, agg_bytes_sent = net_bytes_sent + current_bytes_sent; +UPDATE `cloud_usage`.`usage_network` set agg_bytes_received = net_bytes_received + current_bytes_received, agg_bytes_sent = net_bytes_sent + current_bytes_sent; +ALTER TABLE `cloud_usage`.`usage_network` DROP COLUMN `net_bytes_received`; +ALTER TABLE `cloud_usage`.`usage_network` DROP COLUMN `current_bytes_received`; +ALTER TABLE `cloud_usage`.`usage_network` DROP COLUMN `net_bytes_sent`; +ALTER TABLE `cloud_usage`.`usage_network` DROP COLUMN `current_bytes_sent`; +DROP TABLE `cloud_usage`.`event`; + ALTER TABLE `cloud_usage`.`usage_vpn_user` ADD INDEX `i_usage_vpn_user__account_id`(`account_id`); ALTER TABLE `cloud_usage`.`usage_vpn_user` ADD INDEX `i_usage_vpn_user__created`(`created`); ALTER TABLE `cloud_usage`.`usage_vpn_user` ADD INDEX `i_usage_vpn_user__deleted`(`deleted`);