# HG changeset patch
# User catherine@Elli.myhome.westell.com
# Date 1235754400 18000
# Node ID 4c563c2218e6e57e672b4c1c4c87e8bb6b51d4a2
# Parent  254fb9d3f4c3624784ce7d2d0c0c40a037b39e8e
catching standard names caught

diff -r 254fb9d3f4c3 -r 4c563c2218e6 sqlpython/sqlpyPlus.py
--- a/sqlpython/sqlpyPlus.py	Fri Feb 27 07:17:18 2009 -0500
+++ b/sqlpython/sqlpyPlus.py	Fri Feb 27 12:06:40 2009 -0500
@@ -514,6 +514,13 @@
         except pyparsing.ParseException:
             return arg
         parseresults = list(self.wildSqlParser.scanString(columnlist.columns))
+        # I would rather exclude non-wild column names in the grammar,
+        # but can't figure out how
+        parseresults = [p for p in parseresults if 
+                        p[0].column_number or 
+                        '*' in p[0].column_name or
+                        '%' in p[0].column_name or
+                        p[0].exclude]
         if not parseresults:
             return arg       
         self.curs.execute('select * ' + columnlist.remainder, self.varsUsed)