- Patch #169982 by moshe, eaton, bjaspan, nedjo, yched, et al: missing feature from schema API: load/save records based upon schema.

3 files changed, 34 insertions, 69 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index 624a51e58..7e1865565 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -652,14 +652,22 @@ function node_load($param = array(), $revision = NULL, $reset = NULL) {
     return FALSE;
   }
 
+  // Retrieve a field list based on the site's schema.
+  $fields = drupal_schema_fields_sql('node', 'n');
+  $fields = array_merge($fields, drupal_schema_fields_sql('node_revisions', 'r'));
+  $fields = array_merge($fields, array('u.name', 'u.data'));
+  $fields = implode(', ', $fields);
+  // rename timestamp field for clarity.
+  $fields = str_replace('r.timestamp', 'r.timestamp AS revision_timestamp', $fields);
+
   // Retrieve the node.
   // No db_rewrite_sql is applied so as to get complete indexing for search.
   if ($revision) {
     array_unshift($arguments, $revision);
-    $node = db_fetch_object(db_query('SELECT n.nid, r.vid, n.type, n.status, n.language, n.created, n.changed, n.comment, n.promote, n.sticky, n.tnid, n.translate, r.timestamp AS revision_timestamp, r.title, r.body, r.teaser, r.log, r.format, u.uid, u.name, u.picture, u.data FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.nid = n.nid AND r.vid = %d WHERE '. $cond, $arguments));
+    $node = db_fetch_object(db_query('SELECT '. $fields. ' FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.nid = n.nid AND r.vid = %d WHERE '. $cond, $arguments));
   }
   else {
-    $node = db_fetch_object(db_query('SELECT n.nid, n.vid, n.type, n.status, n.language, n.created, n.changed, n.comment, n.promote, n.sticky, n.tnid, n.translate, r.timestamp AS revision_timestamp, r.title, r.body, r.teaser, r.log, r.format, u.uid, u.name, u.picture, u.data FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.vid = n.vid WHERE '. $cond, $arguments));
+    $node = db_fetch_object(db_query('SELECT '. $fields. ' FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.vid = n.vid WHERE '. $cond, $arguments));
   }
 
   if ($node && $node->nid) {
@@ -755,7 +763,6 @@ function node_submit($node) {
       $node->uid = 0;
     }
   }
-
   $node->created = !empty($node->date) ? strtotime($node->date) : time();
   $node->validated = TRUE;
 
@@ -777,16 +784,13 @@ function node_save(&$node) {
     // Insert a new node.
     $node->is_new = TRUE;
   }
