From 65392fe87f816f1574ec7d7ff79b05affced189f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 16 Sep 2011 18:11:15 +0200 Subject: [PATCH] Bug #812: Fix onedb sql syntax to work with mysql(cherry picked from commit 3e8bc8046d763bc53f568d672240050a1be0824b) --- src/onedb/2.0_to_2.9.80.rb | 4 ++-- src/onedb/onedb_backend.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/onedb/2.0_to_2.9.80.rb b/src/onedb/2.0_to_2.9.80.rb index 20d47aeb62..a3e9afe400 100644 --- a/src/onedb/2.0_to_2.9.80.rb +++ b/src/onedb/2.0_to_2.9.80.rb @@ -257,8 +257,8 @@ module Migrator public = row[:public] total_leases = 0 - @db.fetch("SELECT COUNT (ip) FROM old_leases WHERE (oid=#{oid} AND used=1)") do |r| - total_leases = r[:"COUNT (ip)"] + @db.fetch("SELECT COUNT(ip) FROM old_leases WHERE (oid=#{oid} AND used=1)") do |r| + total_leases = r[:"COUNT(ip)"] end diff --git a/src/onedb/onedb_backend.rb b/src/onedb/onedb_backend.rb index cfe079052d..71cbda3324 100644 --- a/src/onedb/onedb_backend.rb +++ b/src/onedb/onedb_backend.rb @@ -177,7 +177,7 @@ class BackEndMySQL < OneDBBacKEnd end create_cmd = mysql_cmd+"-e 'CREATE DATABASE IF NOT EXISTS #{@db_name};'" - rc = system(create_cnd) + rc = system(create_cmd) if !rc raise "Error creating MySQL DB #{@db_name} at #{@server}." end