From 56c364d93fb9629fcf33fac4a721de7db34d498a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 31 Aug 2016 12:06:38 +0200 Subject: [PATCH] Bug #4744: Remove the need for a separate patch for upgrades from version < 4.14 --- src/onedb/local/4.11.80_to_4.13.80.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/onedb/local/4.11.80_to_4.13.80.rb b/src/onedb/local/4.11.80_to_4.13.80.rb index c16101a4ad..d0bce8518d 100644 --- a/src/onedb/local/4.11.80_to_4.13.80.rb +++ b/src/onedb/local/4.11.80_to_4.13.80.rb @@ -97,7 +97,8 @@ module Migrator log_time() @db.transaction do - @db.fetch("SELECT * FROM old_vm_pool WHERE state<>6") do |row| + #@db.fetch("SELECT * FROM old_vm_pool WHERE state<>6") do |row| + @db.fetch("SELECT * FROM old_vm_pool") do |row| doc = Nokogiri::XML(row[:body],nil,NOKOGIRI_ENCODING){|c| c.default_xml.noblanks} update_monitoring(doc.root.at_xpath("/VM")) @@ -132,7 +133,8 @@ module Migrator log_time() @db.transaction do - @db.fetch("SELECT * FROM old_history WHERE etime=0") do |row| + #@db.fetch("SELECT * FROM old_history WHERE etime=0") do |row| + @db.fetch("SELECT * FROM old_history") do |row| doc = Nokogiri::XML(row[:body],nil,NOKOGIRI_ENCODING){|c| c.default_xml.noblanks} elem = doc.root.at_xpath("/HISTORY/VM")