Ruff fixes.

Author: j-bennet

pgcli/main.py

@@ -315,7 +315,8 @@ def register_special_commands(self):
             aliases=("use", "\\connect", "USE"),
         )
 
-        refresh_callback = lambda: self.refresh_completions(persist_priorities="all")
+        def refresh_callback():
+            return self.refresh_completions(persist_priorities="all")
 
         self.pgspecial.register(
             self.quit,
@@ -439,7 +440,7 @@ def change_db(self, pattern, **_):
             # Get all the parameters in pattern, handling double quotes if any.
             infos = re.findall(r'"[^"]*"|[^"\'\s]+', pattern)
             # Now removing quotes.
-            list(map(lambda s: s.strip('"'), infos))
+            [s.strip('"') for s in infos]
 
             infos.extend([None] * (4 - len(infos)))
             db, user, host, port = infos

pgcli/packages/parseutils/ctes.py

@@ -17,7 +17,7 @@ def isolate_query_ctes(full_text, text_before_cursor):
     """Simplify a query by converting CTEs into table metadata objects"""
 
     if not full_text or not full_text.strip():
-        return full_text, text_before_cursor, tuple()
+        return full_text, text_before_cursor, ()
 
     ctes, remainder = extract_ctes(full_text)
     if not ctes:

pgcli/packages/sqlcompletion.py

@@ -26,16 +26,16 @@
 
 Function = namedtuple("Function", ["schema", "table_refs", "usage"])
 # For convenience, don't require the `usage` argument in Function constructor
-Function.__new__.__defaults__ = (None, tuple(), None)
-Table.__new__.__defaults__ = (None, tuple(), tuple())
-View.__new__.__defaults__ = (None, tuple())
-FromClauseItem.__new__.__defaults__ = (None, tuple(), tuple())
+Function.__new__.__defaults__ = (None, (), None)
+Table.__new__.__defaults__ = (None, (), ())
+View.__new__.__defaults__ = (None, ())
+FromClauseItem.__new__.__defaults__ = (None, (), ())
 
 Column = namedtuple(
     "Column",
     ["table_refs", "require_last_table", "local_tables", "qualifiable", "context"],
 )
-Column.__new__.__defaults__ = (None, None, tuple(), False, None)
+Column.__new__.__defaults__ = (None, None, (), False, None)
 
 Keyword = namedtuple("Keyword", ["last_token"])
 Keyword.__new__.__defaults__ = (None,)
@@ -424,7 +424,7 @@ def suggest_based_on_last_token(token, stmt):
 
         except ValueError:
             pass
-        return tuple()
+        return ()
 
     elif token_v in ("table", "view"):
         # E.g. 'ALTER TABLE <tablname>'

pgcli/pgbuffer.py

@@ -48,14 +48,7 @@ def cond():
         text = doc.text.strip()
 
         return (
-            text.startswith("\\")  # Special Command
-            or text.endswith(r"\e")  # Special Command
-            or text.endswith(r"\G")  # Ended with \e which should launch the editor
-            or _is_complete(text)  # A complete SQL command
-            or (text == "exit")  # Exit doesn't need semi-colon
-            or (text == "quit")  # Quit doesn't need semi-colon
-            or (text == ":q")  # To all the vim fans out there
-            or (text == "")  # Just a plain enter without any text
+            text.startswith("\\") or text.endswith((r"\e", r"\G")) or _is_complete(text) or text == "exit" or text == "quit" or text == ":q" or text == ""  # Just a plain enter without any text
         )
 
     return cond

pgcli/pgcompleter.py

@@ -54,7 +54,8 @@ def Candidate(completion, prio=None, meta=None, synonyms=None, prio2=None, displ
 # Used to strip trailing '::some_type' from default-value expressions
 arg_default_type_strip_regex = re.compile(r"::[\w\.]+(\[\])?$")
 
-normalize_ref = lambda ref: ref if ref[0] == '"' else '"' + ref.lower() + '"'
+def normalize_ref(ref):
+    return ref if ref[0] == '"' else '"' + ref.lower() + '"'
 
 
 def generate_alias(tbl, alias_map=None):
@@ -492,7 +493,8 @@ def get_column_matches(self, suggestion, word_before_cursor):
                 "if_more_than_one_table": len(tables) > 1,
             }[self.qualify_columns]
         )
-        qualify = lambda col, tbl: ((tbl + "." + self.case(col)) if do_qualify else self.case(col))
+        def qualify(col, tbl):
+            return ((tbl + "." + self.case(col)) if do_qualify else self.case(col))
         _logger.debug("Completion column scope: %r", tables)
         scoped_cols = self.populate_scoped_cols(tables, suggestion.local_tables)
 

tests/formatter/test_sqlformatter.py

@@ -55,7 +55,7 @@ def test_output_sql_insert():
     }
     formatter.query = 'SELECT * FROM "user";'
     output = adapter(data, header, table_format=table_format, **kwargs)
-    output_list = [l for l in output]
+    output_list = list(output)
     expected = [
         'INSERT INTO "user" ("id", "name", "email", "phone", "description", "created_at", "updated_at") VALUES',
         "  ('1', 'Jackson', 'jackson_test@gmail.com', '132454789', NULL, "
@@ -96,7 +96,7 @@ def test_output_sql_update():
     }
     formatter.query = 'SELECT * FROM "user";'
     output = adapter(data, header, table_format=table_format, **kwargs)
-    output_list = [l for l in output]
+    output_list = list(output)
     print(output_list)
     expected = [
         'UPDATE "user" SET',

tests/parseutils/test_parseutils.py

@@ -172,7 +172,7 @@ def test_subselect_tables():
 @pytest.mark.parametrize("text", ["SELECT * FROM foo.", "SELECT 123 AS foo"])
 def test_extract_no_tables(text):
     tables = extract_tables(text)
-    assert tables == tuple()
+    assert tables == ()
 
 
 @pytest.mark.parametrize("arg_list", ["", "arg1", "arg1, arg2, arg3"])

tests/test_main.py

@@ -338,7 +338,7 @@ def test_pset_pager_on(term_height, term_width, text, use_pager, pset_pager_mock
     ],
 )
 def test_color_pattern(text, expected_length, pset_pager_mocks):
-    cli = pset_pager_mocks[0]
+    pset_pager_mocks[0]
     assert len(COLOR_CODE_REGEX.sub("", text)) == expected_length