From 65dd6d99b5f4b9709ad2c1d27f5cee2497d24e6d Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Thu, 1 Jul 1999 04:16:00 +0200
Subject: [PATCH] Small changes
Rev: lib/modules/Sql.pmod/sql.pike:1.32
---
lib/modules/Sql.pmod/sql.pike | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/lib/modules/Sql.pmod/sql.pike b/lib/modules/Sql.pmod/sql.pike
index 2486c52e5c..13710a0414 100644
--- a/lib/modules/Sql.pmod/sql.pike
+++ b/lib/modules/Sql.pmod/sql.pike
@@ -1,5 +1,5 @@
/*
- * $Id: sql.pike,v 1.31 1999/06/27 21:36:39 grubba Exp $
+ * $Id: sql.pike,v 1.32 1999/07/01 02:16:00 per Exp $
*
* Implements the generic parts of the SQL-interface
*
@@ -8,7 +8,7 @@
//.
//. File: sql.pike
-//. RCSID: $Id: sql.pike,v 1.31 1999/06/27 21:36:39 grubba Exp $
+//. RCSID: $Id: sql.pike,v 1.32 1999/07/01 02:16:00 per Exp $
//. Author: Henrik Grubbström (grubba@idonex.se)
//.
//. Synopsis: Implements the generic parts of the SQL-interface.
@@ -271,32 +271,30 @@ void create(void|string|object host, void|string db,
static private array(mapping(string:mixed)) res_obj_to_array(object res_obj)
{
- if (res_obj) {
+ if (res_obj)
+ {
/* Not very efficient, but sufficient */
array(mapping(string:mixed)) res = ({});
array(string) fieldnames;
array(mixed) row;
-
array(mapping) fields = res_obj->fetch_fields();
- fieldnames = Array.map(res_obj->fetch_fields(),
- lambda (mapping(string:mixed) m) {
- return((m->table||"") + "." + m->name);
- } ) +
- fields->name;
+ fieldnames = (Array.map(fields,
+ lambda (mapping(string:mixed) m) {
+ return((m->table||"") + "." + m->name);
+ }) +
+ fields->name);
- if (case_convert) {
+ if (case_convert)
fieldnames = Array.map(fieldnames, lower_case);
- }
- while (row = res_obj->fetch_row()) {
+
+ while (row = res_obj->fetch_row())
res += ({ mkmapping(fieldnames, row + row) });
- }
return(res);
- } else {
- return(0);
}
+ return 0;
}
//. - error
--
GitLab