Fix set_auto_conf with single quotes

vshepard · vshepard · commit 1b9a2938d5f8 · 2024-12-03T01:30:35.000+01:00
diff --git a/testgres/node.py b/testgres/node.py
@@ -1627,17 +1627,22 @@ def set_auto_conf(self, options, config='postgresql.auto.conf', rm_options={}):
             name, var = line.partition('=')[::2]
             name = name.strip()
             var = var.strip()
-            var = var.strip('"')
-            var = var.strip("'")
 
-            # remove options specified in rm_options list
+            # Handle quoted values and remove escaping
+            if var.startswith("'") and var.endswith("'"):
+                var = var[1:-1].replace("''", "'")
+
+            # Remove options specified in rm_options list
             if name in rm_options:
                 continue
 
             current_options[name] = var
 
         for option in options:
-            current_options[option] = options[option]
+            value = options[option]
+            if isinstance(value, str):
+                value = value.replace("'", "\\'")
+            current_options[option] = value
 
         auto_conf = ''
         for option in current_options:
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -1061,6 +1061,34 @@ def test_simple_with_bin_dir(self):
         except FileNotFoundError:
             pass  # Expected error
 
+    def test_set_auto_conf(self):
+        with get_new_node() as node:
+            node.init().start()
+
+            options = {
+                "archive_command": "cp '%p' \"/mnt/server/archivedir/%f\"",
+                'restore_command': 'cp "/mnt/server/archivedir/%f" \'%p\'',
+            }
+
+            node.set_auto_conf(options)
+            node.stop()
+            node.slow_start()
+
+            auto_conf_path = f"{node.data_dir}/postgresql.auto.conf"
+            with open(auto_conf_path, "r") as f:
+                content = f.read()
+                self.assertIn(
+                    "archive_command = 'cp \\'%p\\' \"/mnt/server/archivedir/%f\"",
+                    content,
+                    "archive_command stored wrong"
+                )
+                self.assertIn(
+                    "restore_command = 'cp \"/mnt/server/archivedir/%f\" \\'%p\\''",
+                    content,
+                    "restore_command stored wrong"
+                )
+
+
 
 if __name__ == '__main__':
     if os.environ.get('ALT_CONFIG'):
