From d6b3d6bcf77bdfdae56fcfeecfa36c4ae17f2cbe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 26 Oct 2009 01:29:00 +0000
Subject: [PATCH] Fix: Errors in postgreSQL support
---
htdocs/admin/system/index.php | 3 ++-
htdocs/lib/databases/mssql.lib.php | 6 ++++--
htdocs/lib/databases/mysql.lib.php | 2 ++
htdocs/lib/databases/mysqli.lib.php | 2 ++
htdocs/lib/databases/pgsql.lib.php | 5 +++--
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 2fc0f60d7f8..907dd7cf093 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 6c4757ef57a..519152f4185 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 50ea5b574a8..f0cb2daabef 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 4bd95298589..25e2e85c414 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 f4286116663..507bae6dcc3 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
--
GitLab