Merge pull request discourse#4124 from karies/PhpBBPort

Make MySQL port number configurable.
danskdynamit · Mar 30, 2016 · a00ba1d · a00ba1d
2 parents edbc7c4 + 4afa032
commit a00ba1d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/script/import_scripts/phpbb3/database/database.rb b/script/import_scripts/phpbb3/database/database.rb
@@ -34,6 +34,7 @@ def create_database
     def create_database_client
       Mysql2::Client.new(
         host: @database_settings.host,
+        port: @database_settings.port,
         username: @database_settings.username,
         password: @database_settings.password,
         database: @database_settings.schema

diff --git a/script/import_scripts/phpbb3/settings.yml b/script/import_scripts/phpbb3/settings.yml
@@ -3,6 +3,7 @@
 database:
   type: MySQL # currently only MySQL is supported - more to come soon
   host: localhost
+  port: 3306
   username: root
   password:
   schema: phpbb

diff --git a/script/import_scripts/phpbb3/support/settings.rb b/script/import_scripts/phpbb3/support/settings.rb
@@ -61,6 +61,7 @@ def initialize(yaml)
   class DatabaseSettings
     attr_reader :type
     attr_reader :host
+    attr_reader :port
     attr_reader :username
     attr_reader :password
     attr_reader :schema
@@ -70,6 +71,7 @@ class DatabaseSettings
     def initialize(yaml)
       @type = yaml['type']
       @host = yaml['host']
+      @port = yaml['port']
       @username = yaml['username']
       @password = yaml['password']
       @schema = yaml['schema']