# HG changeset patch
# User catherine@Elli.myhome.westell.com
# Date 1235769155 18000
# Node ID 6d9a65b442b52e0562c954ab620e9e2a24d1093b
# Parent  4c563c2218e6e57e672b4c1c4c87e8bb6b51d4a2
negative wildcards fixed

diff -r 4c563c2218e6 -r 6d9a65b442b5 sqlpython/sqlpyPlus.py
--- a/sqlpython/sqlpyPlus.py	Fri Feb 27 12:06:40 2009 -0500
+++ b/sqlpython/sqlpyPlus.py	Fri Feb 27 16:12:35 2009 -0500
@@ -371,7 +371,7 @@
         self.spoolFile = None
         self.autobind = False
         self.heading = True
-        self.wildsql = True
+        self.wildsql = False
 
     # overrides cmd's parseline
     def parseline(self, line):
@@ -547,7 +547,7 @@
                     included.discard(colname)
                     include_here = columns_available[:]
                     include_here.remove(colname)
-                    replacers[arg[startpos:endpos]].extend(include_here)
+                    replacers[arg[startpos:endpos]].extend(i for i in include_here if i not in replacers[arg[startpos:endpos]])
                     excluded.add(colname)
                 else:
                     #included.add(colname)
@@ -558,6 +558,7 @@
         result = columnlist.columns
         for (target, replacement) in replacers:
             cols = [r for r in replacement if r not in excluded and r not in included]
+            
             replacement = ', '.join(cols)
             included.update(cols)
             result = result.replace(target, replacement)