From 73d957f15881607cd208251a3851b74ab1329316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Sat, 15 Mar 2014 06:31:38 +0100 Subject: [PATCH] Database: factorized common properties --- htdocs/core/db/DoliDB.class.php | 4 ++-- htdocs/core/db/mssql.class.php | 26 +------------------------- htdocs/core/db/mysql.class.php | 30 +----------------------------- htdocs/core/db/mysqli.class.php | 30 +----------------------------- htdocs/core/db/pgsql.class.php | 24 +----------------------- htdocs/core/db/sqlite.class.php | 30 +----------------------------- 6 files changed, 7 insertions(+), 137 deletions(-) diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index 054e2d8f0bc..2da6ad6cdda 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -35,9 +35,9 @@ abstract class DoliDB implements Database //! Database label static $label; //! Charset used to force charset when creating database - public $forcecharset; + public $forcecharset='utf8'; //! Collate used to force collate when creating database - public $forcecollate; + public $forcecollate='utf8_general_ci'; //! Min database version static $versionmin; //! Resultset of last query diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index 6f215e9d6f0..2b7f28a7b60 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -30,8 +30,6 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php'; */ class DoliDBMssql extends DoliDB { - //! Database handler - var $db; //! Database type public $type='mssql'; //! Database label @@ -42,30 +40,8 @@ class DoliDBMssql extends DoliDB var $forcecollate='latin1_swedish_ci'; // Can't be static as it may be forced with a dynamic value //! Version min database static $versionmin=array(2000); - //! Resultset of last request + //! Resultset of last query private $_results; - //! 1 si connecte, 0 sinon - var $connected; - //! 1 si base selectionne, 0 sinon - var $database_selected; - //! Nom base selectionnee - var $database_name; - //! Nom user base - var $database_user; - //! >=1 if a transaction is opened, 0 otherwise - var $transaction_opened; - //! Derniere requete executee - var $lastquery; - //! Derniere requete executee avec echec - var $lastqueryerror; - //! Message erreur mysql - var $lasterror; - //! Message erreur mysql - var $lasterrno; - - var $ok; - var $error; - /** * Constructor. diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php index fc6a59726cb..9bea3e609d2 100644 --- a/htdocs/core/db/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -31,42 +31,14 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php'; */ class DoliDBMysql extends DoliDB { - //! Database handler - var $db; //! Database type public $type='mysql'; //! Database label static $label='MySQL'; - //! Charset used to force charset when creating database - var $forcecharset='utf8'; // latin1, utf8. Can't be static as it may be forced with a dynamic value - //! Collate used to force collate when creating database - var $forcecollate='utf8_general_ci'; // latin1_swedish_ci, utf8_general_ci. Can't be static as it may be forced with a dynamic value //! Version min database static $versionmin=array(4,1,0); - //! Resultset of last request + //! Resultset of last query private $_results; - //! 1 if connected, 0 else - var $connected; - //! 1 if database selected, 0 else - var $database_selected; - //! Database name selected - var $database_name; - //! Nom user base - var $database_user; - //! >=1 if a transaction is opened, 0 otherwise - var $transaction_opened; - //! Last executed request - var $lastquery; - //! Last failed executed request - var $lastqueryerror; - //! Message erreur mysql - var $lasterror; - //! Message erreur mysql - var $lasterrno; - - var $ok; - var $error; - /** * Constructor. diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index a8545532aba..73525be4d5b 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -31,42 +31,14 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php'; */ class DoliDBMysqli extends DoliDB { - //! Database handler - var $db; //! Database type public $type='mysqli'; //! Database label static $label='MySQL'; - //! Charset used to force charset when creating database - var $forcecharset='utf8'; // latin1, utf8. Can't be static as it may be forced with a dynamic value - //! Collate used to force collate when creating database - var $forcecollate='utf8_general_ci'; // latin1_swedish_ci, utf8_general_ci. Can't be static as it may be forced with a dynamic value //! Version min database static $versionmin=array(4,1,0); - //! Resultset of last request + //! Resultset of last query private $_results; - //! 1 if connected, 0 else - var $connected; - //! 1 if database selected, 0 else - var $database_selected; - //! Database name selected - var $database_name; - //! Nom user base - var $database_user; - //! >=1 if a transaction is opened, 0 otherwise - var $transaction_opened; - //! Last executed request - var $lastquery; - //! Last failed executed request - var $lastqueryerror; - //! Message erreur mysql - var $lasterror; - //! Message erreur mysql - var $lasterrno; - - var $ok; - var $error; - /** * Constructor. diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index 5ee421b9a50..44e8b3dc274 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -34,8 +34,6 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php'; */ class DoliDBPgsql extends DoliDB { - //! Database handler - var $db; //! Database type public $type='pgsql'; // Name of manager //! Database label @@ -46,29 +44,9 @@ class DoliDBPgsql extends DoliDB var $forcecollate=''; // Can't be static as it may be forced with a dynamic value //! Version min database static $versionmin=array(8,4,0); // Version min database - - //! Resultset of last request + //! Resultset of last query private $_results; - var $connected; // 1 si connecte, 0 sinon - var $database_selected; // 1 si base selectionne, 0 sinon - var $database_name; //! Nom base selectionnee - var $database_user; //! Nom user base - //! >=1 if a transaction is opened, 0 otherwise - var $transaction_opened; - var $lastquery; - // Saved last error - var $lastqueryerror; - var $lasterror; - var $lasterrno; - - var $unescapeslashquot=0; // By default we do not force the unescape of \'. This is used only to process sql with mysql escaped data. - var $standard_conforming_strings=1; // Database has option standard_conforming_strings to on - - var $ok; - var $error; - - /** * Constructor. * This create an opened connexion to a database server and eventually to a database diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index 0bcc3308c1d..ab6582affc5 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -31,42 +31,14 @@ require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php'; */ class DoliDBSqlite extends DoliDB { - //! Database handler - var $db; //! Database type public $type='sqlite'; //! Database label static $label='PDO Sqlite'; - //! Charset used to force charset when creating database - var $forcecharset='utf8'; // latin1, utf8. Can't be static as it may be forced with a dynamic value - //! Collate used to force collate when creating database - var $forcecollate='utf8_general_ci'; // latin1_swedish_ci, utf8_general_ci. Can't be static as it may be forced with a dynamic value //! Version min database static $versionmin=array(3,0,0); - //! Resultset of last request + //! Resultset of last query private $_results; - //! 1 if connected, 0 else - var $connected; - //! 1 if database selected, 0 else - var $database_selected; - //! Database name selected - var $database_name; - //! Nom user base - var $database_user; - //! >=1 if a transaction is opened, 0 otherwise - var $transaction_opened; - //! Last executed request - var $lastquery; - //! Last failed executed request - var $lastqueryerror; - //! Message erreur mysql - var $lasterror; - //! Message erreur mysql - var $lasterrno; - - var $ok; - var $error; - /** * Constructor.