summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesús Leganés Combarro "Piranna" <piranna@gmail.com>2011-08-13 15:48:02 +0200
committerJesús Leganés Combarro "Piranna" <piranna@gmail.com>2011-08-13 15:48:02 +0200
commit264b6d7c46b284492b72ab9e86d9960b3db3bbd8 (patch)
tree619629022c352e6dea8852d9bc64c2b2c5195d4a
parent5a1d58a6fc69ddc04abb8750e1cf2e156caa04ab (diff)
downloadsqlparse-264b6d7c46b284492b72ab9e86d9960b3db3bbd8.tar.gz
Changed ColumnsSelect from yielding tokens to yielding column names (strings)
-rw-r--r--sqlparse/filters.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sqlparse/filters.py b/sqlparse/filters.py
index cba7b8f..4d849cb 100644
--- a/sqlparse/filters.py
+++ b/sqlparse/filters.py
@@ -420,7 +420,7 @@ class ColumnsSelect(Filter):
elif mode == 1:
if value == 'FROM':
if oldValue:
- yield Name, oldValue
+ yield oldValue
mode = 3 # Columns have been checked
@@ -431,7 +431,7 @@ class ColumnsSelect(Filter):
elif (token_type == Punctuation
and value == ',' and not parenthesis):
if oldValue:
- yield Name, oldValue
+ yield oldValue
oldValue = ""
elif token_type not in Whitespace:
@@ -446,7 +446,7 @@ class ColumnsSelect(Filter):
elif mode == 2:
# We check also for Keywords because a bug in SQLParse
if token_type == Name or token_type == Keyword:
- yield Name, value
+ yield value
mode = 1