[PATCH 02/17] Simplify logic, drop redundant code

[Stephen R. van den Berg]

---

 server/modules/database/sqltag.pike |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/server/modules/database/sqltag.pike 
b/server/modules/database/sqltag.pike
index d0186ac..fdc0eae 100644
--- a/server/modules/database/sqltag.pike
+++ b/server/modules/database/sqltag.pike
@@ -637,20 +637,13 @@ class SqlEmitResponse {
        }
       }
     }
-
     else
       val = map(val, lambda(mixed x) {
-                      if (x) return x;
-                      // Might be a dbnull object which considers
-                      // itself false (e.g. in the oracle glue).
-                      if ((x != 0) && stringp(x->type))
-                        // Transform NULLString to "".
-                        return x->type;
-                      // It's 0 or a null object. Treat it as the value
+                      // If it's a null object. Treat it as the value
                       // doesn't exist at all (ideally there should be
                       // some sort of dbnull value at the rxml level
                       // too to tell these cases apart).
-                      return RXML.nil;
+                      return x ? x : RXML.nil;
                     });
 
     return mkmapping(cols, val);