Merge remote-tracking branch 'original/main' into feature/tuples-only-option

Author: DiegoDAF

AUTHORS

@@ -144,9 +144,13 @@ Contributors:
     * Jay Knight (jay-knight)
     * fbdb
     * Charbel Jacquin (charbeljc)
+    * Jeronimo Garcia (bechampion)
     * Devadathan M B (devadathanmb)
     * Charalampos Stratakis
     * Laszlo Bimba (bimlas)
+    * Anjanna
+    * Shayan Golshani (shgol)
+    * Tommi Kyntölä (kynde)
 
 Creator:
 --------

changelog.rst

@@ -1,12 +1,13 @@
-Upcoming (TBD)
-==============
+4.5.0 (2026-06-02)
+==================
 
 Features:
 ---------
 * Add support for `\\T` prompt escape sequence to display transaction status (similar to psql's `%x`).
 * Add cursor shape support for vi mode. When ``vi = True``, the terminal cursor now
   reflects the current editing mode: beam in INSERT, block in NORMAL, underline in REPLACE.
   Uses prompt_toolkit's ``ModalCursorShapeConfig``.
+* Add the option to force-quit pgcli when a transaction is in progress.
 * Add support of Python 3.14.
 * Drop support of Python 3.9.
 * Add ``-t``/``--tuples-only`` CLI option to set table format at startup.
@@ -18,6 +19,13 @@ Bug fixes:
 ----------
 * Add `VERSION` to built-in function completion so `SELECT VERSION();` is suggested.
 * Hide timezone notice at startup when local and server timezones are the same.
+* Let `sqlparse` accept arbitrarily-large queries.
+* Respect user-specified `LIMIT` clauses when the limit value starts on a new line.
+* Fix trailing SQL comments preventing query submission and execution.
+    * ``SELECT 1; -- note`` now submits correctly in multiline mode
+    * ``rstrip(";")`` in ``pgexecute.py`` now handles comments after the semicolon
+* Fix completion crash when tables are created during refresh.
+* Suggest columns after `GROUP BY`, like `ORDER BY` already does.    
 
 4.4.0 (2025-12-24)
 ==================

pgcli/__init__.py

@@ -1 +1 @@
-__version__ = "4.4.0"
+__version__ = "4.5.0"

pgcli/main.py

@@ -27,6 +27,8 @@
 from cli_helpers.utils import strip_ansi
 from .explain_output_formatter import ExplainOutputFormatter
 import click
+import sqlparse
+from sqlparse import tokens as sqlparse_tokens
 import tzlocal
 
 try:
@@ -654,7 +656,7 @@ def connect(self, database="", host="", user="", port="", passwd="", dsn="", **k
         if self.force_passwd_prompt and not passwd:
             passwd = click.prompt("Password for %s" % user, hide_input=True, show_default=False, type=str)
 
-        key = f"{user}@{host}"
+        key = f"{user}@{host}@{port}"
 
         if not passwd and auth.keyring:
             passwd = auth.keyring_get_password(key)
@@ -937,7 +939,7 @@ def _check_ongoing_transaction_and_allow_quitting(self):
         while 1:
             try:
                 choice = click.prompt(
-                    "A transaction is ongoing. Choose `c` to COMMIT, `r` to ROLLBACK, `a` to abort exit.",
+                    "A transaction is ongoing. Choose `c` to COMMIT, `r` to ROLLBACK, `a` to abort exit, `force` to exit anyway.",
                     default="a",
                 )
             except click.Abort:
@@ -949,6 +951,8 @@ def _check_ongoing_transaction_and_allow_quitting(self):
             choice = choice.lower()
             if choice == "a":
                 return False  # do not quit
+            if choice == "force":
+                return True  # quit anyway
             if choice == "c":
                 query = self.execute_command("commit")
                 return query.successful  # quit only if query is successful
@@ -1116,7 +1120,7 @@ def _should_limit_output(self, sql, cur):
     def _has_limit(self, sql):
         if not sql:
             return False
-        return "limit " in sql.lower()
+        return any(token.match(sqlparse_tokens.Keyword, "LIMIT") for statement in sqlparse.parse(sql) for token in statement.flatten())
 
     def _limit_output(self, cur):
         limit = min(self.row_limit, cur.rowcount)

pgcli/packages/parseutils/__init__.py

@@ -1,5 +1,7 @@
 import sqlparse
 
+sqlparse.engine.grouping.MAX_GROUPING_DEPTH = None
+sqlparse.engine.grouping.MAX_GROUPING_TOKENS = None
 
 BASE_KEYWORDS = [
     "drop",

pgcli/packages/parseutils/ctes.py

@@ -1,9 +1,12 @@
+import sqlparse
 from sqlparse import parse
 from sqlparse.tokens import Keyword, CTE, DML
 from sqlparse.sql import Identifier, IdentifierList, Parenthesis
 from collections import namedtuple
 from .meta import TableMetadata, ColumnMetadata
 
+sqlparse.engine.grouping.MAX_GROUPING_DEPTH = None
+sqlparse.engine.grouping.MAX_GROUPING_TOKENS = None
 
 # TableExpression is a namedtuple representing a CTE, used internally
 # name: cte alias assigned in the query

pgcli/packages/parseutils/tables.py

@@ -3,6 +3,9 @@
 from sqlparse.sql import IdentifierList, Identifier, Function
 from sqlparse.tokens import Keyword, DML, Punctuation
 
+sqlparse.engine.grouping.MAX_GROUPING_DEPTH = None
+sqlparse.engine.grouping.MAX_GROUPING_TOKENS = None
+
 TableReference = namedtuple("TableReference", ["schema", "name", "alias", "is_function"])
 TableReference.ref = property(
     lambda self: self.alias or (self.name if self.name.islower() or self.name[0] == '"' else '"' + self.name + '"')

pgcli/packages/parseutils/utils.py

@@ -3,6 +3,9 @@
 from sqlparse.sql import Identifier
 from sqlparse.tokens import Token, Error
 
+sqlparse.engine.grouping.MAX_GROUPING_DEPTH = None
+sqlparse.engine.grouping.MAX_GROUPING_TOKENS = None
+
 cleanup_regex = {
     # This matches only alphanumerics and underscores.
     "alphanum_underscore": re.compile(r"(\w+)$"),

pgcli/packages/prioritization.py

@@ -4,6 +4,8 @@
 from collections import defaultdict
 from .pgliterals.main import get_literals
 
+sqlparse.engine.grouping.MAX_GROUPING_DEPTH = None
+sqlparse.engine.grouping.MAX_GROUPING_TOKENS = None
 
 white_space_regex = re.compile("\\s+", re.MULTILINE)
 

pgcli/packages/sqlcompletion.py

@@ -7,6 +7,8 @@
 from .parseutils.ctes import isolate_query_ctes
 from pgspecial.main import parse_special_command
 
+sqlparse.engine.grouping.MAX_GROUPING_DEPTH = None
+sqlparse.engine.grouping.MAX_GROUPING_TOKENS = None
 
 Special = namedtuple("Special", [])
 Database = namedtuple("Database", [])
@@ -381,7 +383,7 @@ def suggest_based_on_last_token(token, stmt):
         # E.g. 'UPDATE foo SET'
         return (Column(table_refs=stmt.get_tables(), local_tables=stmt.local_tables),)
 
-    elif token_v in ("select", "where", "having", "order by", "distinct"):
+    elif token_v in ("select", "where", "having", "group by", "order by", "distinct"):
         return _suggest_expression(token_v, stmt)
     elif token_v == "as":
         # Don't suggest anything for aliases