Adjust port fix so it's not a breaking change

Author: shaunagm

parsons/databases/mysql/mysql.py

@@ -36,19 +36,23 @@ class MySQL(DatabaseConnector, MySQLCreateTable, Alchemy):
         db: str
             Required if env variable ``MYSQL_DB`` not populated
         port: int
-            Can be set by env variable ``MYSQL_PORT`` or argument.
+            If omitted or ``None``, uses ``MYSQL_PORT`` when set, otherwise 3306. If passed
+            (including ``3306``), the argument takes precedence over ``MYSQL_PORT``.
 
     """
 
-    def __init__(self, host=None, username=None, password=None, db=None, port=3306):
+    def __init__(self, host=None, username=None, password=None, db=None, port=None):
         super().__init__()
 
         self.username = check_env.check("MYSQL_USERNAME", username)
         self.password = check_env.check("MYSQL_PASSWORD", password)
         self.host = check_env.check("MYSQL_HOST", host)
         self.db = check_env.check("MYSQL_DB", db)
-        env_port = check_env.check("MYSQL_PORT", None, optional=True)
-        self.port = int(env_port) if env_port is not None else port
+        if port is not None:
+            self.port = port
+        else:
+            env_port = check_env.check("MYSQL_PORT", None, optional=True)
+            self.port = int(env_port) if env_port is not None else 3306
 
     @contextmanager
     def connection(self):

parsons/databases/postgres/postgres.py

@@ -27,21 +27,25 @@ class Postgres(PostgresCore, Alchemy, DatabaseConnector):
         db: str
             Required if env variable ``PGDATABASE`` not populated
         port: int
-            Required if env variable ``PGPORT`` not populated.
+            If omitted or ``None``, uses ``PGPORT`` when set, otherwise 5432. If passed
+            (including ``5432``), the argument takes precedence over ``PGPORT``.
         timeout: int
             Seconds to timeout if connection not established.
 
     """
 
-    def __init__(self, username=None, password=None, host=None, db=None, port=5432, timeout=10):
+    def __init__(self, username=None, password=None, host=None, db=None, port=None, timeout=10):
         super().__init__()
 
         self.username = check_env.check("PGUSER", username, optional=True)
         self.password = check_env.check("PGPASSWORD", password, optional=True)
         self.host = check_env.check("PGHOST", host, optional=True)
         self.db = check_env.check("PGDATABASE", db, optional=True)
-        env_port = check_env.check("PGPORT", None, optional=True)
-        self.port = int(env_port) if env_port is not None else port
+        if port is not None:
+            self.port = port
+        else:
+            env_port = check_env.check("PGPORT", None, optional=True)
+            self.port = int(env_port) if env_port is not None else 5432
 
         # Check if there is a pgpass file. Psycopg2 will search for this file first when
         # creating a connection.

test/test_mysql/test_mysql.py

@@ -18,9 +18,10 @@
 
 class TestMySQLPortPrecedence(unittest.TestCase):
     """
-    Port resolution for MySQL: MYSQL_PORT env overrides the default port kwarg.
+    Port resolution for MySQL:
 
-    When MYSQL_PORT is unset, the port kwarg is used (default 3306 if omitted).
+    - ``MYSQL_PORT`` is used when ``port`` is omitted (or ``port=None``).
+    - An explicit ``port=`` argument wins over ``MYSQL_PORT`` (including ``port=3306``).
     """
 
     def _env_without_mysql_port(self):
@@ -41,10 +42,15 @@ def test_explicit_port_kwarg_when_mysql_port_unset(self):
             mysql = MySQL(**_MYSQL_CONN_KWARGS, port=8888)
             assert mysql.port == 8888
 
-    def test_mysql_port_env_overrides_explicit_port_kwarg(self):
+    def test_explicit_port_kwarg_overrides_mysql_port_env(self):
         with mock.patch.dict(os.environ, {"MYSQL_PORT": "3307"}, clear=False):
             mysql = MySQL(**_MYSQL_CONN_KWARGS, port=8888)
-            assert mysql.port == 3307
+            assert mysql.port == 8888
+
+    def test_explicit_default_port_kwarg_ignores_mysql_port_env(self):
+        with mock.patch.dict(os.environ, {"MYSQL_PORT": "3307"}, clear=False):
+            mysql = MySQL(**_MYSQL_CONN_KWARGS, port=3306)
+            assert mysql.port == 3306
 
 
 # These tests interact directly with the MySQL database. To run, set env variable "LIVE_TEST=True"

test/test_postgres/test_postgres.py

@@ -157,9 +157,10 @@ def test_create_statement(self):
 
 class TestPostgresPortPrecedence(unittest.TestCase):
     """
-    Port resolution for Postgres: PGPORT env overrides the default port kwarg.
+    Port resolution for Postgres:
 
-    When PGPORT is unset, the port kwarg is used (default 5432 if omitted).
+    - ``PGPORT`` is used when ``port`` is omitted (or ``port=None``).
+    - An explicit ``port=`` argument wins over ``PGPORT`` (including ``port=5432``).
     """
 
     def _env_without_pgport(self):
@@ -180,10 +181,15 @@ def test_explicit_port_kwarg_when_pgport_unset(self):
             pg = Postgres(**_POSTGRES_CONN_KWARGS, port=9999)
             assert pg.port == 9999
 
-    def test_pgport_env_overrides_explicit_port_kwarg(self):
+    def test_explicit_port_kwarg_overrides_pgport_env(self):
         with mock.patch.dict(os.environ, {"PGPORT": "5433"}, clear=False):
             pg = Postgres(**_POSTGRES_CONN_KWARGS, port=9999)
-            assert pg.port == 5433
+            assert pg.port == 9999
+
+    def test_explicit_default_port_kwarg_ignores_pgport_env(self):
+        with mock.patch.dict(os.environ, {"PGPORT": "5433"}, clear=False):
+            pg = Postgres(**_POSTGRES_CONN_KWARGS, port=5432)
+            assert pg.port == 5432
 
 
 # These tests interact directly with the Postgres database