From 6b43206ffc7666d4b041cebfae8b81f2d9f59ddf Mon Sep 17 00:00:00 2001
From: Martin Nilsson <mani@lysator.liu.se>
Date: Sun, 10 Apr 2005 05:50:27 +0200
Subject: [PATCH] Minor improvements

Rev: lib/modules/Sql.pmod/sql_array_result.pike:1.2
Rev: lib/modules/Sql.pmod/sql_object_result.pike:1.2
Rev: lib/modules/Sql.pmod/sql_result.pike:1.14
---
 lib/modules/Sql.pmod/sql_array_result.pike  | 10 ++++++----
 lib/modules/Sql.pmod/sql_object_result.pike |  8 +++++---
 lib/modules/Sql.pmod/sql_result.pike        |  8 ++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/modules/Sql.pmod/sql_array_result.pike b/lib/modules/Sql.pmod/sql_array_result.pike
index e1b25d4382..d83a7669d1 100644
--- a/lib/modules/Sql.pmod/sql_array_result.pike
+++ b/lib/modules/Sql.pmod/sql_array_result.pike
@@ -1,12 +1,14 @@
 
+#pike __REAL_VERSION__
+
 inherit .sql_result;
 
 array master_res;
 
 void create(array res) {
-  master_res = res;
   if(!res || !arrayp(res))
-    error("Bad argument to sql_array_result\n");
+    error("Bad argument.\n");
+  master_res = res;
 }
 
 int num_rows() {
@@ -21,8 +23,8 @@ int eof() {
   return index >= sizeof(master_res);
 }
 
+// Only supports the name field.
 array(mapping(string:mixed)) fetch_fields() {
-  /* Only supports the name field */
   array(mapping(string:mixed)) res = allocate(sizeof(master_res[0]));
   int i;
 
@@ -33,7 +35,7 @@ array(mapping(string:mixed)) fetch_fields() {
 }
 
 void seek(int skip) {
-  if(skip<0) error("Skip argument not positive\n");
+  if(skip<0) error("Skip argument not positive.\n");
   index += skip;
 }
 
diff --git a/lib/modules/Sql.pmod/sql_object_result.pike b/lib/modules/Sql.pmod/sql_object_result.pike
index 2cb8ac56cf..9cd83c7dbd 100644
--- a/lib/modules/Sql.pmod/sql_object_result.pike
+++ b/lib/modules/Sql.pmod/sql_object_result.pike
@@ -1,12 +1,14 @@
 
+#pike __REAL_VERSION__
+
 inherit .sql_result;
 
 object master_res;
 
 void create(object res) {
-  master_res = res;
   if(!res || !objectp(res))
-    error("Bad argument to sql_array_result\n");
+    error("Bad argument.\n");
+  master_res = res;
 }
 
 int num_rows() {
@@ -24,7 +26,7 @@ array(mapping(string:mixed)) fetch_fields() {
 void seek(int skip) {
 
   if(functionp(master_res->seek)) {
-    if(skip<0) error("Skip argument not positive\n");
+    if(skip<0) error("Skip argument not positive.\n");
     index += skip;
     master_res->seek(skip);
   }
diff --git a/lib/modules/Sql.pmod/sql_result.pike b/lib/modules/Sql.pmod/sql_result.pike
index a81722d058..651ab1a31b 100644
--- a/lib/modules/Sql.pmod/sql_result.pike
+++ b/lib/modules/Sql.pmod/sql_result.pike
@@ -1,5 +1,5 @@
 /*
- * $Id: sql_result.pike,v 1.13 2005/04/10 03:29:40 nilsson Exp $
+ * $Id: sql_result.pike,v 1.14 2005/04/10 03:50:27 nilsson Exp $
  *
  * Implements the generic result module of the SQL-interface
  *
@@ -26,9 +26,9 @@ static void create(mixed res);
 static string _sprintf(int type, mapping|void flags)
 {
   int f;
-  return type=='O' && sprintf("%O(/* row %d/%d, %d field%s */)",
-			      this_program, index, num_rows(),
-			      f=num_fields(), f>1?"s":"");
+  return type=='O' && master_res && sprintf("%O(/* row %d/%d, %d field%s */)",
+					    this_program, index, num_rows(),
+					    f=num_fields(), f>1?"s":"");
 }
 
 //! Returns the number of rows in the result.
-- 
GitLab