[Zope-Checkins] SVN: Zope/trunk/ reverting change in sql.test.py

[Andreas Jung]

Log message for revision 28005:
  reverting change in sql.test.py
  


Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Shared/DC/ZRDB/sqltest.py


-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2004-10-12 13:46:20 UTC (rev 28004)
+++ Zope/trunk/doc/CHANGES.txt	2004-10-12 13:51:02 UTC (rev 28005)
@@ -27,10 +27,6 @@
 
     Features added
 
-     - ZSQL methods: added  workaround for a problem where a 'string' argument
-       variable was included into the generated query if the 'optional' flag inside
-       dtml-sqltest was set an if the value of the string was empty.
-
      - Included Stefan Holek's ZopeTestCase 0.9
 
      - The SiteErrorLog allows you to acknowledge (or delete) exceptions,

Modified: Zope/trunk/lib/python/Shared/DC/ZRDB/sqltest.py
===================================================================
--- Zope/trunk/lib/python/Shared/DC/ZRDB/sqltest.py	2004-10-12 13:46:20 UTC (rev 28004)
+++ Zope/trunk/lib/python/Shared/DC/ZRDB/sqltest.py	2004-10-12 13:51:02 UTC (rev 28005)
@@ -159,13 +159,6 @@
                     raise ValueError, (
                         'Invalid floating-point value for <em>%s</em>' % name)
 
-            ## ZSQL methods: added  workaround for a problem where a 'string' argument
-            ## variable was included into the generated query if the 'optional' flag inside
-            ## dtml-sqltest was set an if the value of the string was empty.
-
-            elif t=='string' and len(str(v)) == 0  and args.get('optional', 0):
-                continue
-
             else:
                 v=str(v)
                 v=md.getitem('sql_quote__',0)(v)