Merge pull request andialbrecht#397 from fredyw/issue_369

andialbrecht · web-flow · commit 1df9178ed833 · 2018-03-22T07:51:13.000+01:00
Fix issue with get_real_name returning incorrect name
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
@@ -358,7 +358,7 @@ def get_real_name(self):
         """Returns the real name (object name) of this identifier."""
         # a.b
         dot_idx, _ = self.token_next_by(m=(T.Punctuation, '.'))
-        return self._get_first_name(dot_idx)
+        return self._get_first_name(dot_idx, real_name=True)
 
     def get_parent_name(self):
         """Return name of the parent object if any.
@@ -369,7 +369,8 @@ def get_parent_name(self):
         _, prev_ = self.token_prev(dot_idx)
         return remove_quotes(prev_.value) if prev_ is not None else None
 
-    def _get_first_name(self, idx=None, reverse=False, keywords=False):
+    def _get_first_name(self, idx=None, reverse=False, keywords=False,
+                        real_name=False):
         """Returns the name of the first token with a name"""
 
         tokens = self.tokens[idx:] if idx else self.tokens
@@ -383,7 +384,7 @@ def _get_first_name(self, idx=None, reverse=False, keywords=False):
             if token.ttype in types:
                 return remove_quotes(token.value)
             elif isinstance(token, (Identifier, Function)):
-                return token.get_name()
+                return token.get_real_name() if real_name else token.get_name()
 
 
 class Statement(TokenList):
diff --git a/tests/test_parse.py b/tests/test_parse.py
@@ -424,3 +424,12 @@ def test_non_ascii():
     statement = stmts[0]
     assert text_type(statement) == _test_non_ascii
     assert statement._pprint_tree() is None
+
+
+def test_get_real_name():
+    # issue 369
+    s = u"update a t set t.b=1"
+    stmts = sqlparse.parse(s)
+    assert len(stmts) == 1
+    assert 'a' == stmts[0].get_real_name()
+    assert 't' == stmts[0].get_alias()
