cvs: pear /MDB_QueryTool/QueryTool Query.php

hugoki Thu May 17 16:27:56 2007 UTC

Modified files:
/pear/MDB_QueryTool/QueryTool Query.php
Log:
A request from azrad. When a new entity is added and MDB2 is used now the method "getBeforeId" is used instead of "nexID". So when the RDBM supports AUTO_INCREMENT no sequence table should be created

http://cvs.php.net/viewvc.cgi/pear/M...&diff_format=u
Index: pear/MDB_QueryTool/QueryTool/Query.php
diff -u pear/MDB_QueryTool/QueryTool/Query.php:1.72 pear/MDB_QueryTool/QueryTool/Query.php:1.73
--- pear/MDB_QueryTool/QueryTool/Query.php:1.72 Mon Apr 30 11:45:58 2007
+++ pear/MDB_QueryTool/QueryTool/Query.php Thu May 17 16:27:56 2007
@@ -32,7 +32,7 @@
* @author Lorenzo Alberton <l dot alberton at quipo dot it>
* @copyright 2004-2007 Lorenzo Alberton
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
- * @version CVS: $Id: Query.php,v 1.72 2007/04/30 11:45:58 quipo Exp $
+ * @version CVS: $Id: Query.php,v 1.73 2007/05/17 16:27:56 hugoki Exp $
* @link http://pear.php.net/package/MDB_QueryTool
*/

@@ -714,9 +714,12 @@
if ($this->primaryCol) {
// do only use the sequence if a primary column is given
// otherwise the data are written as given
- $nextid_func = ($this->_MDBversion == 2) ? 'nextID' : 'nextId';
- //$id = (int)$this->db->$nextid_func($this->sequenceName);
- $id = $this->db->$nextid_func($this->sequenceName);
+ if ($this->_MDBversion == 2) {
+ $this->db->loadModule('Extended', null, false);
+ $id = $this->db->getBeforeID($this->table, $this->primaryCol);
+ } else {
+ $id = $this->db->nextId($this->sequenceName);
+ }
$newData[$this->primaryCol] = $id;
} else {
// if no primary col is given return true on success
@@ -779,8 +782,13 @@
if ($this->primaryCol) {
// do only use the sequence if a primary column is given
// otherwise the data are written as given
- $func = ($this->_MDBversion == 2) ? 'nextID' : 'nextId';
- $retIds[] = $id = (int)$this->db->$func($this->sequenceName);
+ if ($this->_MDBversion == 2) {
+ $this->db->loadModule('Extended', null, false);
+ $id = $this->db->getBeforeID($this->table, $this->primaryCol);
+ } else {
+ $id = $this->db->nextId($this->sequenceName);
+ }
+ $retIds[] = $id;
$aData[$this->primaryCol] = $id;
}
} else {