Handle wildcards in identifiers.

andialbrecht · andialbrecht · commit be3b2d73ef11 · 2009-04-24T15:05:23.000+02:00
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
@@ -102,7 +102,9 @@ def group_case(tlist):
 def group_identifier(tlist):
     def _consume_cycle(tl, i):
         x = itertools.cycle((lambda y: y.match(T.Punctuation, '.'),
-                             lambda y: y.ttype in (T.String.Symbol, T.Name)))
+                             lambda y: y.ttype in (T.String.Symbol,
+                                                   T.Name,
+                                                   T.Wildcard)))
         for t in tl.tokens[i:]:
             if x.next()(t):
                 yield t
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
@@ -320,7 +320,18 @@ def get_name(self):
 
     def get_real_name(self):
         """Returns the real name (object name) of this identifier."""
-        return self.token_next_by_type(0, T.Name).value
+        # a.b
+        dot = self.token_next_match(0, T.Punctuation, '.')
+        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
+
+    def is_wildcard(self):
+        """Return ``True`` if this identifier contains a wildcard."""
+        token = self.token_next_by_type(0, T.Wildcard)
+        return token is not None
 
     def get_typecast(self):
         """Returns the typecast or ``None`` of this object as a string."""
diff --git a/tests/test_format.py b/tests/test_format.py
@@ -134,6 +134,11 @@ def test_identifier_list(self):
                                                'from table1,',
                                                '     table2',
                                                'where 1 = 2']))
+        s = 'select a.*, b.id from a, b'
+        self.ndiffAssertEqual(f(s), '\n'.join(['select a.*,',
+                                               '       b.id',
+                                               'from a,',
+                                               '     b']))
 
     def test_case(self):
         f = lambda sql: sqlparse.format(sql, reindent=True)
diff --git a/tests/test_grouping.py b/tests/test_grouping.py
@@ -43,6 +43,18 @@ def test_identifiers(self):
         self.ndiffAssertEqual(s, parsed.to_unicode())
         self.assert_(isinstance(parsed.tokens[-1].tokens[3], Identifier))
 
+    def test_identifier_wildcard(self):
+        p = sqlparse.parse('a.*, b.id')[0]
+        self.assert_(isinstance(p.tokens[0], IdentifierList))
+        self.assert_(isinstance(p.tokens[0].tokens[0], Identifier))
+        self.assert_(isinstance(p.tokens[0].tokens[-1], Identifier))
+
+    def test_identifier_name_wildcard(self):
+        p = sqlparse.parse('a.*')[0]
+        t = p.tokens[0]
+        self.assertEqual(t.get_name(), '*')
+        self.assertEqual(t.is_wildcard(), True)
+
     def test_where(self):
         s = 'select * from foo where bar = 1 order by id desc'
         p = sqlparse.parse(s)[0]
