Merge pull request #343 from biblibre/Issue_145_Followup_DB_Connections

Issue 145 [Follow-up]: Use singleton for database connection
coral-erm · Feb 22, 2018 · 10ac2f9 · 10ac2f9
2 parents f709058 + 4f134fd
commit 10ac2f9
Show file tree

Hide file tree

Showing 17 changed files with 99 additions and 11 deletions.
diff --git a/auth/admin/classes/common/DBService.php b/auth/admin/classes/common/DBService.php
@@ -22,6 +22,20 @@ class DBService extends Object {
 	protected $db;
 	protected $config;
 	protected $error;
+	private static $_instance; //The single instance
+
+
+/*
+	Get an instance of the Database
+	@return Instance
+	*/
+	public static function getInstance() {
+		if(!self::$_instance) { // If no instance then make one
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
 
 	protected function init(NamedArguments $arguments) {
 		parent::init($arguments);

diff --git a/auth/admin/classes/common/DatabaseObject.php b/auth/admin/classes/common/DatabaseObject.php
@@ -52,7 +52,7 @@ protected function init(NamedArguments $arguments) {
 		$this->primaryKeyName = $arguments->primaryKeyName;
 
 		$this->primaryKey = $arguments->primaryKey;
-		$this->db = new DBService;
+		$this->db = DBService::getInstance();
 		$this->defineRelationships();
 		//$this->defineAttributes();
 		$this->overridePrimaryKeyName();

diff --git a/licensing/admin/classes/common/DBService.php b/licensing/admin/classes/common/DBService.php
@@ -23,6 +23,20 @@ class DBService extends Object {
 	protected $db;
 	protected $config;
 	protected $error;
+	private static $_instance; //The single instance
+
+
+/*
+	Get an instance of the Database
+	@return Instance
+	*/
+	public static function getInstance() {
+		if(!self::$_instance) { // If no instance then make one
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
 
 	protected function init(NamedArguments $arguments) {
 		parent::init($arguments);

diff --git a/licensing/admin/classes/common/DatabaseObject.php b/licensing/admin/classes/common/DatabaseObject.php
@@ -52,7 +52,7 @@ protected function init(NamedArguments $arguments) {
 		$this->primaryKeyName = $arguments->primaryKeyName;
 
 		$this->primaryKey = $arguments->primaryKey;
-		$this->db = new DBService;
+		$this->db = DBService::getInstance();
 		$this->defineRelationships();
 		//$this->defineAttributes();
 		$this->overridePrimaryKeyName();

diff --git a/licensing/admin/classes/common/Utility.php b/licensing/admin/classes/common/Utility.php
@@ -98,7 +98,7 @@ public function fixLicenseFormEnter($editLicenseID){
 		if ($editLicenseID == ""){
 			//need to get the most recent added license since it will have been added but we didn''t get the resonse of the new license ID
 			//since this will have happened instantly we can be safe to assume this is the correct record
-			$this->db = new DBService;
+			$this->db = DBService::getInstance();
 
 			$result = $this->db->processQuery("select max(licenseID) max_licenseID from License;", 'assoc');
 

diff --git a/management/admin/classes/common/DBService.php b/management/admin/classes/common/DBService.php
@@ -23,6 +23,21 @@ class DBService extends Object {
 	protected $db;
 	protected $config;
 	protected $error;
+	private static $_instance; //The single instance
+
+
+/*
+	Get an instance of the Database
+	@return Instance
+	*/
+	public static function getInstance() {
+		if(!self::$_instance) { // If no instance then make one
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
 
 	protected function init(NamedArguments $arguments) {
 		parent::init($arguments);

diff --git a/management/admin/classes/common/DatabaseObject.php b/management/admin/classes/common/DatabaseObject.php
@@ -52,7 +52,7 @@ protected function init(NamedArguments $arguments) {
 		$this->primaryKeyName = $arguments->primaryKeyName;
 
 		$this->primaryKey = $arguments->primaryKey;
-		$this->db = new DBService;
+		$this->db = DBService::getInstance();
 		$this->defineRelationships();
 		//$this->defineAttributes();
 		$this->overridePrimaryKeyName();

diff --git a/management/admin/classes/common/Utility.php b/management/admin/classes/common/Utility.php
@@ -94,7 +94,7 @@ public function fixLicenseFormEnter($editLicenseID){
 		if ($editLicenseID == ""){
 			//need to get the most recent added license since it will have been added but we didn''t get the resonse of the new license ID
 			//since this will have happened instantly we can be safe to assume this is the correct record
-			$this->db = new DBService;
+			$this->db = DBService::getInstance();
 
 			$result = $this->db->processQuery("select max(licenseID) max_licenseID from License;", 'assoc');
 

diff --git a/organizations/admin/classes/common/DBService.php b/organizations/admin/classes/common/DBService.php
@@ -22,6 +22,21 @@ class DBService extends Object {
 	protected $db;
 	protected $config;
 	protected $error;
+	private static $_instance; //The single instance
+
+
+/*
+	Get an instance of the Database
+	@return Instance
+	*/
+	public static function getInstance() {
+		if(!self::$_instance) { // If no instance then make one
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
 
 	protected function init(NamedArguments $arguments) {
 		parent::init($arguments);

diff --git a/organizations/admin/classes/common/DatabaseObject.php b/organizations/admin/classes/common/DatabaseObject.php
@@ -45,7 +45,7 @@ protected function init(NamedArguments $arguments) {
 		$this->primaryKeyName = $arguments->primaryKeyName;
 
 		$this->primaryKey = $arguments->primaryKey;
-		$this->db = new DBService;
+		$this->db = DBService::getInstance();
 
 		$arguments->setDefaultValueForArgumentName('dbName',$this->db->config->database->name);
 		$this->dbName = $arguments->dbName;

diff --git a/reports/admin/classes/common/DBService.php b/reports/admin/classes/common/DBService.php
@@ -18,6 +18,21 @@
 class DBService {
 	protected static $db = null;
 	protected $error;
+	private static $_instance; //The single instance
+
+
+/*
+	Get an instance of the Database
+	@return Instance
+	*/
+	public static function getInstance() {
+		if(!self::$_instance) { // If no instance then make one
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
 	public function __construct($dbname = null){
 		Config::init();
 		if (!self::$db && !(self::$db = new mysqli(Config::$database->host, Config::$database->username, Config::$database->password))){

diff --git a/reports/admin/classes/domain/ParameterFactory.php b/reports/admin/classes/domain/ParameterFactory.php
@@ -14,7 +14,7 @@
 class ParameterFactory {
     public static function makeParam($reportID,$reportParameterID) {
         $parm = null;
-        $db = new DBService();
+        $db = DBService::getInstance();
         $result = $db
             ->query("SELECT rp.*, rpm.parentReportParameterID
             FROM ReportParameter rp, ReportParameterMap rpm

diff --git a/reports/admin/classes/report/Report.php b/reports/admin/classes/report/Report.php
@@ -36,7 +36,7 @@ public function applyDateRange(array $dateRange) {
     }
 
     public function __construct($id){
-        $this->db = new DBService();
+        $this->db = DBService::getInstance();
         $result = $this->db
             ->query("SELECT reportName, reportDatabaseName FROM Report WHERE reportID = '$id' LIMIT 1")
             ->fetchRow(MYSQLI_ASSOC);

diff --git a/reports/index.php b/reports/index.php
@@ -101,7 +101,7 @@
 <?php
 // get all reports for output in drop down
 
-$db = new DBService();
+$db = DBService::getInstance();
 foreach ( $db->query("SELECT reportID, reportName FROM Report ORDER BY 2, 1")->fetchRows(MYSQLI_ASSOC) as $report ){
 	echo "<option value='" . $report['reportID'] . "' ";
 	if (isset($report['reportID']) && isset($_GET['reportID']) && $report['reportID'] === $_GET['reportID']){

diff --git a/usage/admin/classes/common/DBService.php b/usage/admin/classes/common/DBService.php
@@ -22,6 +22,21 @@ class DBService extends Object {
 	protected $db;
 	protected $config;
 	protected $error;
+	private static $_instance; //The single instance
+
+
+/*
+	Get an instance of the Database
+	@return Instance
+	*/
+	public static function getInstance() {
+		if(!self::$_instance) { // If no instance then make one
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
 
 	protected function init(NamedArguments $arguments) {
 		parent::init($arguments);

diff --git a/usage/admin/classes/common/DatabaseObject.php b/usage/admin/classes/common/DatabaseObject.php
@@ -46,7 +46,7 @@ protected function init(NamedArguments $arguments) {
 		$this->primaryKey = $arguments->primaryKey;
 
         $arguments->setDefaultValueForArgumentName('db',false);
-        $this->db = $arguments->db ? $arguments->db : new DBService;
+		$this->db = $arguments->db ? $arguments->db : DBService::getInstance();
 
 		$this->defineAttributes();
 		$this->overridePrimaryKeyName();

diff --git a/usage/admin/classes/domain/Platform.php b/usage/admin/classes/domain/Platform.php
@@ -359,7 +359,7 @@ public function getPublisherPlatforms(){
 			$object = new PublisherPlatform(new NamedArguments(array('primaryKey' => $result['publisherPlatformID'])));
 			array_push($objects, $object);
 		}else{
-            $db = new DBService;
+            $db = DBService::getInstance();
 			foreach ($result as $row) {
 				$object = new PublisherPlatform(new NamedArguments(array('primaryKey' => $row['publisherPlatformID'],'db'=>$db)));
 				array_push($objects, $object);