Fix quoting in postgres dump/load operations

Pirols · Aug 10, 2024 · c7e90ab · c7e90ab
1 parent 6314feb
commit c7e90ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/pyinfra/operations/mysql.py b/pyinfra/operations/mysql.py
@@ -554,7 +554,7 @@ def dump(
         )
     """
 
-    commands_bits = [
+    yield StringCommand(
         make_mysql_command(
             executable="mysqldump",
             database=database,
@@ -565,9 +565,7 @@ def dump(
         ),
         ">",
         QuoteString(dest),
-    ]
-
-    yield StringCommand(*commands_bits)
+    )
 
 
 @operation(is_idempotent=False)
@@ -598,7 +596,7 @@ def load(
         )
     """
 
-    commands_bits = [
+    yield StringCommand(
         make_mysql_command(
             database=database,
             user=mysql_user,
@@ -608,5 +606,4 @@ def load(
         ),
         "<",
         QuoteString(src),
-    ]
-    yield StringCommand(*commands_bits)
+    )
diff --git a/pyinfra/operations/postgres.py b/pyinfra/operations/postgres.py
@@ -16,7 +16,7 @@
 from __future__ import annotations
 
 from pyinfra import host
-from pyinfra.api import MaskString, StringCommand, operation
+from pyinfra.api import MaskString, QuoteString, StringCommand, operation
 from pyinfra.facts.postgres import (
     PostgresDatabases,
     PostgresRoles,
@@ -302,7 +302,7 @@ def dump(
             port=psql_port,
         ),
         ">",
-        dest,
+        QuoteString(dest),
     )
 
 
@@ -345,5 +345,5 @@ def load(
             port=psql_port,
         ),
         "<",
-        src,
+        QuoteString(src),
     )