Make PDO parameters available publicly

inetprocess · Jan 25, 2018 · 1e9f15e · 1e9f15e
1 parent 1b0c680
commit 1e9f15e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.2.10
+----
+* Make PDO parameters available publicly
+
 1.2.9
 ----
 * Allow to specify the operator in where clause for Bean::searchBeans

diff --git a/src/Database/SugarPDO.php b/src/Database/SugarPDO.php
@@ -29,7 +29,7 @@ class SugarPDO extends PDO
     public function __construct(Application $sugarApp, $options = array())
     {
         $this->sugarApp = $sugarApp;
-        $params = $this->getPdoParams();
+        $params = self::getPdoParams($this->getApplication());
         parent::__construct($params['dsn'], $params['username'], $params['password'], $options);
     }
 
@@ -38,15 +38,15 @@ public function getApplication()
         return $this->sugarApp;
     }
 
-    protected function getPdoParams()
+    public static function getPdoParams(Application $sugarApp)
     {
-        $sugar_config = $this->getApplication()->getSugarConfig();
+        $sugar_config = $sugarApp->getSugarConfig();
         if (!array_key_exists('dbconfig', $sugar_config)
             || !is_array($sugar_config['dbconfig'])
         ) {
             throw new SugarException('Configuration parameter "db_config" is not an array');
         }
-        $dbconfig = $this->normalizeDbParams($sugar_config['dbconfig']);
+        $dbconfig = self::normalizeDbParams($sugar_config['dbconfig']);
 
         $params = array(
             'host' => $dbconfig['db_host_name'],
@@ -73,7 +73,7 @@ protected function getPdoParams()
      *
      * @throws SugarException if some required options are not present.
      */
-    public function normalizeDbParams($params)
+    public static function normalizeDbParams($params)
     {
         $defaults = array(
             'db_password' => '',