Updated to 1.1.4 version

Author: josantonius

CHANGELOG.md

@@ -1,5 +1,29 @@
 # CHANGELOG
 
+## 1.1.4 - 2017-05-16
+
+* Added `Eliasis\Model\Model->_getDatabaseInstance` method.
+
+* Added compatibility with Eliasis Framework library inside getConnection method. If it exists, it will get the connection to the database.
+
+* Will get the connection parameters from Eliasis Framework configuration files. It should have the following structure:
+
+'db' => [
+
+    'identifier' => [
+        'id'         => 'identifier',
+        'prefix'     => 'identifier_',
+        'provider'   => 'PDOprovider',
+        'host'       => 'localhost',
+        'user'       => 'db_user',
+        'name'       => 'db_name',
+        'password'   => 'db_password',
+        'settings'   => ['charset' => 'utf8'],
+    ],
+]
+
+* Eliasis Framework url: https://github.com/Eliasis-Framework/Eliasis
+
 ## 1.1.3 - 2017-05-14
 * Singleton pattern was added to create a single connection per database.
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name":        "josantonius/database",
-    "version":     "1.1.3",
+    "version":     "1.1.4",
     "type":        "library",
     "description": "Library for SQL database management to be used by several providers at the same time.",
     "keywords": [

src/Database.php

@@ -215,17 +215,17 @@ class Database {
      *
      * @param string $provider            → name of provider class
      * @param string $host                → database host
-     * @param string $dbUser              → database user
-     * @param string $dbName              → database name
-     * @param string $pass                → database password
+     * @param string $user                → database user
+     * @param string $name                → database name
+     * @param string $password            → database password
      * @param array  $settings            → database options
      * @param array  $settings['port']    → database port
      * @param array  $settings['charset'] → database charset
      *
      * @throws DBException → if the provider class specified does not exist
      * @throws DBException → if could not connect to provider
      */
-    private function __construct($provider, $host, $dbUser, $dbName, $pass, $settings) {
+    private function __construct($provider, $host, $user, $name, $password, $settings) {
 
         $providerClass = 'Josantonius\\Database\\Provider\\' . $provider;
 
@@ -238,7 +238,7 @@ private function __construct($provider, $host, $dbUser, $dbName, $pass, $setting
 
         $this->_provider = new $providerClass;
 
-        $this->_provider->connect($host, $dbUser, $dbName, $pass, $settings);
+        $this->_provider->connect($host, $user, $name, $password, $settings);
 
         if (!$this->_provider->isConnected()) {
 
@@ -256,35 +256,45 @@ private function __construct($provider, $host, $dbUser, $dbName, $pass, $setting
      *
      * @since 1.0.0
      *
-     * @param string $databaseID          → identifying name for the database
+     * @param string $id                  → identifying name for the database
      * @param string $provider            → name of provider class
      * @param string $host                → database host
-     * @param string $dbUser              → database user
-     * @param string $dbName              → database name
-     * @param string $pass                → database password
+     * @param string $user                → database user
+     * @param string $name                → database name
+     * @param string $password            → database password
      * @param array  $settings            → database options
      * @param array  $settings['port']    → database port
      * @param array  $settings['charset'] → database charset
      * 
      * @return object → object with the connection
      */
-    public static function getConnection($databaseID, $provider = null, $host = null, $dbUser = null, $dbName = null, $pass = null, $settings = null) {
+    public static function getConnection($id, $provider = null, $host = null, $user = null, $name = null, $password = null, $settings = null) {
 
-        if (isset(self::$_conn[$databaseID])) {
+        if (isset(self::$_conn[$id])) {
 
-            return self::$_conn[$databaseID];
+            return self::$_conn[$id];
         }
 
-        self::$_conn[$databaseID] = new Database(
+        if (class_exists($App = 'Eliasis\\App\\App')) {
+
+            $provider = $provider ? $provider : $App::db($id, 'provider');
+            $host     = $host     ? $host     : $App::db($id, 'host'); 
+            $user     = $user     ? $user     : $App::db($id, 'user');
+            $name     = $name     ? $name     : $App::db($id, 'name');
+            $password = $password ? $password : $App::db($id, 'password');
+            $settings = $settings ? $settings : $App::db($id, 'settings');
+        }
+
+        self::$_conn[$id] = new Database(
             $provider, 
             $host, 
-            $dbUser, 
-            $dbName,
-            $pass,
+            $user, 
+            $name,
+            $password,
             $settings
         );
 
-        return self::$_conn[$databaseID];
+        return self::$_conn[$id];
     }
 
     /**