B #5081: oned monitoring API bug with PostgreSQL (#5087)

Signed-off-by: Romanov Andrey Grigorievich <[email protected]> Co-authored-by: Romanov Andrey Grigorievich <[email protected]> (cherry picked from commit c9d360d)
OpenNebula · Sep 24, 2020 · dc09fa7 · dc09fa7
1 parent 0e4b9a6
commit dc09fa7
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/vm/VirtualMachinePool.cc b/src/vm/VirtualMachinePool.cc
@@ -332,12 +332,11 @@ int VirtualMachinePool::dump_monitoring(
 
     cmd << "SELECT " << one_db::vm_monitor_table << ".body FROM "
         << one_db::vm_monitor_table
-        << " INNER JOIN " << one_db::vm_table
-        << " WHERE vmid = oid";
+        << " INNER JOIN " << one_db::vm_table    << " ON vmid = oid";
 
     if ( !where.empty() )
     {
-        cmd << " AND " << where;
+        cmd << " WHERE " << where;
     }
 
     cmd << " ORDER BY vmid, " << one_db::vm_monitor_table << ".last_poll;";