Merge pull request #1 from alliedmodders/psy/expose-table-name

Expose commit log table name

Author: psychonic

README.md

@@ -61,6 +61,7 @@ database:
   user: "sm_commit_update"
   password: "..."         # env: DATABASE__PASSWORD
   name: "sourcemod"
+  commit_log_table: "sm_commit_log"  # env: DATABASE__COMMIT_LOG_TABLE; default: sm_commit_log
 
 repo:
   owner: "alliedmodders"

app.py

@@ -56,6 +56,7 @@ class DatabaseSettings(BaseModel):
     user: str
     password: str
     name: str = "sourcemod"
+    commit_log_table: str = "sm_commit_log"
 
 
 class RepoSettings(BaseModel):
@@ -145,6 +146,7 @@ def _run_reconcile():
             download_fn=lambda url, path: download_file(url, path),
             product_name=config.repo.product_name,
             max_age_days=config.repo.reconcile_max_age_days,
+            commit_log_table=config.database.commit_log_table,
         )
     except Exception:
         logger.exception("Scheduled reconciliation failed")
@@ -402,6 +404,7 @@ def process_artifacts(
                     _releases_client,
                     config.database,
                     config.repo.version_branches,
+                    commit_log_table=config.database.commit_log_table,
                 )
             except Exception:
                 logger.exception(

config.yaml

@@ -12,6 +12,7 @@ api:
 #   user: "mysql-user"
 #   password: "your-db-password"  # Or set DATABASE__PASSWORD env var
 #   name: "sourcemod"
+#   commit_log_table: "sm_commit_log"  # Table to write build records to; defaults to sm_commit_log
 
 # repo:
 #   owner: "alliedmodders"

db.py

@@ -27,13 +27,15 @@ def get_connection(config):
         conn.close()
 
 
-def get_known_builds(conn) -> dict[str, dict[int, dict]]:
+def get_known_builds(
+    conn, table_name: str = "sm_commit_log"
+) -> dict[str, dict[int, dict]]:
     """
-    Return {branch: {build_num: {windows_url, linux_url}}} for all rows in sm_commit_log.
+    Return {branch: {build_num: {windows_url, linux_url}}} for all rows in the commit log.
     URLs may be None if not yet populated.
     """
     with conn.cursor() as cur:
-        cur.execute("SELECT branch, build, windows_url, linux_url FROM sm_commit_log")
+        cur.execute(f"SELECT branch, build, windows_url, linux_url FROM `{table_name}`")  # noqa: S608
         known: dict[str, dict[int, dict]] = {}
         for row in cur.fetchall():
             known.setdefault(row["branch"], {})[row["build"]] = {
@@ -43,12 +45,20 @@ def get_known_builds(conn) -> dict[str, dict[int, dict]]:
     return known
 
 
-def update_build_urls(conn, *, branch, build_num, windows_url, linux_url):
+def update_build_urls(
+    conn,
+    *,
+    branch,
+    build_num,
+    windows_url,
+    linux_url,
+    table_name: str = "sm_commit_log",
+):
     """Fill in NULL URL columns for an existing build. Non-NULL values are never overwritten."""
     with conn.cursor() as cur:
         cur.execute(
-            """
-            UPDATE sm_commit_log
+            f"""
+            UPDATE `{table_name}`
             SET windows_url = COALESCE(%s, windows_url),
                 linux_url   = COALESCE(%s, linux_url)
             WHERE branch = %s AND build = %s
@@ -58,16 +68,25 @@ def update_build_urls(conn, *, branch, build_num, windows_url, linux_url):
 
 
 def upsert_build(
-    conn, *, branch, sha, build_num, timestamp, message, windows_url, linux_url
+    conn,
+    *,
+    branch,
+    sha,
+    build_num,
+    timestamp,
+    message,
+    windows_url,
+    linux_url,
+    table_name: str = "sm_commit_log",
 ):
     """
     Insert a build record, or on duplicate key fill in any NULL URL columns.
     Existing non-NULL URLs are never overwritten.
     """
     with conn.cursor() as cur:
         cur.execute(
-            """
-            INSERT INTO sm_commit_log
+            f"""
+            INSERT INTO `{table_name}`
                 (branch, hash, build, date, message, windows_url, linux_url)
             VALUES (%s, %s, %s, FROM_UNIXTIME(%s), %s, %s, %s)
             ON DUPLICATE KEY UPDATE

reconciler.py

@@ -17,6 +17,7 @@ def upsert_from_release(
     client: GitHubReleasesClient,
     db_config,
     version_branches: dict[str, str],
+    commit_log_table: str = "sm_commit_log",
 ) -> bool:
     """
     Resolve and upsert a single GitHub release to the DB.
@@ -59,6 +60,7 @@ def upsert_from_release(
             message=message,
             windows_url=windows_url,
             linux_url=linux_url,
+            table_name=commit_log_table,
         )
 
     logger.info("DB updated for build %d (branch %s, tag %s)", build_num, branch, tag)
@@ -118,6 +120,7 @@ def reconcile(
     download_fn: Callable | None = None,
     product_name: str | None = None,
     max_age_days: int | None = 90,
+    commit_log_table: str = "sm_commit_log",
 ) -> int:
     """
     Fetch GitHub releases and reconcile DB records, build archives, and symbols.
@@ -140,7 +143,7 @@ def reconcile(
     Returns the number of newly DB-inserted builds.
     """
     with get_connection(db_config) as conn:
-        known = get_known_builds(conn)
+        known = get_known_builds(conn, table_name=commit_log_table)
 
     new_count = 0
 
@@ -199,6 +202,7 @@ def reconcile(
                             build_num=build_num,
                             windows_url=windows_url,
                             linux_url=linux_url,
+                            table_name=commit_log_table,
                         )
                     known.setdefault(branch, {})[build_num] = {
                         "windows_url": windows_url
@@ -234,6 +238,7 @@ def reconcile(
                         message=message,
                         windows_url=windows_url,
                         linux_url=linux_url,
+                        table_name=commit_log_table,
                     )
 
                 known.setdefault(branch, {})[build_num] = {