diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 2fc0f60d7f818691e57724f4fe7c222fd59886f9..907dd7cf0936a22a6e1b47df4b21baed447c2dde 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -84,8 +84,9 @@ print "<br>\n"; // Database print '<table class="noborder" width="100%">'; print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Database")."</td></tr>\n"; +$dblabel=$db->label; $dbversion=$db->getVersion(); -print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>" .$dbversion. "</td></tr>\n"; +print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>" .$dblabel." ".$dbversion."</td></tr>\n"; print '</table>'; print '<br>'; diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php index 6c4757ef57a947d53e4c687bcd99ba3a3c3dbbe7..519152f4185a6cd5a164977465c4eb6296bcc3ae 100644 --- a/htdocs/lib/databases/mssql.lib.php +++ b/htdocs/lib/databases/mssql.lib.php @@ -37,10 +37,12 @@ if (! defined('ADODB_DATE_VERSION')) include_once(DOL_DOCUMENT_ROOT."/includes/a */ class DoliDb { - //! Handler de base + //! Database handler var $db; - //! Nom du gestionnaire + //! Database type var $type='mssql'; + //! Database label + var $label='MSSQL'; //! Charset used to force charset when creating database var $forcecharset='latin1'; //! Collate used to force collate when creating database diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index 50ea5b574a8647bb459fedb335cd304650a06db3..f0cb2daabef012f5a71a3cce288f627d628c8355 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -40,6 +40,8 @@ class DoliDb var $db; //! Database type var $type='mysql'; + //! Database label + var $label='MySQL'; //! Charset used to force charset when creating database var $forcecharset='utf8'; // latin1, utf8 //! Collate used to force collate when creating database diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index 4bd95298589ead5cd0564d84a080583a54f1dab1..25e2e85c414037ecc8d4148f3bfb44290386bbbb 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -41,6 +41,8 @@ class DoliDb var $db; //! Database type var $type='mysqli'; + //! Database label + var $label='MySQL'; //! Charset used to force charset when creating database var $forcecharset='utf8'; // latin1, utf8 //! Collate used to force collate when creating database diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index f42861166636d08d02e42dd575c241b703db5905..507bae6dcc35cd614bb616892d813e872dacb661 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -37,8 +37,9 @@ if (! defined('ADODB_DATE_VERSION')) include_once(DOL_DOCUMENT_ROOT."/includes/a */ class DoliDb { - var $db; // Handler de base - var $type='pgsql'; // Nom du gestionnaire + var $db; // Database handler + var $type='pgsql'; // Name of manager + var $label='PostgreSQL'; // Label of manager //! Charset var $forcecharset='latin1'; var $versionmin=array(8,1,0); // Version min database