pgcli 4.1.0__tar.gz → 4.3.0__tar.gz

{pgcli-4.1.0 → pgcli-4.3.0}/AUTHORS

@@ -134,6 +134,13 @@ Contributors:
     * Antonio Aguilar (crazybolillo)
     * Andrew M. MacFie (amacfie)
     * saucoide
+    * Chris Rose (offbyone/offby1)
+    * Mathieu Dupuy (deronnax)
+    * Chris Novakovic
+    * Max Smolin (maximsmol)
+    * Josh Lynch (josh-lynch)
+    * Fabio (3ximus)
+    * Doug Harris (dougharris)
 
 Creator:
 --------

{pgcli-4.1.0/pgcli.egg-info → pgcli-4.3.0}/PKG-INFO

@@ -1,27 +1,27 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pgcli
-Version: 4.1.0
+Version: 4.3.0
 Summary: CLI for Postgres Database. With auto-completion and syntax highlighting.
-Home-page: http://pgcli.com
-Author: Pgcli Core Team
-Author-email: pgcli-dev@googlegroups.com
+Author-email: Pgcli Core Team <pgcli-dev@googlegroups.com>
 License: BSD
+Project-URL: Homepage, https://pgcli.com
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: SQL
 Classifier: Topic :: Database
 Classifier: Topic :: Database :: Front-Ends
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: AUTHORS
 Requires-Dist: pgspecial>=2.0.0
@@ -32,12 +32,14 @@ Requires-Dist: psycopg>=3.0.14; sys_platform != "win32"
 Requires-Dist: psycopg-binary>=3.0.14; sys_platform == "win32"
 Requires-Dist: sqlparse<0.6,>=0.3.0
 Requires-Dist: configobj>=5.0.6
-Requires-Dist: cli_helpers[styles]>=2.2.1
-Requires-Dist: setproctitle>=1.1.9
+Requires-Dist: cli_helpers[styles]>=2.4.0
+Requires-Dist: setproctitle>=1.1.9; sys_platform != "win32" and "CYGWIN" not in sys_platform
+Requires-Dist: tzlocal>=5.2
 Provides-Extra: keyring
 Requires-Dist: keyring>=12.2.0; extra == "keyring"
 Provides-Extra: sshtunnel
 Requires-Dist: sshtunnel>=0.4.0; extra == "sshtunnel"
+Dynamic: license-file
 
 We stand with Ukraine
 ---------------------
@@ -220,7 +222,7 @@ Alternatively, you can install ``pgcli`` as a python package using a package
 manager called called ``pip``. You will need postgres installed on your system
 for this to work.
 
-In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installing.html.
+In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installation/
 
 ::
 
@@ -250,7 +252,7 @@ If pip is not installed check if easy_install is available on the system.
 Linux:
 ======
 
-In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installing.html.
+In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installation/
 
 Check if pip is already available in your system.
 
@@ -393,7 +395,10 @@ choice:
 
     In [3]: my_result = _
 
-Pgcli dropped support for Python<3.8 as of 4.0.0. If you need it, install ``pgcli <= 4.0.0``.
+Pgcli dropped support for:
+
+* Python<3.8 as of 4.0.0.
+* Python<3.9 as of 4.2.0.
 
 Thanks:
 -------

{pgcli-4.1.0 → pgcli-4.3.0}/README.rst

@@ -179,7 +179,7 @@ Alternatively, you can install ``pgcli`` as a python package using a package
 manager called called ``pip``. You will need postgres installed on your system
 for this to work.
 
-In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installing.html.
+In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installation/
 
 ::
 
@@ -209,7 +209,7 @@ If pip is not installed check if easy_install is available on the system.
 Linux:
 ======
 
-In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installing.html.
+In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installation/
 
 Check if pip is already available in your system.
 
@@ -352,7 +352,10 @@ choice:
 
     In [3]: my_result = _
 
-Pgcli dropped support for Python<3.8 as of 4.0.0. If you need it, install ``pgcli <= 4.0.0``.
+Pgcli dropped support for:
+
+* Python<3.8 as of 4.0.0.
+* Python<3.9 as of 4.2.0.
 
 Thanks:
 -------

