From e84c289c0d98cd4ff0c710bcba19b8077d136bd2 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Tue, 10 Oct 2023 20:51:22 +0000 Subject: [PATCH] backup: Use simpler api for server version. --- zerver/management/commands/backup.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/zerver/management/commands/backup.py b/zerver/management/commands/backup.py index 829c7213da..e5e9573943 100644 --- a/zerver/management/commands/backup.py +++ b/zerver/management/commands/backup.py @@ -2,12 +2,11 @@ import os import re import tempfile from argparse import ArgumentParser, RawTextHelpFormatter -from typing import TYPE_CHECKING, Any +from typing import Any from django.conf import settings from django.core.management.base import CommandParser from django.db import connection -from django.db.backends.postgresql.base import DatabaseWrapper from django.utils.timezone import now as timezone_now from scripts.lib.zulip_tools import TIMESTAMP_FORMAT, parse_os_release, run @@ -52,13 +51,8 @@ class Command(ZulipBaseCommand): members.append("zulip-backup/os-version") with open(os.path.join(tmp, "zulip-backup", "postgres-version"), "w") as f: - # We are accessing a backend specific attribute via a proxy object, whose type - # cannot be narrowed with a regular isinstance assertion. - # This can be potentially fixed more cleanly with the recently added - # connection.get_database_version(). - if TYPE_CHECKING: - assert isinstance(connection, DatabaseWrapper) - print(connection.pg_version, file=f) + pg_server_version = connection.cursor().connection.server_version + print(pg_server_version, file=f) members.append("zulip-backup/postgres-version") if settings.DEVELOPMENT: