diff options
| author | Dries Buytaert <dries@buytaert.net> | 2002-08-20 19:29:16 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2002-08-20 19:29:16 +0000 |
| commit | bfe5b85dbdab7b0c9f868dcb3beb71848ffbd295 (patch) | |
| tree | 222ac3236359bdc76cfea99c09911d016fe23488 /modules | |
| parent | afd87425d98ee62864911a2ccd29beb0eea843cb (diff) | |
| download | brdo-bfe5b85dbdab7b0c9f868dcb3beb71848ffbd295.tar.gz brdo-bfe5b85dbdab7b0c9f868dcb3beb71848ffbd295.tar.bz2 | |
- Applied a (modified) version of Marco's SQL sequence patch.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/node.module | 7 | ||||
| -rw-r--r-- | modules/node/node.module | 7 | ||||
| -rw-r--r-- | modules/taxonomy.module | 6 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 6 |
4 files changed, 8 insertions, 18 deletions
diff --git a/modules/node.module b/modules/node.module index 3b5d913e7..e9bdb3d17 100644 --- a/modules/node.module +++ b/modules/node.module @@ -149,8 +149,7 @@ function node_save($node, $filter) { // Set some required fields: $node->created = time(); $node->changed = time(); - $node->nid = db_result(db_query("SELECT MAX(nid) + 1 FROM node")); - $node->nid = empty($node->nid) ? 1 : $node->nid; + $node->nid = db_next_id("node"); // Prepare the query: foreach ($node as $key => $value) { @@ -1073,7 +1072,7 @@ function node_submit($node) { else { $fields = array("nid", "uid" => ($user->uid ? $user->uid : 0), "body", "teaser", "title", "type" => $node->type); } - + $nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "update", $node))); /* @@ -1120,7 +1119,7 @@ function node_submit($node) { else { $fields = array("uid" => ($user->uid ? $user->uid : 0), "body", "comment" => 2, "teaser", "title", "type" => $node->type); } - + $nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "create", $node))); /* diff --git a/modules/node/node.module b/modules/node/node.module index 3b5d913e7..e9bdb3d17 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -149,8 +149,7 @@ function node_save($node, $filter) { // Set some required fields: $node->created = time(); $node->changed = time(); - $node->nid = db_result(db_query("SELECT MAX(nid) + 1 FROM node")); - $node->nid = empty($node->nid) ? 1 : $node->nid; + $node->nid = db_next_id("node"); // Prepare the query: foreach ($node as $key => $value) { @@ -1073,7 +1072,7 @@ function node_submit($node) { else { $fields = array("nid", "uid" => ($user->uid ? $user->uid : 0), "body", "teaser", "title", "type" => $node->type); } - + $nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "update", $node))); /* @@ -1120,7 +1119,7 @@ function node_submit($node) { else { $fields = array("uid" => ($user->uid ? $user->uid : 0), "body", "comment" => 2, "teaser", "title", "type" => $node->type); } - + $nid = node_save($node, array_merge($fields, module_invoke($node->type, "save", "create", $node))); /* diff --git a/modules/taxonomy.module b/modules/taxonomy.module index e3b475c7c..d3c1a0826 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -153,11 +153,7 @@ function taxonomy_save_term($edit) { taxonomy_del_term($edit["tid"]); } else { - $edit["tid"] = db_result(db_query("SELECT MAX(tid) + 1 FROM term_data")); - if (!$edit["tid"]) { - // first term - $edit["tid"] = 1; - } + $edit["tid"] = db_next_id("term_data"); $data = array("tid" => $edit["tid"], "name" => $edit["name"], "description" => $edit["description"], "vid" => $edit["vid"], "weight" => $edit["weight"]); db_query("INSERT INTO term_data ". _prepare_insert($data, 1) ." VALUES ". _prepare_insert($data, 2)); } diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index e3b475c7c..d3c1a0826 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -153,11 +153,7 @@ function taxonomy_save_term($edit) { taxonomy_del_term($edit["tid"]); } else { - $edit["tid"] = db_result(db_query("SELECT MAX(tid) + 1 FROM term_data")); - if (!$edit["tid"]) { - // first term - $edit["tid"] = 1; - } + $edit["tid"] = db_next_id("term_data"); $data = array("tid" => $edit["tid"], "name" => $edit["name"], "description" => $edit["description"], "vid" => $edit["vid"], "weight" => $edit["weight"]); db_query("INSERT INTO term_data ". _prepare_insert($data, 1) ." VALUES ". _prepare_insert($data, 2)); } |