Index: friendlist_api/friendlist_api.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/friendlist/friendlist_api/friendlist_api.install,v
retrieving revision 1.1.2.10
diff -b -u -p -r1.1.2.10 friendlist_api.install
--- friendlist_api/friendlist_api.install	11 Oct 2008 18:47:28 -0000	1.1.2.10
+++ friendlist_api/friendlist_api.install	5 Jan 2009 16:19:15 -0000
@@ -231,7 +231,7 @@ function friendlist_api_install() {
   $record1->oneway = 0;
   $record1->active = 1;
   #$r1 = drupal_write_record('friendlist_relation_types', $record1);
-  db_query("INSERT INTO {friendlist_relation_types} set name='%s', name_p='%s', oneway=%d, active=%d", $record1->name, $record1->name_p, $record1->oneway, $record1->active);
+  db_query("INSERT INTO {friendlist_relation_types} (name, name_p, oneway, active) VALUES ('%s', '%s', %d, %d)", $record1->name, $record1->name_p, $record1->oneway, $record1->active);
 
 
   // Add the second default relation type: fans.
@@ -241,7 +241,7 @@ function friendlist_api_install() {
   $record2->oneway = 1;
   $record2->active = 1;
   #$r2 = drupal_write_record('friendlist_relation_types', $record2);
-  db_query("INSERT INTO {friendlist_relation_types} set name='%s', name_p='%s', oneway=%d, active=%d", $record2->name, $record2->name_p, $record2->oneway, $record2->active);
+  db_query("INSERT INTO {friendlist_relation_types} (name, name_p, oneway, active) VALUES ('%s', '%s', %d, %d)", $record2->name, $record2->name_p, $record2->oneway, $record2->active);
 
   #drupal_set_message("Results: $r1 , $r2");
 
Index: friendlist_api/friendlist_api.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/friendlist/friendlist_api/friendlist_api.module,v
retrieving revision 1.1.2.35
diff -b -u -p -r1.1.2.35 friendlist_api.module
--- friendlist_api/friendlist_api.module	29 Oct 2008 00:53:17 -0000	1.1.2.35
+++ friendlist_api/friendlist_api.module	5 Jan 2009 16:19:29 -0000
@@ -259,7 +259,7 @@ function friendlist_api_relation_type_ad
   }
 
   // All clear: create it.
-  $res = db_query("INSERT INTO {friendlist_relation_types} SET name = '%s',name_p = '%s', oneway = %d, active = %d", $name, $name_p, $oneway, $active);
+  $res = db_query("INSERT INTO {friendlist_relation_types} (name, name_p, oneway, active) VALUES ('%s', '%s', %d, %d)", $name, $name_p, $oneway, $active);
   if (!$res) {
     return FALSE;
   }
@@ -428,7 +428,7 @@ function friendlist_api_relation_add($re
   $result = db_fetch_object(db_query('SELECT * FROM {friendlist_relations} WHERE requester_id = %d AND requestee_id = %d AND rtid = %d', $requester, $requestee, $rtid));
   if (!$result) {
 
-    $result2 = db_query("INSERT INTO {friendlist_relations} SET requester_id = %d,requestee_id = %d,rtid = %d,message = '%s', create_time = %d", $requester, $requestee, $rtid, $message, time());
+    $result2 = db_query("INSERT INTO {friendlist_relations} (requester_id, requestee_id, rtid, message, create_time) VALUES (%d, %d, %d, '%s', %d)", $requester, $requestee, $rtid, $message, time());
 
     // Critical: could not add to the DB.
     if (!$result2) {
@@ -613,7 +613,8 @@ function friendlist_api_set_relation_fie
     return FALSE;
   }
 
-  db_query("UPDATE {friendlist_relations} SET $field_name = '%s' WHERE requester_id = %d AND requestee_id = %d AND rtid = %d", $field_value, $requester, $requestee, $rtid);
+  $field_name == 'message' ? $type = 'varchar' : $type = 'int' ;
+  db_query("UPDATE {friendlist_relations} SET $field_name = ". db_placeholders(array($field_name), $type) ." WHERE requester_id = %d AND requestee_id = %d AND rtid = %d", $field_value, $requester, $requestee, $rtid);
 
   return TRUE;
 }
@@ -760,7 +761,7 @@ function friendlist_api_relation_status_
     $query = "UPDATE {friendlist_statuses} SET status = '%s',rid_origin = %d, rid = %d, last_update_time = %d WHERE requester_id = %d AND requestee_id = %d AND rtid = %d";
   }
   else {
-    $query = "INSERT INTO {friendlist_statuses} SET status = '%s', rid_origin = %d, rid = %d, last_update_time = %d, requester_id = %d,requestee_id = %d,rtid = %d";
+    $query = "INSERT INTO {friendlist_statuses} (status, rid_origin, rid, last_update_time, requester_id, requestee_id, rtid) VALUES ('%s', %d, %d, %d, %d, %d, %d)";
   }
 
   $res = db_query($query, $new_status, $rid_origin, $rid, time(), $requester, $requestee, $rtid);
@@ -1054,7 +1055,8 @@ function friendlist_api_set_status_field
     return FALSE;
   }
 
