Merge pull request #843 from jtojnar/db-optional-port

Do not require database port configuration
fossar · Feb 4, 2017 · c926c67 · c926c67
2 parents 5dc63bc + e29dd34
commit c926c67
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/daos/mysql/Database.php b/daos/mysql/Database.php
@@ -28,9 +28,19 @@ class Database {
      */
     public function __construct() {
         if(self::$initialized===false && \F3::get('db_type')=="mysql") {
+            $host = \F3::get('db_host');
+            $port = \F3::get('db_port');
+            $database = \F3::get('db_database');
+
+            if ($port) {
+                $dsn = "mysql:host=$host; port=$port; dbname=$database";
+            } else {
+                $dsn = "mysql:host=$host; dbname=$database";
+            }
+
             \F3::get('logger')->log("Establish database connection", \DEBUG);
             \F3::set('db', new \DB\SQL(
-                'mysql:host=' . \F3::get('db_host') . ';port=' . \F3::get('db_port') . ';dbname='.\F3::get('db_database'),
+                $dsn,
                 \F3::get('db_username'),
                 \F3::get('db_password'),
                 array(\PDO::MYSQL_ATTR_INIT_COMMAND=>'SET NAMES utf8mb4;')

diff --git a/daos/pgsql/Database.php b/daos/pgsql/Database.php
@@ -35,9 +35,19 @@ class Database {
      */
     public function __construct() {
         if (self::$initialized === false && \F3::get('db_type')=="pgsql") {
+            $host = \F3::get('db_host');
+            $port = \F3::get('db_port');
+            $database = \F3::get('db_database');
+
+            if ($port) {
+                $dsn = "pgsql:host=$host; port=$port; dbname=$database";
+            } else {
+                $dsn = "pgsql:host=$host; dbname=$database";
+            }
+
             \F3::get('logger')->log("Establish database connection", \DEBUG);
             \F3::set('db', new \DB\SQL(
-                'pgsql:host=' . \F3::get('db_host') . ';port=' . \F3::get('db_port') . ';dbname='.\F3::get('db_database'),
+                $dsn,
                 \F3::get('db_username'),
                 \F3::get('db_password')
             ));

diff --git a/defaults.ini b/defaults.ini
@@ -7,7 +7,7 @@ db_host=localhost
 db_database=selfoss
 db_username=root
 db_password=
-db_port=3306
+db_port=
 db_prefix=
 logger_level=ERROR
 items_perpage=50