From: vyshane <vyshane>
Date: Mon, 27 Mar 2006 06:19:34 +0000 (+0000)
Subject: Fix for Bug #4978 - Every time I add one field in one DB activity...
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b395a1e44afeb46d205ceace960a00098d0d566a;p=moodle.git

Fix for Bug #4978 - Every time I add one field in one DB activity...
Added AS df in SQL query in data_fieldname_exists(). Reformatted the strings
to use single quotes when quoting in SQL. These changes might solve PostgreSQL
problems.
---

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 932c26283b..cdb734af48 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1185,12 +1185,12 @@ function data_fieldname_exists($name, $dataid, $fieldid=0) {
     global $CFG;
 
     if ($fieldid) { 
-        return record_exists_sql('SELECT * from '.$CFG->prefix.'data_fields 
-                                  WHERE name LIKE "'.$name.'" AND dataid = '.$dataid.'
-                                    AND ((id < '.$fieldid.') OR (id > '.$fieldid.'))');
+        return record_exists_sql("SELECT * from {$CFG->prefix}data_fields AS df 
+                                  WHERE df.name LIKE '$name' AND df.dataid = $dataid
+                                    AND ((df.id < $fieldid) OR (df.id > $fieldid))");
     } else {
-        return record_exists_sql('SELECT * from '.$CFG->prefix.'data_fields 
-                                  WHERE name LIKE "'.$name.'" AND dataid = '.$dataid);
+        return record_exists_sql("SELECT * from {$CFG->prefix}data_fields AS df 
+                                  WHERE df.name LIKE '$name' AND df.dataid = $dataid");
     }
 }