Merge pull request #2 from xavierleune/feature/1-port-bdd-connection

Fix issue #1 allow user to specify port for bdd connection
syrm · Jul 22, 2014 · 2edcc97 · 2edcc97
2 parents c1d1bd2 + 5c3b825
commit 2edcc97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Adapter/Database.php b/Adapter/Database.php
@@ -5,7 +5,7 @@
 interface Database
 {
 
-    public function connect($hostname, $username, $password);
+    public function connect($hostname, $username, $password, $port);
     public function setDatabase($database);
     public function prepare($sql);
     public function escape($value);

diff --git a/Adapter/Driver/Mysqli/Mysqli.php b/Adapter/Driver/Mysqli/Mysqli.php
@@ -8,10 +8,10 @@ class Mysqli implements \fastorm\Adapter\Database
     protected $connection;
 
 
-    public function connect($hostname, $username, $password)
+    public function connect($hostname, $username, $password, $port)
     {
 
-        $this->connection = new \mysqli($hostname, $username, $password);
+        $this->connection = new \mysqli($hostname, $username, $password, null, $port);
 
         if (mysqli_connect_error()) {
             throw new \Exception('Connect Error (' . mysqli_connect_errno() . ') '. mysqli_connect_error());

diff --git a/Entity/Manager.php b/Entity/Manager.php
@@ -118,7 +118,7 @@ public function doQuery($className, $queryString, $params = array())
             }
 
             $this->connectionList[$metadata->getConnection()] = $databaseHandler;
-            $databaseHandler->connect($connection['host'], $connection['user'], $connection['password']);
+            $databaseHandler->connect($connection['host'], $connection['user'], $connection['password'], $connection['port']);
             $databaseHandler->setDatabase($metadata->getDatabase());
         } else {
             $databaseHandler = $this->connectionList[$metadata->getConnection()];