Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

Browse Source
This commit is contained in:
Frédéric FRANCE
2019-01-27 23:23:38 +01:00
parent 13f37204f6 ecc30b8ffe
commit b10558bacd
759 changed files with 4357 additions and 4160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/system/database-tables.php
View File

@@ -56,17 +56,17 @@ if (preg_match('/mysql/i', $conf->db->type))
$sql = "SHOW TABLE STATUS";
$base=1;
}
else if ($conf->db->type == 'pgsql')
elseif ($conf->db->type == 'pgsql')
{
$sql = "SELECT conname, contype FROM pg_constraint;";
$base=2;
}
else if ($conf->db->type == 'mssql')
elseif ($conf->db->type == 'mssql')
{
//$sqls[0] = "";
//$base=3;
}
else if ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
elseif ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
{
//$sql = "SELECT name, type FROM sqlite_master";
$base = 4;