Index: devel_generate.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/devel/devel_generate.inc,v
retrieving revision 1.14
diff -u -p -r1.14 devel_generate.inc
--- devel_generate.inc	15 Dec 2007 01:56:31 -0000	1.14
+++ devel_generate.inc	3 Apr 2008 08:53:39 -0000
@@ -16,7 +16,7 @@ if (!ini_get('safe_mode')) {
 function devel_create_users($num, $kill) {
   $url = parse_url($GLOBALS['base_url']);
   if ($kill) {
-    db_query('DELETE FROM {users} WHERE uid > 1');
+    db_query('DELETE FROM [{users}] WHERE [uid] > 1');
     drupal_set_message(t('Users deleted.'));
   }
   for ($i = 0; $i < $num; $i++) {
@@ -25,14 +25,14 @@ function devel_create_users($num, $kill)
     $pass = md5(user_password());
     $mail = $name .'@'. $url['host'];
     $now = time();
-    db_query("INSERT INTO {users} (name, pass, mail, status, created, access) VALUES ('%s', '%s', '%s', %d, %d, %d)", $name, $pass, $mail, 1, $now, $now);
+    db_query("INSERT INTO [{users}] ([name], [pass], [mail], [status], [created], [access]) VALUES (%s, %s, %s, %d, %d, %d)", $name, $pass, $mail, 1, $now, $now);
   }
   drupal_set_message(t('!num_users created.', array('!num_users' => format_plural($num, '1 user', '@count users'))));
 }
 
 function devel_generate_content($num_nodes, $num_comments, $title_length, $kill, $add_upload = FALSE, $add_terms = FALSE, $add_alias = FALSE, $node_types) {
   if ($kill) {
-    $sql = 'SELECT nid FROM {node} WHERE type IN ('. db_placeholders($node_types, 'text'). ')';
+    $sql = 'SELECT [nid] FROM [{node}] WHERE [type] IN ('. db_placeholders($node_types, 'text'). ')';
     $result = db_query($sql, $node_types);
     while ($row = db_fetch_object($result)) {
       node_delete($row->nid);
@@ -112,10 +112,10 @@ function devel_generate_add_comments($no
 
     switch ($i % 3) {
       case 1:
-        $comment->pid = db_result(db_query_range("SELECT cid FROM {comments} WHERE pid = 0 AND nid = %d ORDER BY RAND()", $comment->nid, 0, 1));
+        $comment->pid = db_result(db_query_range("SELECT [cid] FROM [{comments}] WHERE [pid] = 0 AND [nid] = %d ORDER BY ". DB_RAND, $comment->nid, 0, 1));
         break;
       case 2:
-        $comment->pid = db_result(db_query("SELECT cid FROM {comments} WHERE pid > 0 AND nid = %d ORDER BY RAND()", $comment->nid, 0, 1));
+        $comment->pid = db_result(db_query("SELECT [cid] FROM [{comments}] WHERE [pid] > 0 AND [nid] = %d ORDER BY ". DB_RAND, $comment->nid, 0, 1));
         break;
       default:
         $comment->pid = 0;
@@ -168,7 +168,7 @@ function devel_generate_terms($records, 
         break;
       case 2:
       default:
-        $parent = db_fetch_object(db_query_range("SELECT t.tid, v.vid FROM {term_data} t INNER JOIN {vocabulary} v ON t.vid = v.vid ORDER BY RAND()", 0, 1));
+        $parent = db_fetch_object(db_query_range("SELECT t.[tid], v.[vid] FROM [{term_data}] t INNER JOIN [{vocabulary}] v ON t.[vid] = v.[vid] ORDER BY ". DB_RAND, 0, 1));
         $term['parent'] = array($parent->tid);
         $term['vid'] = $parent->vid;
         break;
@@ -192,7 +192,7 @@ function devel_generate_terms($records, 
 
 function devel_generate_get_vocabs() {
   $vocs = array();
-  $result = db_query("SELECT vid FROM {vocabulary}");
+  $result = db_query("SELECT [vid] FROM [{vocabulary}]");
   while($voc = db_fetch_object($result)){
     $vocs[] = $voc->vid;
   }
@@ -202,13 +202,13 @@ function devel_generate_get_vocabs() {
 function devel_generate_taxonomy_data($num_vocab, $num_terms, $title_length, $kill) {
 
   if ($kill) {
-    db_query("DELETE FROM {term_data}");
-    db_query("DELETE FROM {term_node}");
-    db_query("DELETE FROM {term_hierarchy}");
-    db_query("DELETE FROM {term_relation}");
-    db_query("DELETE FROM {term_synonym}");
-    db_query("DELETE FROM {vocabulary}");
-    db_query("DELETE FROM {vocabulary_node_types}");
+    db_query("DELETE FROM [{term_data}]");
+    db_query("DELETE FROM [{term_node}]");
+    db_query("DELETE FROM [{term_hierarchy}]");
+    db_query("DELETE FROM [{term_relation}]");
+    db_query("DELETE FROM [{term_synonym}]");
+    db_query("DELETE FROM [{vocabulary}]");
+    db_query("DELETE FROM [{vocabulary_node_types}]");
     switch ($GLOBALS['db_type']) {
       case 'mysql':
       case 'mysqli':
@@ -362,7 +362,7 @@ function devel_create_greeking($words, $
 function devel_generate_add_terms(&$node) {
   $vocabs = taxonomy_get_vocabularies($node->type);
   foreach ($vocabs as $vocab) {
-    $sql = "SELECT tid FROM {term_data} WHERE vid = %d ORDER BY RAND()";
+    $sql = "SELECT [tid] FROM [{term_data}] WHERE [vid] = %d ORDER BY ". DB_RAND;
     $result = db_query_range($sql, $vocab->vid, 0, 5);
     while ($row = db_fetch_object($result)) {
       if ($vocab->tags) {
@@ -380,7 +380,7 @@ function devel_generate_add_terms(&$node
 
 function devel_get_users() {
   $users = array();
-  $result = db_query_range("SELECT uid FROM {users}", 0, 50);
+  $result = db_query_range("SELECT [uid] FROM [{users}]", 0, 50);
   while($user = db_fetch_object($result)){
     $users[] = $user->uid;
   }
@@ -402,7 +402,7 @@ function devel_generate_add_upload(&$nod
   $file->filesize = $size;
 
   // If we made it this far it's safe to record this file in the database.
-  db_query("INSERT INTO {files} (uid, filename, filepath, filemime, filesize, status, timestamp) VALUES (%d, '%s', '%s', '%s', %d, %d, %d)", $node->uid, $file->filename, $file->filepath, $file->filemime, $file->filesize, FILE_STATUS_TEMPORARY, time());
+  db_query("INSERT INTO [{files}] ([uid], [filename], [filepath], [filemime], [filesize], [status], [timestamp]) VALUES (%d, %s, %s, %s, %d, %d, %d)", $node->uid, $file->filename, $file->filepath, $file->filemime, $file->filesize, FILE_STATUS_TEMPORARY, time());
   $file->fid = db_last_insert_id('files', 'fid');
   
   $_SESSION['upload_files'][$file->fid] = $file;
@@ -460,4 +460,4 @@ function devel_generate_fields(&$node) {
       $node->$field['field_name'] = $return;
     }
   }
-}
\ No newline at end of file
+}
Index: devel_generate.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/devel/devel_generate.info,v
retrieving revision 1.5
diff -u -p -r1.5 devel_generate.info
--- devel_generate.info	21 Jun 2007 02:53:15 -0000	1.5
+++ devel_generate.info	3 Apr 2008 08:53:39 -0000
@@ -2,4 +2,4 @@
 name = Devel Generate
 description = Generate dummy users, nodes, and taxonomy terms.
 package = Development
-core = 6.x
+core = 7.x