Improved handling of invalid identifiers, like for example "a.".

2 files changed, 26 insertions, 2 deletions

diff --git a/sqlparse/sql.py b/sqlparse/sql.py
index 3ab93ba..2d94440 100644
--- a/sqlparse/sql.py
+++ b/sqlparse/sql.py
@@ -325,8 +325,24 @@ class Identifier(TokenList):
         if dot is None:
             return self.token_next_by_type(0, T.Name).value
         else:
-            return self.token_next_by_type(self.token_index(dot),
-                                           (T.Name, T.Wildcard)).value
+            next_ = self.token_next_by_type(self.token_index(dot),
+                                            (T.Name, T.Wildcard))
+            if next_ is None:  # invalid identifier, e.g. "a."
+                return None
+            return next_.value
+
+    def get_parent_name(self):
+        """Return name of the parent object if any.
+
+        A parent object is identified by the first occuring dot.
+        """
+        dot = self.token_next_match(0, T.Punctuation, '.')
+        if dot is None:
+            return None
+        prev_ = self.token_prev(self.token_index(dot))
+        if prev_ is None:  # something must be verry wrong here..
+            return None
+        return prev_.value
 
     def is_wildcard(self):
         """Return ``True`` if this identifier contains a wildcard."""
diff --git a/tests/test_grouping.py b/tests/test_grouping.py
index f3617ad..3c32b18 100644
--- a/tests/test_grouping.py
+++ b/tests/test_grouping.py
@@ -55,6 +55,14 @@ class TestGrouping(TestCaseBase):
         self.assertEqual(t.get_name(), '*')
         self.assertEqual(t.is_wildcard(), True)
 
+    def test_indentifier_invalid(self):
+        p = sqlparse.parse('a.')[0]
+        self.assert_(isinstance(p.tokens[0], Identifier))
+        self.assertEqual(p.tokens[0].has_alias(), False)
+        self.assertEqual(p.tokens[0].get_name(), None)
+        self.assertEqual(p.tokens[0].get_real_name(), None)
+        self.assertEqual(p.tokens[0].get_parent_name(), 'a')
+
     def test_identifier_list(self):
         p = sqlparse.parse('a, b, c')[0]
         self.assert_(isinstance(p.tokens[0], IdentifierList))