Narrow quote_ident's scope.

James William Pye · James William Pye · commit 50e1d40514ef · 2009-04-23T20:05:51.000-07:00
This allows identifiers that contain "_"'s and non-leading decimals to not
require quotation.

 foo_bar -&gt; foo_bar
 _uscore -&gt; _uscore
 foo1 -&gt; foo1
 1foo -&gt; "1foo"
diff --git a/postgresql/string.py b/postgresql/string.py
@@ -30,10 +30,12 @@ def escape_ident(text):
 
 def quote_ident(text):
 	"""
-	If needed, replace every instance of " with "" *and* place " on each end
-	Otherwise, just return the text.
+	If needed, replace every instance of '"' with '""' *and* place '"' on each
+	end. Otherwise, just return the text.
 	"""
-	if not text.isalpha():
+	if not text or text[0].isdecimal() or (
+		not text.replace('_', 'a').isalnum()
+	):
 		return '"' + text.replace('"', '""') + '"'
 	return text
 
diff --git a/postgresql/test/test_string.py b/postgresql/test/test_string.py
@@ -226,6 +226,26 @@ def test_quotes(self):
 			pg_str.quote_literal("""\\foo'bar\\"""),
 			"""'\\foo''bar\\'"""
 		)
+		self.failUnlessEqual(
+			pg_str.quote_ident("foo"),
+			"foo"
+		)
+		self.failUnlessEqual(
+			pg_str.quote_ident("0foo"),
+			'"0foo"'
+		)
+		self.failUnlessEqual(
+			pg_str.quote_ident("foo0"),
+			'foo0'
+		)
+		self.failUnlessEqual(
+			pg_str.quote_ident("_"),
+			'_'
+		)
+		self.failUnlessEqual(
+			pg_str.quote_ident("_9"),
+			'_9'
+		)
 		self.failUnlessEqual(
 			pg_str.quote_ident('''\\foo'bar\\'''),
 			'''"\\foo'bar\\"'''