-  db_query("UPDATE {friendlist_statuses} SET $field_name = '%s' WHERE requester_id = %d AND requestee_id = %d AND rtid = %d", $field_value, $requester, $requestee, $rtid);
+  $field_name == 'status' ? $type = 'varchar' : $type = 'int';
+  db_query("UPDATE {friendlist_statuses} SET $field_name = ". db_placeholders(array($field_name), $type) ." WHERE requester_id = %d AND requestee_id = %d AND rtid = %d", $field_value, $requester, $requestee, $rtid);
 
   return TRUE;
 }
Index: friendlist_import_bl2/friendlist_import_bl2.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/friendlist/friendlist_import_bl2/Attic/friendlist_import_bl2.module,v
retrieving revision 1.1.2.10
diff -b -u -p -r1.1.2.10 friendlist_import_bl2.module
--- friendlist_import_bl2/friendlist_import_bl2.module	20 Nov 2008 00:05:04 -0000	1.1.2.10
+++ friendlist_import_bl2/friendlist_import_bl2.module	5 Jan 2009 16:19:46 -0000
@@ -59,7 +59,7 @@ function friendlist_import_bl2_form_subm
   // Get the relation types from Buddylist.
   $r = db_query("SELECT * FROM {buddylist_relationtypes}");
   while ($row = db_fetch_object($r)) {
-    db_query("INSERT INTO {friendlist_relation_types} SET rtid = %d, name = '%s', name_p = '%s', oneway = '%s', active = %d", $row->rtid, $row->name, $row->name, $row->oneway, $row->active);
+    db_query("INSERT INTO {friendlist_relation_types} (rtid, name, name_p, oneway, active) VALUES (%d, '%s', '%s', %d, %d)", $row->rtid, $row->name, $row->name, $row->oneway, $row->active);
     if ($row->oneway) {
       $oneway_list[$row->rtid] = TRUE;
     }
@@ -93,7 +93,7 @@ function friendlist_import_bl2_form_subm
       friendlist_api_set_status_field($row->requestee_id, $row->requester_id, $row->rtid, 'last_update_time', $row->create_time);
 
 
-      db_query("UPDATE {friendlist_relations} SET create_time = %d, message = '%s' WHERE requester_id = '%d' AND requestee_id = %d AND rtid = %d", $row->create_time, $row->message, $row->requester_id, $row->requestee_id, $row->rtid);
+      db_query("UPDATE {friendlist_relations} SET create_time = %d, message = '%s' WHERE requester_id = %d AND requestee_id = %d AND rtid = %d", $row->create_time, $row->message, $row->requester_id, $row->requestee_id, $row->rtid);
 
       if ($row->state) {