composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enable support of databases which name either is a reserved word or contains non-alphanumeric characters (i.e. itop-production).

Browse Source 
SVN:trunk[2595]
This commit is contained in:
Denis Flaven
2013-01-31 15:14:23 +00:00
parent 59e1a64f2d
commit 626e2a1db1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/cmdbsource.class.inc.php
View File

@@ -64,7 +64,7 @@ class CMDBSource
} }
if (!empty($sSource)) if (!empty($sSource))
{ {
if (!((bool)mysqli_query(self::$m_resDBLink, "USE $sSource"))) if (!((bool)mysqli_query(self::$m_resDBLink, "USE `$sSource`")))
{ {
throw new MySQLException('Could not select DB', array('host'=>$sServer, 'user'=>$sUser, 'db_name'=>$sSource)); throw new MySQLException('Could not select DB', array('host'=>$sServer, 'user'=>$sUser, 'db_name'=>$sSource));
} }
@@ -120,7 +120,7 @@ class CMDBSource
{ {
// In case we don't have rights to enumerate the databases // In case we don't have rights to enumerate the databases
// Let's try to connect directly // Let's try to connect directly
return @((bool)mysqli_query(self::$m_resDBLink, "USE $sSource")); return @((bool)mysqli_query(self::$m_resDBLink, "USE `$sSource`"));
} }
} }
@@ -133,7 +133,7 @@ class CMDBSource
public static function SelectDB($sSource) public static function SelectDB($sSource)
{ {
if (!((bool)mysqli_query(self::$m_resDBLink, "USE $sSource"))) if (!((bool)mysqli_query(self::$m_resDBLink, "USE `$sSource`")))
{ {
throw new MySQLException('Could not select DB', array('db_name'=>$sSource)); throw new MySQLException('Could not select DB', array('db_name'=>$sSource));
} }