{pgcli-4.1.0 → pgcli-4.3.0}/changelog.rst

@@ -1,3 +1,30 @@
+4.3.0 (2025-03-22)
+==================
+
+Features
+--------
+* The session time zone setting is set to the system time zone by default
+
+4.2.0 (2025-03-06)
+==================
+
+Features
+--------
+* Add a `--ping` command line option; allows pgcli to replace `pg_isready`
+* Changed the packaging metadata from setup.py to pyproject.toml
+* Add bash completion for services defined in the service file `~/.pg_service.conf`
+* Added support for per-column date/time formatting using `column_date_formats` in config
+
+Bug fixes:
+----------
+* Avoid raising `NameError` when exiting unsuccessfully in some cases
+* Use configured `alias_map_file` to generate table aliases if available.
+
+Internal:
+---------
+
+* Drop support for Python 3.8 and add 3.13.
+
 4.1.0 (2024-03-09)
 ==================
 

pgcli-4.3.0/pgcli/__init__.py

@@ -0,0 +1 @@
+__version__ = "4.3.0"

{pgcli-4.1.0 → pgcli-4.3.0}/pgcli/main.py

@@ -1,3 +1,4 @@
+from zoneinfo import ZoneInfoNotFoundError
 from configobj import ConfigObj, ParseError
 from pgspecial.namedqueries import NamedQueries
 from .config import skip_initial_comment
@@ -19,10 +20,15 @@ from time import time, sleep
 from typing import Optional
 
 from cli_helpers.tabular_output import TabularOutputFormatter
-from cli_helpers.tabular_output.preprocessors import align_decimals, format_numbers
+from cli_helpers.tabular_output.preprocessors import (
+    align_decimals,
+    format_numbers,
+    format_timestamps,
+)
 from cli_helpers.utils import strip_ansi
 from .explain_output_formatter import ExplainOutputFormatter
 import click
+import tzlocal
 
 try:
     import setproctitle
