fix(apex): one saved password for both spellings of a connection

The account name a password is filed under in the credential store is
derived from the connect string, and SQLcl reaches one database through
either host:port/service or the JDBC URL for it. Saving from the CLI
with one spelling and reading from Settings with the other therefore
looked like no password had ever been saved, and the workbench asked for
it again -- found while re-running the APEX verification, where
apex_render_check.py could not see a password the CLI had stored.

account_key() now drops a leading jdbc:oracle:<driver>:@ (and the // of
the URL form) before folding the rest, so both spellings name one
account. It folds towards the plain form on purpose: every password
already in a store stays findable, with no migration and nothing to
retype.

Author: gevianajr

CHANGELOG.md

@@ -45,6 +45,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- A saved APEX password is found whether the connection is written as
+  `host:port/service` or as the JDBC URL for it. The account name in the
+  credential store is derived from the connection, so the two spellings of
+  one database used to hide each other's password and the workbench asked
+  for it again.
 - The Diff report labels added and removed program units with their kind,
   as modified ones already were, so a package specification and its body
   removed together no longer appear as two identical names.

formslang/apeximport.py

@@ -50,6 +50,14 @@
 
 _UNSAFE_ACCOUNT_CHARS = re.compile(r"[^A-Za-z0-9_.:-]")
 
+#: SQLcl reaches one database through either ``host:port/service`` or the
+#: JDBC URL for it, and Settings saves whichever was typed. They name the
+#: same target, so a password saved under one has to be found under the
+#: other: the prefix -- and the ``//`` of the URL form -- comes off before
+#: the account name is built. Folding towards the plain form keeps every
+#: password already in the store findable.
+_JDBC_PREFIX = re.compile(r"^jdbc:oracle:[A-Za-z]+:@(?://)?", re.IGNORECASE)
+
 #: ``apex import``/``apex validate`` print this header (followed by File /
 #: Line / Column / Type / Error lines) when the APEXlang package does not
 #: compile -- and SQLcl still exits 0, so the exit code alone is not the
@@ -103,8 +111,12 @@ def account_key(username: str, connect_string: str) -> str:
     neither of which that validator allows, so unsafe characters are folded to
     ``_`` -- this only has to be stable and collision-free enough to find the
     same saved password again next time, not human-typeable.
+
+    A JDBC URL and the plain target inside it are the same database, so both
+    produce the same account name (see :data:`_JDBC_PREFIX`).
     """
-    return _UNSAFE_ACCOUNT_CHARS.sub("_", f"{username}@{connect_string}")
+    target = _JDBC_PREFIX.sub("", str(connect_string or "").strip())
+    return _UNSAFE_ACCOUNT_CHARS.sub("_", f"{username}@{target}")
 
 
 def _token(name: str, value: str) -> str:

tests/test_apeximport.py

@@ -21,6 +21,24 @@ def test_account_key_folds_the_unsafe_characters_a_connect_string_carries():
     assert key == "FORMSLANG_localhost:1521_FREEPDB1"
 
 
+def test_the_jdbc_url_and_the_target_inside_it_are_one_saved_password():
+    """Settings may hold either form; the store holds one password."""
+    plain = apeximport.account_key("FORMSLANG", "localhost:1521/FREEPDB1")
+    for url in (
+        "jdbc:oracle:thin:@localhost:1521/FREEPDB1",
+        "jdbc:oracle:thin:@//localhost:1521/FREEPDB1",
+        "JDBC:ORACLE:OCI:@localhost:1521/FREEPDB1",
+        "  jdbc:oracle:thin:@localhost:1521/FREEPDB1  ",
+    ):
+        assert apeximport.account_key("FORMSLANG", url) == plain
+
+
+def test_a_host_that_merely_looks_like_a_prefix_is_still_the_host():
+    """Only the real JDBC prefix comes off -- nothing that resembles one."""
+    key = apeximport.account_key("U", "jdbcserver:1521/S")
+    assert key == "U_jdbcserver:1521_S"
+
+
 def test_sqlcl_binary_prefers_the_environment_override(monkeypatch):
     monkeypatch.setenv(apeximport.ENV_SQLCL_PATH, "C:/tools/sql.exe")
     assert apeximport.sqlcl_binary() == "C:/tools/sql.exe"