+  elseif (!empty($node->revision)) {
+    $node->old_vid = $node->vid;
+  }
   else {
-    // We need to ensure that all node fields are filled.
-    $node_current = node_load($node->nid);
-    foreach ($node as $field => $data) {
-      $node_current->$field = $data;
-    }
-    $node = $node_current;
-
-    if (!empty($node->revision)) {
-      $node->old_vid = $node->vid;
+    // When updating a node, avoid clobberring an existing log entry with an empty one.
+    if (empty($node->log)) {
+      unset($node->log);
     }
   }
 
@@ -797,65 +801,24 @@ function node_save(&$node) {
   // The changed timestamp is always updated for bookkeeping purposes (revisions, searching, ...)
   $node->changed = time();
 
-  // Split off revisions data to another structure
-  $revisions_table_values = array('nid' => &$node->nid,
-                     'title' => $node->title, 'body' => isset($node->body) ? $node->body : '',
-                     'teaser' => $node->teaser, 'timestamp' => $node->changed,
-                     'uid' => $user->uid, 'format' => isset($node->format) ? $node->format : FILTER_FORMAT_DEFAULT);
-  $revisions_table_types = array('nid' => '%d',
-                     'title' => "'%s'", 'body' => "'%s'",
-                     'teaser' => "'%s'", 'timestamp' => '%d',
-                     'uid' => '%d', 'format' => '%d');
-  if (!empty($node->log) || $node->is_new || (isset($node->revision) && $node->revision)) {
-    // Only store the log message if there's something to store; this prevents
-    // existing log messages from being unintentionally overwritten by a blank
-    // message. A new revision will have an empty log message (or $node->log).
-    $revisions_table_values['log'] = !empty($node->log) ? $node->log : '';
-    $revisions_table_types['log'] = "'%s'";
-  }
-  $node_table_values = array(
-                    'title' => $node->title, 'type' => $node->type, 'uid' => $node->uid,
-                    'status' => $node->status, 'language' => $node->language, 'created' => $node->created,
-                    'changed' => $node->changed, 'comment' => $node->comment,
-                    'promote' => $node->promote, 'sticky' => $node->sticky);
-  $node_table_types = array(
-                    'title' => "'%s'", 'type' => "'%s'", 'uid' => '%d',
-                    'status' => '%d', 'language' => "'%s'", 'created' => '%d',
-                    'changed' => '%d', 'comment' => '%d',
-                    'promote' => '%d', 'sticky' => '%d');
+  $node->timestamp = time();
+  $node->format = isset($node->format) ? $node->format : FILTER_FORMAT_DEFAULT;
   $update_node = TRUE;
+
   //Generate the node table query and the
   //the node_revisions table query
   if ($node->is_new) {
-    $node_query = 'INSERT INTO {node} ('. implode(', ', array_keys($node_table_types)) .') VALUES ('. implode(', ', $node_table_types) .')';
-    db_query($node_query, $node_table_values);
-    $node->nid = db_last_insert_id('node', 'nid');
-    $revisions_query = 'INSERT INTO {node_revisions} ('. implode(', ', array_keys($revisions_table_types)) .') VALUES ('. implode(', ', $revisions_table_types) .')';
-    db_query($revisions_query, $revisions_table_values);
-    $node->vid = db_last_insert_id('node_revisions', 'vid');
+    drupal_write_record('node', $node);
+    drupal_write_record('node_revisions', $node);
     $op = 'insert';
   }
   else {
-    $arr = array();
-    foreach ($node_table_types as $key => $value) {
-      $arr[] = $key .' = '. $value;
-    }
-    $node_table_values[] = $node->nid;
-    $node_query = 'UPDATE {node} SET '. implode(', ', $arr) .' WHERE nid = %d';
-    db_query($node_query, $node_table_values);
+    drupal_write_record('node', $node, 'nid');
     if (!empty($node->revision)) {
-      $revisions_query = 'INSERT INTO {node_revisions} ('. implode(', ', array_keys($revisions_table_types)) .') VALUES ('. implode(', ', $revisions_table_types) .')';
-      db_query($revisions_query, $revisions_table_values);
-      $node->vid = db_last_insert_id('node_revisions', 'vid');
+      drupal_write_record('node_revisions', $node);
     }
     else {
-      $arr = array();
-      foreach ($revisions_table_types as $key => $value) {
-        $arr[] = $key .' = '. $value;
-      }
-      $revisions_table_values[] = $node->vid;
-      $revisions_query = 'UPDATE {node_revisions} SET '. implode(', ', $arr) .' WHERE vid = %d';
-      db_query($revisions_query, $revisions_table_values);
+      drupal_write_record('node_revisions', $node, 'vid');
       $update_node = FALSE;
     }
     $op = 'update';
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index b6734906e..cb58d93c7 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -180,7 +180,7 @@ function taxonomy_overview_terms($vocabulary) {
   if ($vocabulary->tags) {
     // We are not calling taxonomy_get_tree because that might fail with a big
     // number of tags in the freetagging vocabulary.
-    $results = pager_query(db_rewrite_sql('SELECT t.*, h.parent FROM {term_data} t INNER JOIN  {term_hierarchy} h ON t.tid = h.tid WHERE t.vid = %d ORDER BY weight, name', 't', 'tid'), $page_increment, 0, NULL, $vid);
+    $results = pager_query(db_rewrite_sql('SELECT t.*, h.parent FROM {term_data} t INNER JOIN  {term_hierarchy} h ON t.tid = h.tid WHERE t.vid = %d ORDER BY weight, name', 't', 'tid'), $page_increment, 0, NULL, $vocabulary->vid);
     while ($term = db_fetch_object($results)) {
       $rows[] = array(
         l($term->name, "taxonomy/term/$term->tid"),
@@ -207,7 +207,7 @@ function taxonomy_overview_terms($vocabulary) {
     $GLOBALS['pager_total'][] = intval($total_entries / $page_increment) + 1; // FIXME
   }
 
-  $output .= theme('table', $header, $rows, array('id' => 'taxonomy'));
+  $output = theme('table', $header, $rows, array('id' => 'taxonomy'));
   if ($vocabulary->tags || $total_entries >= $page_increment) {
     $output .= theme('pager', NULL, $page_increment);
   }
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 3fc560c22..fe8547bee 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -165,8 +165,12 @@ function taxonomy_menu() {
 function taxonomy_save_vocabulary(&$edit) {
   $edit['nodes'] = empty($edit['nodes']) ? array() : $edit['nodes'];
 
+  if (!isset($edit['module'])) {
+    $edit['module'] = 'taxonomy';
+  }
+
   if (!empty($edit['vid']) && !empty($edit['name'])) {
-    db_query("UPDATE {vocabulary} SET name = '%s', description = '%s', help = '%s', multiple = %d, required = %d, hierarchy = %d, relations = %d, tags = %d, weight = %d, module = '%s' WHERE vid = %d", $edit['name'], $edit['description'], $edit['help'], $edit['multiple'], $edit['required'], $edit['hierarchy'], $edit['relations'], $edit['tags'], $edit['weight'], isset($edit['module']) ? $edit['module'] : 'taxonomy', $edit['vid']);
+    drupal_write_record('vocabulary', $edit, 'vid');
     db_query("DELETE FROM {vocabulary_node_types} WHERE vid = %d", $edit['vid']);
     foreach ($edit['nodes'] as $type => $selected) {
       db_query("INSERT INTO {vocabulary_node_types} (vid, type) VALUES (%d, '%s')", $edit['vid'], $type);
@@ -178,8 +182,7 @@ function taxonomy_save_vocabulary(&$edit) {
     $status = taxonomy_del_vocabulary($edit['vid']);
   }
   else {
-    db_query("INSERT INTO {vocabulary} (name, description, help, multiple, required, hierarchy, relations, tags, weight, module) VALUES ('%s', '%s', '%s', %d, %d, %d, %d, %d, %d, '%s')", $edit['name'], isset($edit['description']) ? $edit['description'] : NULL, isset($edit['help']) ? $edit['help'] : NULL, $edit['multiple'], $edit['required'], $edit['hierarchy'], $edit['relations'], isset($edit['tags']) ? $edit['tags'] : NULL, $edit['weight'], isset($edit['module']) ? $edit['module'] : 'taxonomy');
-    $edit['vid'] = db_last_insert_id('vocabulary', 'vid');
+    drupal_write_record('vocabulary', $edit);
     foreach ($edit['nodes'] as $type => $selected) {
       db_query("INSERT INTO {vocabulary_node_types} (vid, type) VALUES (%d, '%s')", $edit['vid'], $type);
     }
@@ -231,7 +234,7 @@ function taxonomy_save_term(&$form_values) {
   );
 
   if (!empty($form_values['tid']) && $form_values['name']) {
-    db_query("UPDATE {term_data} SET name = '%s', description = '%s', weight = %d WHERE tid = %d", $form_values['name'], $form_values['description'], $form_values['weight'], $form_values['tid']);
+    drupal_write_record('term_data', $form_values, 'tid');
     $hook = 'update';
     $status = SAVED_UPDATED;
   }
@@ -239,8 +242,7 @@ function taxonomy_save_term(&$form_values) {
     return taxonomy_del_term($form_values['tid']);
   }
   else {
-    db_query("INSERT INTO {term_data} (name, description, vid, weight) VALUES ('%s', '%s', %d, %d)", $form_values['name'], $form_values['description'], $form_values['vid'], $form_values['weight']);
-    $form_values['tid'] = db_last_insert_id('term_data', 'tid');
+    drupal_write_record('term_data', $form_values);
     $hook = 'insert';
     $status = SAVED_NEW;
   }