@@ -111,12 +117,13 @@ MetaQuery.__new__.__defaults__ = ("", False, 0, 0, False, False, False, False)
 
 OutputSettings = namedtuple(
     "OutputSettings",
-    "table_format dcmlfmt floatfmt missingval expanded max_width case_function style_output max_field_width",
+    "table_format dcmlfmt floatfmt column_date_formats missingval expanded max_width case_function style_output max_field_width",
 )
 OutputSettings.__new__.__defaults__ = (
     None,
     None,
     None,
+    None,
     "<null>",
     False,
     None,
@@ -264,6 +271,7 @@ class PGCli:
         self.on_error = c["main"]["on_error"].upper()
         self.decimal_format = c["data_formats"]["decimal"]
         self.float_format = c["data_formats"]["float"]
+        self.column_date_formats = c["column_date_formats"]
         auth.keyring_initialize(c["main"].as_bool("keyring"), logger=self.logger)
         self.show_bottom_toolbar = c["main"].as_bool("show_bottom_toolbar")
 
@@ -610,7 +618,7 @@ class PGCli:
             click.secho(
                 f"service '{service}' was not found in {file}", err=True, fg="red"
             )
-            exit(1)
+            sys.exit(1)
         self.connect(
             database=service_config.get("dbname"),
             host=service_config.get("host"),
@@ -710,7 +718,7 @@ class PGCli:
                 self.logger.handlers = logger_handlers
                 self.logger.error("traceback: %r", traceback.format_exc())
                 click.secho(str(e), err=True, fg="red")
-                exit(1)
+                sys.exit(1)
             self.logger.handlers = logger_handlers
 
             atexit.register(self.ssh_tunnel.stop)
@@ -763,7 +771,7 @@ class PGCli:
             self.logger.debug("Database connection failed: %r.", e)
             self.logger.error("traceback: %r", traceback.format_exc())
             click.secho(str(e), err=True, fg="red")
-            exit(1)
+            sys.exit(1)
 
         self.pgexecute = pgexecute
 
@@ -1179,6 +1187,7 @@ class PGCli:
                 table_format=self.table_format,
                 dcmlfmt=self.decimal_format,
                 floatfmt=self.float_format,
+                column_date_formats=self.column_date_formats,
                 missingval=self.null_string,
                 expanded=expanded,
                 max_width=max_width,
@@ -1463,6 +1472,13 @@ class PGCli:
     is_flag=True,
     help="list available databases, then exit.",
 )
+@click.option(
+    "--ping",
+    "ping_database",
+    is_flag=True,
+    default=False,
+    help="Check database connectivity, then exit.",
+)
 @click.option(
     "--auto-vertical-output",
     is_flag=True,
@@ -1504,6 +1520,7 @@ def cli(
     prompt,
     prompt_dsn,
     list_databases,
+    ping_database,
     auto_vertical_output,
     list_dsn,
     warn,
@@ -1543,7 +1560,7 @@ def cli(
                 err=True,
                 fg="red",
             )
-            exit(1)
+            sys.exit(1)
 
     if ssh_tunnel and not SSH_TUNNEL_SUPPORT:
         click.secho(
@@ -1552,7 +1569,7 @@ def cli(
             err=True,
             fg="red",
         )
-        exit(1)
+        sys.exit(1)
 
     pgcli = PGCli(
         prompt_passwd,
@@ -1581,13 +1598,13 @@ def cli(
         service = database[8:]
     elif os.getenv("PGSERVICE") is not None:
         service = os.getenv("PGSERVICE")
-    # because option --list or -l are not supposed to have a db name
-    if list_databases:
+    # because option --ping, --list or -l are not supposed to have a db name
+    if list_databases or ping_database:
         database = "postgres"
 
+    cfg = load_config(pgclirc, config_full_path)
     if dsn != "":
         try:
-            cfg = load_config(pgclirc, config_full_path)
             dsn_config = cfg["alias_dsn"][dsn]
         except KeyError:
             click.secho(
@@ -1596,7 +1613,7 @@ def cli(
                 err=True,
                 fg="red",
             )
-            exit(1)
+            sys.exit(1)
         except Exception:
             click.secho(
                 "Invalid DSNs found in the config file. "
@@ -1604,7 +1621,7 @@ def cli(
                 err=True,
                 fg="red",
             )
-            exit(1)
+            sys.exit(1)
         pgcli.connect_uri(dsn_config)
         pgcli.dsn_alias = dsn
     elif "://" in database:
@@ -1616,6 +1633,55 @@ def cli(
     else:
         pgcli.connect(database, host, user, port)
 
+    if "use_local_timezone" not in cfg["main"] or cfg["main"].as_bool(
+        "use_local_timezone"
+    ):
+        server_tz = pgcli.pgexecute.get_timezone()
+
+        def echo_error(msg: str):
+            click.secho(
+                "Failed to determine the local time zone",
+                err=True,
+                fg="yellow",
+            )
+            click.secho(
+                msg,
+                err=True,
+                fg="yellow",
+            )
+            click.secho(
+                f"Continuing with the default time zone as preset by the server ({server_tz})",
+                err=True,
+                fg="yellow",
+            )
+            click.secho(
+                "Set `use_local_timezone = False` in the config to avoid trying to override the server time zone\n",
+                err=True,
+                dim=True,
+            )
+
+        local_tz = None
+        try:
+            local_tz = tzlocal.get_localzone_name()
+
+            if local_tz is None:
+                echo_error("No local time zone configuration found\n")
+            else:
+                click.secho(
+                    f"Using local time zone {local_tz} (server uses {server_tz})",
+                    fg="green",
+                )
+                click.secho(
+                    "Use `set time zone <TZ>` to override, or set `use_local_timezone = False` in the config",
+                    dim=True,
+                )
+
+                pgcli.pgexecute.set_timezone(local_tz)
+        except ZoneInfoNotFoundError as e:
+            # e.args[0] is the pre-formatted message which includes a list
+            # of conflicting sources
+            echo_error(e.args[0])
+
     if list_databases:
         cur, headers, status = pgcli.pgexecute.full_databases()
 
@@ -1626,6 +1692,20 @@ def cli(
 
         sys.exit(0)
 
+    if ping_database:
+        try:
+            list(pgcli.pgexecute.run("SELECT 1"))
+        except Exception:
+            click.secho(
+                "Could not connect to the database. Please check that the database is running.",
+                err=True,
+                fg="red",
+            )
+            sys.exit(1)
+        else:
+            click.echo("PONG")
+            sys.exit(0)
+
     pgcli.logger.debug(
         "Launch Params: \n" "\tdatabase: %r" "\tuser: %r" "\thost: %r" "\tport: %r",
         database,
@@ -1808,6 +1888,7 @@ def format_output(title, cur, headers, status, settings, explain_mode=False):
         "missing_value": settings.missingval,
         "integer_format": settings.dcmlfmt,
         "float_format": settings.floatfmt,
+        "column_date_formats": settings.column_date_formats,
         "preprocessors": (format_numbers, format_arrays),
         "disable_numparse": True,
         "preserve_whitespace": True,
@@ -1817,6 +1898,9 @@ def format_output(title, cur, headers, status, settings, explain_mode=False):
     if not settings.floatfmt:
         output_kwargs["preprocessors"] = (align_decimals,)
 
+    if settings.column_date_formats:
+        output_kwargs["preprocessors"] += (format_timestamps,)
+
     if table_format == "csv":
         # The default CSV dialect is "excel" which is not handling newline values correctly
         # Nevertheless, we want to keep on using "excel" on Windows since it uses '\r\n'

{pgcli-4.1.0 → pgcli-4.3.0}/pgcli/pgclirc

@@ -191,6 +191,10 @@ enable_pager = True
 # Use keyring to automatically save and load password in a secure manner
 keyring = True
 
+# Automatically set the session time zone to the local time zone
+# If unset, uses the server's time zone, which is the Postgres default
+use_local_timezone = True
+
 # Custom colors for the completion menu, toolbar, etc.
 [colors]
 completion-menu.completion.current = 'bg:#ffffff #000000'
@@ -240,3 +244,8 @@ output.null = "#808080"
 [data_formats]
 decimal = ""
 float = ""
+
+# Per column formats for date/timestamp columns
+[column_date_formats]
+# use strftime format, e.g.
+# created = "%Y-%m-%d"

{pgcli-4.1.0 → pgcli-4.3.0}/pgcli/pgcompleter.py

@@ -63,10 +63,17 @@ normalize_ref = lambda ref: ref if ref[0] == '"' else '"' + ref.lower() + '"'
 
 
 def generate_alias(tbl, alias_map=None):
-    """Generate a table alias, consisting of all upper-case letters in
-    the table name, or, if there are no upper-case letters, the first letter +
-    all letters preceded by _
-    param tbl - unescaped name of the table to alias
+    """Generate a table alias.
+
+    Given a table name will return an alias for that table using the first of
+    the following options there's a match for.
+
+        1. The predefined alias for table defined in the alias_map.
+        2. All upper-case letters in the table name.
+        3. The first letter of the table name and all letters preceded by _
+
+    :param tbl: unescaped name of the table to alias
+    :param alias_map: optional mapping of predefined table aliases
     """
     if alias_map and tbl in alias_map:
         return alias_map[tbl]
@@ -528,7 +535,7 @@ class PGCompleter(Completer):
         scoped_cols = self.populate_scoped_cols(tables, suggestion.local_tables)
 
         def make_cand(name, ref):
-            synonyms = (name, generate_alias(self.case(name)))
+            synonyms = (name, generate_alias(self.case(name), alias_map=self.alias_map))
             return Candidate(qualify(name, ref), 0, "column", synonyms)
 
         def flat_cols():
@@ -601,7 +608,7 @@ class PGCompleter(Completer):
         tbl = self.case(tbl)
         tbls = {normalize_ref(t.ref) for t in tbls}
         if self.generate_aliases:
-            tbl = generate_alias(self.unescape_name(tbl))
+            tbl = generate_alias(self.unescape_name(tbl), alias_map=self.alias_map)
         if normalize_ref(tbl) not in tbls:
             return tbl
         elif tbl[0] == '"':
@@ -644,7 +651,7 @@ class PGCompleter(Completer):
                 join = "{0} ON {0}.{1} = {2}.{3}".format(
                     c(left.tbl), c(left.col), rtbl.ref, c(right.col)
                 )
-            alias = generate_alias(self.case(left.tbl))
+            alias = generate_alias(self.case(left.tbl), alias_map=self.alias_map)
             synonyms = [
                 join,
                 "{0} ON {0}.{1} = {2}.{3}".format(
@@ -845,7 +852,7 @@ class PGCompleter(Completer):
         cased_tbl = self.case(tbl.name)
         if do_alias:
             alias = self.alias(cased_tbl, suggestion.table_refs)
-        synonyms = (cased_tbl, generate_alias(cased_tbl))
+        synonyms = (cased_tbl, generate_alias(cased_tbl, alias_map=self.alias_map))
         maybe_alias = (" " + alias) if do_alias else ""
         maybe_schema = (self.case(tbl.schema) + ".") if tbl.schema else ""
         suffix = self._arg_list_cache[arg_mode][tbl.meta] if arg_mode else ""

{pgcli-4.1.0 → pgcli-4.3.0}/pgcli/pgexecute.py

@@ -881,3 +881,16 @@ class PGExecute:
 
     def explain_prefix(self):
         return "EXPLAIN (ANALYZE, COSTS, VERBOSE, BUFFERS, FORMAT JSON) "
+
+    def get_timezone(self) -> str:
+        query = psycopg.sql.SQL("show time zone")
+        with self.conn.cursor() as cur:
+            cur.execute(query)
+            return cur.fetchone()[0]
+
+    def set_timezone(self, timezone: str):
+        query = psycopg.sql.SQL("set time zone {}").format(
+            psycopg.sql.Identifier(timezone)
+        )
+        with self.conn.cursor() as cur:
+            cur.execute(query)

{pgcli-4.1.0 → pgcli-4.3.0/pgcli.egg-info}/PKG-INFO

@@ -1,27 +1,27 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pgcli
-Version: 4.1.0
+Version: 4.3.0
 Summary: CLI for Postgres Database. With auto-completion and syntax highlighting.
-Home-page: http://pgcli.com
-Author: Pgcli Core Team
-Author-email: pgcli-dev@googlegroups.com
+Author-email: Pgcli Core Team <pgcli-dev@googlegroups.com>
 License: BSD
+Project-URL: Homepage, https://pgcli.com
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: SQL
 Classifier: Topic :: Database
 Classifier: Topic :: Database :: Front-Ends
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: AUTHORS
 Requires-Dist: pgspecial>=2.0.0
@@ -32,12 +32,14 @@ Requires-Dist: psycopg>=3.0.14; sys_platform != "win32"
 Requires-Dist: psycopg-binary>=3.0.14; sys_platform == "win32"
 Requires-Dist: sqlparse<0.6,>=0.3.0
 Requires-Dist: configobj>=5.0.6
-Requires-Dist: cli_helpers[styles]>=2.2.1
-Requires-Dist: setproctitle>=1.1.9
+Requires-Dist: cli_helpers[styles]>=2.4.0
+Requires-Dist: setproctitle>=1.1.9; sys_platform != "win32" and "CYGWIN" not in sys_platform
+Requires-Dist: tzlocal>=5.2
 Provides-Extra: keyring
 Requires-Dist: keyring>=12.2.0; extra == "keyring"
 Provides-Extra: sshtunnel
 Requires-Dist: sshtunnel>=0.4.0; extra == "sshtunnel"
+Dynamic: license-file
 
 We stand with Ukraine
 ---------------------
@@ -220,7 +222,7 @@ Alternatively, you can install ``pgcli`` as a python package using a package
 manager called called ``pip``. You will need postgres installed on your system
 for this to work.
 
-In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installing.html.
+In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installation/
 
 ::
 
@@ -250,7 +252,7 @@ If pip is not installed check if easy_install is available on the system.
 Linux:
 ======
 
-In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installing.html.
+In depth getting started guide for ``pip`` - https://pip.pypa.io/en/latest/installation/
 
 Check if pip is already available in your system.
 
@@ -393,7 +395,10 @@ choice:
 
     In [3]: my_result = _
 
-Pgcli dropped support for Python<3.8 as of 4.0.0. If you need it, install ``pgcli <= 4.0.0``.
+Pgcli dropped support for:
+
+* Python<3.8 as of 4.0.0.
+* Python<3.9 as of 4.2.0.
 
 Thanks:
 -------

{pgcli-4.1.0 → pgcli-4.3.0}/pgcli.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ MANIFEST.in
 README.rst
 changelog.rst
 pyproject.toml
-setup.py
 pgcli/__init__.py
 pgcli/__main__.py
 pgcli/auth.py

pgcli-4.3.0/pgcli.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

{pgcli-4.1.0 → pgcli-4.3.0}/pgcli.egg-info/requires.txt

@@ -4,12 +4,15 @@ Pygments>=2.0
 prompt_toolkit<4.0.0,>=2.0.6
 sqlparse<0.6,>=0.3.0
 configobj>=5.0.6
-cli_helpers[styles]>=2.2.1
-setproctitle>=1.1.9
+cli_helpers[styles]>=2.4.0
+tzlocal>=5.2
 
 [:sys_platform != "win32"]
 psycopg>=3.0.14
 
+[:sys_platform != "win32" and "CYGWIN" not in sys_platform]
+setproctitle>=1.1.9
+
 [:sys_platform == "win32"]
 psycopg-binary>=3.0.14
 

pgcli-4.3.0/pyproject.toml

@@ -0,0 +1,94 @@
+[project]
+name = "pgcli"
+authors = [{ name = "Pgcli Core Team", email = "pgcli-dev@googlegroups.com" }]
+license = { text = "BSD" }
+description = "CLI for Postgres Database. With auto-completion and syntax highlighting."
+readme = "README.rst"
+classifiers = [
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: BSD License",
+    "Operating System :: Unix",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: SQL",
+    "Topic :: Database",
+    "Topic :: Database :: Front-Ends",
+    "Topic :: Software Development",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+urls = { Homepage = "https://pgcli.com" }
+requires-python = ">=3.9"
+dependencies = [
+    "pgspecial>=2.0.0",
+    "click >= 4.1",
+    "Pygments>=2.0",  # Pygments has to be Capitalcased. WTF?
+    # We still need to use pt-2 unless pt-3 released on Fedora32
+    # see: https://github.com/dbcli/pgcli/pull/1197
+    "prompt_toolkit>=2.0.6,<4.0.0",
+    "psycopg >= 3.0.14; sys_platform != 'win32'",
+    "psycopg-binary >= 3.0.14; sys_platform == 'win32'",
+    "sqlparse >=0.3.0,<0.6",
+    "configobj >= 5.0.6",
+    "cli_helpers[styles] >= 2.4.0",
+    # setproctitle is used to mask the password when running `ps` in command line.
+    # But this is not necessary in Windows since the password is never shown in the
+    # task manager. Also setproctitle is a hard dependency to install in Windows,
+    # so we'll only install it if we're not in Windows.
+    "setproctitle >= 1.1.9; sys_platform != 'win32' and 'CYGWIN' not in sys_platform",
+    "tzlocal >= 5.2",
+]
+dynamic = ["version"]
+
+
+[project.scripts]
+pgcli = "pgcli.main:cli"
+
+[project.optional-dependencies]
+keyring = ["keyring >= 12.2.0"]
+sshtunnel = ["sshtunnel >= 0.4.0"]
+
+[build-system]
+requires = ["setuptools>=61.2"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+include-package-data = false
+
+[tool.setuptools.dynamic]
+version = { attr = "pgcli.__version__" }
+
+[tool.setuptools.packages]
+find = { namespaces = false }
+
+[tool.setuptools.package-data]
+pgcli = [
+    "pgclirc",
+    "packages/pgliterals/pgliterals.json",
+]
+
+[tool.black]
+line-length = 88
+target-version = ['py38']
+include = '\.pyi?$'
+exclude = '''
+/(
+    \.eggs
+  | \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | \.cache
+  | \.pytest_cache
+  | _build
+  | buck-out
+  | build
+  | dist
+  | tests/data
+)/
+'''

{pgcli-4.1.0 → pgcli-4.3.0}/tests/features/basic_commands.feature

@@ -51,6 +51,10 @@ Feature: run the cli,
       When we list databases
       then we see list of databases
 
+  Scenario: ping databases
+      When we ping the database
+      then we get a pong response
+
   Scenario: run the cli with --username
     When we launch dbcli using --username
       and we send "\?" command

{pgcli-4.1.0 → pgcli-4.3.0}/tests/features/steps/basic_commands.py

@@ -26,6 +26,19 @@ def step_see_list_databases(context):
     context.cmd_output = None
 
 
+@when("we ping the database")
+def step_ping_database(context):
+    cmd = ["pgcli", "--ping"]
+    context.cmd_output = subprocess.check_output(cmd, cwd=context.package_root)
+
+
+@then("we get a pong response")
+def step_get_pong_response(context):
+    # exit code 0 is implied by the presence of cmd_output here, which
+    # is only set on a successful run.
+    assert context.cmd_output.strip() == b"PONG", f"Output was {context.cmd_output}"
+
+
 @when("we run dbcli")
 def step_run_cli(context):
     wrappers.run_cli(context)

{pgcli-4.1.0 → pgcli-4.3.0}/tests/test_main.py

@@ -76,6 +76,57 @@ def test_format_output():
     assert list(results) == expected
 
 
+def test_column_date_formats():
+    settings = OutputSettings(
+        table_format="psql",
+        column_date_formats={
+            "date_col": "%Y-%m-%d",
+            "datetime_col": "%I:%M:%S %m/%d/%y",
+        },
+    )
+    data = [
+        ("name1", "2024-12-13T18:32:22", "2024-12-13T19:32:22", "2024-12-13T20:32:22"),
+        ("name2", "2025-02-13T02:32:22", "2025-02-13T02:32:22", "2025-02-13T02:32:22"),
+    ]
+    headers = ["name", "date_col", "datetime_col", "unchanged_col"]
+
+    results = format_output("Title", data, headers, "test status", settings)
+    expected = [
+        "Title",
+        "+-------+------------+-------------------+---------------------+",
+        "| name  | date_col   | datetime_col      | unchanged_col       |",
+        "|-------+------------+-------------------+---------------------|",
+        "| name1 | 2024-12-13 | 07:32:22 12/13/24 | 2024-12-13T20:32:22 |",
+        "| name2 | 2025-02-13 | 02:32:22 02/13/25 | 2025-02-13T02:32:22 |",
+        "+-------+------------+-------------------+---------------------+",
+        "test status",
+    ]
+    assert list(results) == expected
+
+
+def test_no_column_date_formats():
+    """Test that not setting any column date formats returns unaltered datetime columns"""
+    settings = OutputSettings(table_format="psql")
+    data = [
+        ("name1", "2024-12-13T18:32:22", "2024-12-13T19:32:22", "2024-12-13T20:32:22"),
+        ("name2", "2025-02-13T02:32:22", "2025-02-13T02:32:22", "2025-02-13T02:32:22"),
+    ]
+    headers = ["name", "date_col", "datetime_col", "unchanged_col"]
+
+    results = format_output("Title", data, headers, "test status", settings)
+    expected = [
+        "Title",
+        "+-------+---------------------+---------------------+---------------------+",
+        "| name  | date_col            | datetime_col        | unchanged_col       |",
+        "|-------+---------------------+---------------------+---------------------|",
+        "| name1 | 2024-12-13T18:32:22 | 2024-12-13T19:32:22 | 2024-12-13T20:32:22 |",
+        "| name2 | 2025-02-13T02:32:22 | 2025-02-13T02:32:22 | 2025-02-13T02:32:22 |",
+        "+-------+---------------------+---------------------+---------------------+",
+        "test status",
+    ]
+    assert list(results) == expected
+
+
 def test_format_output_truncate_on():
     settings = OutputSettings(
         table_format="psql", dcmlfmt="d", floatfmt="g", max_field_width=10

{pgcli-4.1.0 → pgcli-4.3.0}/tests/test_pgcompleter.py

@@ -1,5 +1,7 @@
+import json
 import pytest
 from pgcli import pgcompleter
+import tempfile
 
 
 def test_load_alias_map_file_missing_file():
@@ -47,12 +49,34 @@ def test_generate_alias_uses_first_char_and_every_preceded_by_underscore(
     "table_name, alias_map, alias",
     [
         ("some_table", {"some_table": "my_alias"}, "my_alias"),
+        pytest.param(
+            "some_other_table", {"some_table": "my_alias"}, "sot", id="no_match_in_map"
+        ),
     ],
 )
 def test_generate_alias_can_use_alias_map(table_name, alias_map, alias):
     assert pgcompleter.generate_alias(table_name, alias_map) == alias
 
 
+@pytest.mark.parametrize(
+    "table_name, alias_map, alias",
+    [
+        ("some_table", {"some_table": "my_alias"}, "my_alias"),
+    ],
+)
+def test_pgcompleter_alias_uses_configured_alias_map(table_name, alias_map, alias):
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".json") as alias_map_file:
+        alias_map_file.write(json.dumps(alias_map))
+        alias_map_file.seek(0)
+        completer = pgcompleter.PGCompleter(
+            settings={
+                "generate_aliases": True,
+                "alias_map_file": alias_map_file.name,
+            }
+        )
+        assert completer.alias(table_name, []) == alias
+
+
 @pytest.mark.parametrize(
     "table_name, alias_map, alias",
     [

pgcli-4.1.0/pgcli/__init__.py

@@ -1 +0,0 @@
-__version__ = "4.1.0"

pgcli-4.1.0/pgcli.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-http://github.com/psycopg/repo/tarball/master#egg=psycopg-3.0.10

pgcli-4.1.0/pyproject.toml

@@ -1,21 +0,0 @@
-[tool.black]
-line-length = 88
-target-version = ['py38']
-include = '\.pyi?$'
-exclude = '''
-/(
-    \.eggs
-  | \.git
-  | \.hg
-  | \.mypy_cache
-  | \.tox
-  | \.venv
-  | \.cache
-  | \.pytest_cache
-  | _build
-  | buck-out
-  | build
-  | dist
-  | tests/data
-)/
-'''

pgcli-4.1.0/setup.py

@@ -1,71 +0,0 @@
-import platform
-from setuptools import setup, find_packages
-
-from pgcli import __version__
-
-description = "CLI for Postgres Database. With auto-completion and syntax highlighting."
-
-install_requirements = [
-    "pgspecial>=2.0.0",
-    "click >= 4.1",
-    "Pygments>=2.0",  # Pygments has to be Capitalcased. WTF?
-    # We still need to use pt-2 unless pt-3 released on Fedora32
-    # see: https://github.com/dbcli/pgcli/pull/1197
-    "prompt_toolkit>=2.0.6,<4.0.0",
-    "psycopg >= 3.0.14; sys_platform != 'win32'",
-    "psycopg-binary >= 3.0.14; sys_platform == 'win32'",
-    "sqlparse >=0.3.0,<0.6",
-    "configobj >= 5.0.6",
-    "cli_helpers[styles] >= 2.2.1",
-]
-
-
-# setproctitle is used to mask the password when running `ps` in command line.
-# But this is not necessary in Windows since the password is never shown in the
-# task manager. Also setproctitle is a hard dependency to install in Windows,
-# so we'll only install it if we're not in Windows.
-if platform.system() != "Windows" and not platform.system().startswith("CYGWIN"):
-    install_requirements.append("setproctitle >= 1.1.9")
-
-setup(
-    name="pgcli",
-    author="Pgcli Core Team",
-    author_email="pgcli-dev@googlegroups.com",
-    version=__version__,
-    license="BSD",
-    url="http://pgcli.com",
-    packages=find_packages(),
-    package_data={"pgcli": ["pgclirc", "packages/pgliterals/pgliterals.json"]},
-    description=description,
-    long_description=open("README.rst").read(),
-    install_requires=install_requirements,
-    dependency_links=[
-        "http://github.com/psycopg/repo/tarball/master#egg=psycopg-3.0.10"
-    ],
-    extras_require={
-        "keyring": ["keyring >= 12.2.0"],
-        "sshtunnel": ["sshtunnel >= 0.4.0"],
-    },
-    python_requires=">=3.8",
-    entry_points="""
-        [console_scripts]
-        pgcli=pgcli.main:cli
-    """,
-    classifiers=[
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: BSD License",
-        "Operating System :: Unix",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: SQL",
-        "Topic :: Database",
-        "Topic :: Database :: Front-Ends",
-        "Topic :: Software Development",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-    ],
-)