etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 9722: db upgrade - when upgrade user_statistics, skip ExternalFirewall/ExternalLb records 

status 9722: resolved fixed
This commit is contained in:
alena 2011-05-03 18:09:42 -07:00
parent 33b3cb2c1a
commit 2e0bba7926
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/upgrade/dao/Upgrade222to224.java
View File

@ -255,7 +255,7 @@ public class Upgrade222to224 implements DbUpgrade {
private void updateUserStatsWithNetwork(Connection conn) {
try {
PreparedStatement pstmt = conn.prepareStatement("SELECT id, device_id FROM user_statistics WHERE network_id=0 or network_id is NULL");
PreparedStatement pstmt = conn.prepareStatement("SELECT id, device_id FROM user_statistics WHERE network_id=0 or network_id is NULL and public_ip_address is NULL");
ResultSet rs = pstmt.executeQuery();
while (rs.next()) {
@ -284,7 +284,7 @@ public class Upgrade222to224 implements DbUpgrade {
Long networkId = rs2.getLong(1);
if (networkId != null) {
pstmt = conn.prepareStatement("UPDATE user_statistics SET network_id=? where id=?");
pstmt = conn.prepareStatement("UPDATE user_statistics SET network_id=?, device_type='DomainRouter' where id=?");
pstmt.setLong(1, networkId);
pstmt.setLong(2, id);
pstmt.executeUpdate();