shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-10 01:17:40 +03:00
Code Releases Wiki Activity

F #5005: Fix migrator bug. Make use of mysql2 in SQL backend

Browse Source
This commit is contained in:
Ruben S. Montero 2017-02-15 14:45:06 +01:00
parent f0183fef2e
commit 32576f61fc
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/onedb/local/4.90.0_to_5.3.80.rb
View File

@ -101,7 +101,7 @@ module Migrator
############################################################################
def feature_5005
@db.run "ALTER TABLE vm_pool RENAME TO old_vm_pool;"
@db.run host_pool_schema()
@db.run vm_pool_schema()
@db.transaction do
@db.fetch("SELECT * FROM old_vm_pool") do |row|
@ -110,7 +110,7 @@ module Migrator
c.default_xml.noblanks
}
doc.root.xpath(HISTORY_RECORDS/HISTORY).each do |h|
doc.root.xpath("HISTORY_RECORDS/HISTORY").each do |h|
reason = h.xpath("REASON")
reason.unlink if !reason.nil?
@ -127,8 +127,8 @@ module Migrator
@db[:vm_pool].insert(row)
end
end
end
@db.run "DROP TABLE old_vm_pool;"
end
end

6
src/onedb/onedb.rb
View File

@ -35,10 +35,10 @@ class OneDB
@backend = BackEndSQLite.new(ops[:sqlite])
elsif ops[:backend] == :mysql
begin
require 'mysql'
require 'mysql2'
rescue LoadError
STDERR.puts "Ruby gem mysql is needed for this operation:"
STDERR.puts " $ sudo gem install mysql"
STDERR.puts "Ruby gem mysql2 is needed for this operation:"
STDERR.puts " $ sudo gem install mysql2"
exit -1
end

2
src/onedb/onedb_backend.rb
View File

@ -272,7 +272,7 @@ class BackEndMySQL < OneDBBacKEnd
def connect_db
passwd = CGI.escape(@passwd)
endpoint = "mysql://#{@user}:#{passwd}@#{@server}:#{@port}/#{@db_name}"
endpoint = "mysql2://#{@user}:#{passwd}@#{@server}:#{@port}/#{@db_name}"
begin
@db = Sequel.connect(endpoint)