summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2014-11-25 02:30:32 -0800
committerToshio Kuratomi <toshio@fedoraproject.org>2014-11-25 02:30:32 -0800
commit199d6c0b8bbd62d0a378deb157b326fd2e396cc7 (patch)
treea5b83580302f4a02972edaedd0a512f5869bb63e
parent8e7447962e4d53e4cb94602cd76592364ae13740 (diff)
downloadansible-199d6c0b8bbd62d0a378deb157b326fd2e396cc7.tar.gz
Fix some problems with the generic quote char
-rw-r--r--lib/ansible/module_utils/database.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ansible/module_utils/database.py b/lib/ansible/module_utils/database.py
index 3c8bdaab80..50defb15d6 100644
--- a/lib/ansible/module_utils/database.py
+++ b/lib/ansible/module_utils/database.py
@@ -38,7 +38,7 @@ class UnclosedQuoteError(SQLParseError):
_PG_IDENTIFIER_TO_DOT_LEVEL = dict(database=1, schema=2, table=3, column=4, role=1)
_MYSQL_IDENTIFIER_TO_DOT_LEVEL = dict(database=1, table=2, column=3, role=1, vars=1)
-def _find_end_quote(identifier, quote_char='"'):
+def _find_end_quote(identifier, quote_char):
accumulate = 0
while True:
try:
@@ -60,7 +60,7 @@ def _find_end_quote(identifier, quote_char='"'):
return accumulate
-def _identifier_parse(identifier, quote_char='"'):
+def _identifier_parse(identifier, quote_char):
if not identifier:
raise SQLParseError('Identifier name unspecified or unquoted trailing dot')
@@ -77,10 +77,10 @@ def _identifier_parse(identifier, quote_char='"'):
dot = end_quote + 1
first_identifier = identifier[:dot]
next_identifier = identifier[dot+1:]
- further_identifiers = _identifier_parse(next_identifier)
+ further_identifiers = _identifier_parse(next_identifier, quote_char)
further_identifiers.insert(0, first_identifier)
else:
- raise SQLParseError('User escaped identifiers must escape extra double quotes')
+ raise SQLParseError('User escaped identifiers must escape extra quotes')
else:
further_identifiers = [identifier]
@@ -99,7 +99,7 @@ def _identifier_parse(identifier, quote_char='"'):
else:
first_identifier = identifier[:dot]
next_identifier = identifier[dot+1:]
- further_identifiers = _identifier_parse(next_identifier)
+ further_identifiers = _identifier_parse(next_identifier, quote_char)
first_identifier = first_identifier.replace(quote_char, quote_char*2)
first_identifier = ''.join((quote_char, first_identifier, quote_char))
further_identifiers.insert(0, first_identifier)