mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-03 04:29:28 +01:00
1) fixed not working detection of a connection to the db (postgres)
2) fixed detection of table-names with mixed case, which get returned in lowercase
This commit is contained in:
parent
c267a875de
commit
3b8febb076
@ -264,7 +264,7 @@
|
|||||||
}
|
}
|
||||||
$GLOBALS['egw_setup']->set_table_names();
|
$GLOBALS['egw_setup']->set_table_names();
|
||||||
|
|
||||||
if (!$GLOBALS['egw_setup']->db->Link_ID)
|
if (!$GLOBALS['egw_setup']->db->Link_ID || !$GLOBALS['egw_setup']->db->Link_ID->_connectionID)
|
||||||
{
|
{
|
||||||
$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Create Database)';
|
$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Create Database)';
|
||||||
return 1;
|
return 1;
|
||||||
@ -364,12 +364,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/**
|
||||||
@function check_app_tables
|
* Verify that all of an app's tables exist in the db
|
||||||
@abstract Verify that all of an app's tables exist in the db
|
* @param $appname
|
||||||
@param $appname
|
* @param $any optional, set to True to see if any of the apps tables are installed
|
||||||
@param $any optional, set to True to see if any of the apps tables are installed
|
*/
|
||||||
*/
|
|
||||||
function check_app_tables($appname,$any=False)
|
function check_app_tables($appname,$any=False)
|
||||||
{
|
{
|
||||||
$none = 0;
|
$none = 0;
|
||||||
@ -392,7 +391,7 @@
|
|||||||
{
|
{
|
||||||
echo '<br>check_app_tables(): Checking: ' . $appname . ',table: ' . $val;
|
echo '<br>check_app_tables(): Checking: ' . $appname . ',table: ' . $val;
|
||||||
}
|
}
|
||||||
if(!in_array($val,$tables))
|
if(!in_array($val,$tables) && !in_array(strtolower($val),$tables)) // names in tables might be lowercase
|
||||||
{
|
{
|
||||||
if($GLOBALS['DEBUG'])
|
if($GLOBALS['DEBUG'])
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user