diff options
author | Darik Gamble <darik.gamble@gmail.com> | 2015-01-19 12:40:47 -0500 |
---|---|---|
committer | Darik Gamble <darik.gamble@gmail.com> | 2015-01-19 12:40:47 -0500 |
commit | 36f810aa7907208baeb76b69ee795784270d2caf (patch) | |
tree | ad6d74e88aac8c9c3612877d73374c6d84008e13 | |
parent | 4a71c1f166c68f5f154d815f7cf3426cef83717b (diff) |
escape_name and unescape_name should check for empty values before (un)escaping
-rw-r--r-- | pgcli/pgcompleter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pgcli/pgcompleter.py b/pgcli/pgcompleter.py index 95490aa6..4fb99b10 100644 --- a/pgcli/pgcompleter.py +++ b/pgcli/pgcompleter.py @@ -52,7 +52,7 @@ class PGCompleter(Completer): self.name_pattern = compile("^[_a-z][_a-z0-9\$]*$") def escape_name(self, name): - if ((not self.name_pattern.match(name)) + if name and not name=='*' and ((not self.name_pattern.match(name)) or (name.upper() in self.reserved_words) or (name.upper() in self.functions)): name = '"%s"' % name @@ -61,7 +61,7 @@ class PGCompleter(Completer): def unescape_name(self, name): """ Unquote a string.""" - if name[0] == '"' and name[-1] == '"': + if name and name[0] == '"' and name[-1] == '"': name = name[1:-1] return name |