Author: jfthomps
Date: Mon Feb 2 16:01:32 2015
New Revision: 1656504
URL: http://svn.apache.org/r1656504
Log:
VCL-764 - Database changes for VCL 2.4
modified DELETE queries added in last commit that removed old entries from
provisioningOSinstalltype - queries were deleting where provisioningid matched
an id from the module table, but should have been matching id from provisioning
table by joining the provisioning table and the module table in the subquery;
corrected the problem
Modified:
vcl/trunk/mysql/update-vcl.sql
Modified: vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/update-vcl.sql?rev=1656504&r1=1656503&r2=1656504&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Mon Feb 2 16:01:32 2015
@@ -2275,7 +2275,7 @@ statgraphcache.provisioningid = (
WHERE provisioning.moduleid IN (SELECT module.id FROM module WHERE
module.perlpackage = 'VCL::Module::Provisioning::vmware')
AND statgraphcache.provisioningid = provisioning.id;
-DELETE FROM provisioningOSinstalltype WHERE
provisioningOSinstalltype.provisioningid IN (SELECT module.id FROM module WHERE
module.perlpackage = 'VCL::Module::Provisioning::vmware');
+DELETE FROM provisioningOSinstalltype WHERE
provisioningOSinstalltype.provisioningid IN (SELECT provisioning.id FROM
provisioning, module WHERE provisioning.moduleid = module.id AND
module.perlpackage = 'VCL::Module::Provisioning::vmware');
DELETE FROM provisioning WHERE provisioning.moduleid IN (SELECT module.id FROM
module WHERE module.perlpackage = 'VCL::Module::Provisioning::vmware');
@@ -2311,7 +2311,7 @@ statgraphcache.provisioningid = (
WHERE provisioning.moduleid IN (SELECT module.id FROM module WHERE
module.perlpackage = 'VCL::Module::Provisioning::xCAT2')
AND statgraphcache.provisioningid = provisioning.id;
-DELETE FROM provisioningOSinstalltype WHERE
provisioningOSinstalltype.provisioningid IN (SELECT module.id FROM module WHERE
module.perlpackage = 'VCL::Module::Provisioning::xCAT2');
+DELETE FROM provisioningOSinstalltype WHERE
provisioningOSinstalltype.provisioningid IN (SELECT provisioning.id FROM
provisioning, module WHERE provisioning.moduleid = module.id AND
module.perlpackage = 'VCL::Module::Provisioning::xCAT2');
DELETE FROM provisioning WHERE provisioning.moduleid IN (SELECT module.id FROM
module WHERE module.perlpackage = 'VCL::Module::Provisioning::xCAT2');
@@ -2347,13 +2347,12 @@ statgraphcache.provisioningid = (
WHERE provisioning.moduleid IN (SELECT module.id FROM module WHERE
module.perlpackage = 'VCL::Module::Provisioning::xCAT21')
AND statgraphcache.provisioningid = provisioning.id;
-DELETE FROM provisioningOSinstalltype WHERE
provisioningOSinstalltype.provisioningid IN (SELECT module.id FROM module WHERE
module.perlpackage = 'VCL::Module::Provisioning::xCAT21');
+DELETE FROM provisioningOSinstalltype WHERE
provisioningOSinstalltype.provisioningid IN (SELECT provisioning.id FROM
provisioning, module WHERE provisioning.moduleid = module.id AND
module.perlpackage = 'VCL::Module::Provisioning::xCAT21');
DELETE FROM provisioning WHERE provisioning.moduleid IN (SELECT module.id FROM
module WHERE module.perlpackage = 'VCL::Module::Provisioning::xCAT21');
DELETE FROM module WHERE module.perlpackage =
'VCL::Module::Provisioning::xCAT21';
-
--
-- Remove Procedures
--
