Be sure to properly quote new settings.

James William Pye · James William Pye · commit bde69d9831ff · 2009-03-14T15:46:01.000-07:00
Change pg_dotconf to comment settings when no '=' is present.
diff --git a/postgresql/bin/pg_dotconf.py b/postgresql/bin/pg_dotconf.py
@@ -1,16 +1,16 @@
 #!/usr/bin/env python
 import sys
 from optparse import OptionParser
-from postgresql.configfile import pg_cf
+from .. import configfile as pg_cf
 
-__all__ = ['pg_dotconf']
+__all__ = ['command']
 
 def command(args):
 	"""
 	pg_dotconf script entry point.
 	"""
 	op = OptionParser(
-		"%prog [--stdout] [-f settings] config_file_src [param=val]+",
+		"%prog [--stdout] [-f settings] config_file_src ([param=val]|[param])+",
 		version = '0'
 	)
 	op.add_option(
@@ -41,15 +41,9 @@ def command(args):
 						settings[line[pl[0]]] = unquote(line[pl[1]])
 
 	for p in ca[1:]:
-		if p.startswith('#'):
-			k = p[1:]
+		if '=' not in p:
+			k = p
 			v = None
-		elif '=' not in p:
-			sys.stderr.write(
-				"ERROR: setting parameter, %r, does not have '=' " \
-				"to separate setting name from setting value"
-			)
-			return 1
 		else:
 			k, v = p.split('=', 1)
 		settings[k] = v
diff --git a/postgresql/configfile.py b/postgresql/configfile.py
@@ -125,7 +125,7 @@ def alter_config(
 			if val is not None:
 				if not lines[-1].endswith(os.linesep):
 					lines[-1] = lines[-1] + os.linesep
-				lines.append('%s = %s' %(key, val))
+				lines.append("%s = '%s'" %(key, val.replace("'", "''")))
 
 	# Multiple lines may have the key, so make a decision based on the value.
 	for ck in candidates.keys():
@@ -211,12 +211,14 @@ def read_config(iter, d = None, selector = None):
 
 class ConfigFile(pg_api.Settings):
 	"""
-	Provides a dictionary mapping interface to a configuration file.
+	Provides a mapping interface to a configuration file.
 
-	Every action will cause the file to be wholly read.
+	Every action will cause the file to be wholly read, so using `update` to make
+	multiple changes is desirable.
 	"""
 	ife_ancestor = None
 	ife_label = 'CONFIGFILE'
+
 	def ife_snapshot_text(self):
 		s = (os.linesep+' ').join(
 			k + ' = ' + v for k,v in self.items()
diff --git a/postgresql/test/test_configfile.py b/postgresql/test/test_configfile.py
@@ -108,6 +108,24 @@
 		{'foo' : 'newval'},
 		"foo = 'newval'#foo this should be commented"
 	),
+	(
+		# New setting in empty string
+		"",
+		{'bar' : 'newvar'},
+		"bar = 'newvar'",
+	),
+	(
+		# New setting
+		"foo = 'bar'",
+		{'bar' : 'newvar'},
+		"foo = 'bar'\nbar = 'newvar'",
+	),
+	(
+		# New setting with quote escape
+		"foo = 'bar'",
+		{'bar' : "new'var"},
+		"foo = 'bar'\nbar = 'new''var'",
+	),
 ]
 
 class test_configfile(unittest.TestCase):
