cvs: pear /MDB2/MDB2/Driver fbsql.php mssql.php mysql.php mysqli.php sqlite.php /MDB2/MDB2/Driver/Manager fbsql.php mssql.php mysqli.php sqlite.php
/MDB2/MDB2/Wrapper peardb.php
| From: | Lukas Smith | Date: | Sat, 16 Apr 2005 22:27:49 +0000 |
| Subject: | cvs: pear /MDB2/MDB2/Driver fbsql.php mssql.php mysql.php mysqli.php sqlite.php /MDB2/MDB2/Driver/Manager fbsql.php mssql.php mysqli.php sqlite.php /MDB2/MDB2/Wrapper peardb.php |
||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-31204@lists.php.net to get a copy of this message | ||
lsmith Sat Apr 16 18:27:49 2005 EDT
Modified files:
/pear/MDB2/MDB2/Wrapper peardb.php
/pear/MDB2/MDB2/Driver/Manager fbsql.php mssql.php mysqli.php
sqlite.php
/pear/MDB2/MDB2/Driver fbsql.php mssql.php mysql.php mysqli.php
sqlite.php
Log:
- renamed 'seqname_col_name' option to 'seqcol_name'
http://cvs.php.net/diff.php/pear/MDB2/MDB2/Wrapper/peardb.php?r1=1.26&r2=1.27&ty=u Index: pear/MDB2/MDB2/Wrapper/peardb.php diff -u pear/MDB2/MDB2/Wrapper/peardb.php:1.26 pear/MDB2/MDB2/Wrapper/peardb.php:1.27 --- pear/MDB2/MDB2/Wrapper/peardb.php:1.26 Fri Apr 1 07:53:35 2005 +++ pear/MDB2/MDB2/Wrapper/peardb.php Sat Apr 16 18:27:48 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: peardb.php,v 1.26 2005/04/01 12:53:35 lsmith Exp $ +// $Id: peardb.php,v 1.27 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -326,7 +326,7 @@ { $this->db_object =& $db_object; $this->PEAR('DB_Error'); - $this->db_object->setOption('seqname_col_name', 'id'); + $this->db_object->setOption('seqcol_name', 'id'); $this->db_object->setOption('result_wrap_class', 'DB_result'); $this->phptype = $this->db_object->phptype; $this->connection = $this->db_object->connection; http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/fbsql.php?r1=1.20&r2=1.21&ty=u Index: pear/MDB2/MDB2/Driver/Manager/fbsql.php diff -u pear/MDB2/MDB2/Driver/Manager/fbsql.php:1.20 pear/MDB2/MDB2/Driver/Manager/fbsql.php:1.21 --- pear/MDB2/MDB2/Driver/Manager/fbsql.php:1.20 Fri Mar 25 13:12:19 2005 +++ pear/MDB2/MDB2/Driver/Manager/fbsql.php Sat Apr 16 18:27:48 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: fbsql.php,v 1.20 2005/03/25 18:12:19 lsmith Exp $ +// $Id: fbsql.php,v 1.21 2005/04/16 22:27:48 lsmith Exp $ // require_once 'MDB2/Driver/Manager/Common.php'; @@ -484,8 +484,8 @@ { $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; $sequence_name = $db->getSequenceName($seq_name); - $seqname_col_name = $db->options['seqname_col_name']; - $query = "CREATE TABLE $sequence_name ($seqname_col_name INTEGER DEFAULT UNIQUE, PRIMARY KEY($seqname_col_name))"; + $seqcol_name = $db->options['seqcol_name']; + $query = "CREATE TABLE $sequence_name ($seqcol_name INTEGER DEFAULT UNIQUE, PRIMARY KEY($seqcol_name))"; $res = $db->query($query); $res = $db->query("SET UNIQUE = 1 FOR $sequence_name"); if (PEAR::isError($res)) { @@ -494,7 +494,7 @@ if ($start == 1) { return MDB2_OK; } - $res = $db->query("INSERT INTO $sequence_name ($seqname_col_name) VALUES (".($start-1).')'); + $res = $db->query("INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')'); if (!PEAR::isError($res)) { return MDB2_OK; } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/mssql.php?r1=1.22&r2=1.23&ty=u Index: pear/MDB2/MDB2/Driver/Manager/mssql.php diff -u pear/MDB2/MDB2/Driver/Manager/mssql.php:1.22 pear/MDB2/MDB2/Driver/Manager/mssql.php:1.23 --- pear/MDB2/MDB2/Driver/Manager/mssql.php:1.22 Fri Apr 1 07:53:34 2005 +++ pear/MDB2/MDB2/Driver/Manager/mssql.php Sat Apr 16 18:27:48 2005 @@ -42,7 +42,7 @@ // | Author: Frank M. Kromann <frank@kromann.info> | // +----------------------------------------------------------------------+ // -// $Id: mssql.php,v 1.22 2005/04/01 12:53:34 lsmith Exp $ +// $Id: mssql.php,v 1.23 2005/04/16 22:27:48 lsmith Exp $ // require_once 'MDB2/Driver/Manager/Common.php'; @@ -335,7 +335,7 @@ { $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; $sequence_name = $db->getSequenceName($seq_name); - $query = "CREATE TABLE $sequence_name (".$db->options['seqname_col_name'] + $query = "CREATE TABLE $sequence_name (".$db->options['seqcol_name'] ." INT NOT NULL IDENTITY($start,1) PRIMARY KEY CLUSTERED)"; return $db->query($query); } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/mysqli.php?r1=1.5&r2=1.6&ty=u Index: pear/MDB2/MDB2/Driver/Manager/mysqli.php diff -u pear/MDB2/MDB2/Driver/Manager/mysqli.php:1.5 pear/MDB2/MDB2/Driver/Manager/mysqli.php:1.6 --- pear/MDB2/MDB2/Driver/Manager/mysqli.php:1.5 Mon Apr 4 04:05:43 2005 +++ pear/MDB2/MDB2/Driver/Manager/mysqli.php Sat Apr 16 18:27:48 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: mysqli.php,v 1.5 2005/04/04 08:05:43 lsmith Exp $ +// $Id: mysqli.php,v 1.6 2005/04/16 22:27:48 lsmith Exp $ // require_once 'MDB2/Driver/Manager/Common.php'; @@ -606,13 +606,13 @@ { $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; $sequence_name = $db->getSequenceName($seq_name); - $seqname_col_name = $db->options['seqname_col_name']; + $seqcol_name = $db->options['seqcol_name']; $result = $this->_verifyTableType($db->options['default_table_type']); if (PEAR::isError($result)) { return $result; } $res = $db->query("CREATE TABLE $sequence_name". - "($seqname_col_name INT NOT NULL AUTO_INCREMENT, PRIMARY KEY ($seqname_col_name))". + "($seqcol_name INT NOT NULL AUTO_INCREMENT, PRIMARY KEY ($seqcol_name))". (strlen($db->options['default_table_type']) ? ' TYPE='.$db->options['default_table_type'] : '') ); if (PEAR::isError($res)) { @@ -621,7 +621,7 @@ if ($start == 1) { return MDB2_OK; } - $res = $db->query("INSERT INTO $sequence_name ($seqname_col_name) VALUES (".($start-1).')'); + $res = $db->query("INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')'); if (!PEAR::isError($res)) { return MDB2_OK; } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/sqlite.php?r1=1.16&r2=1.17&ty=u Index: pear/MDB2/MDB2/Driver/Manager/sqlite.php diff -u pear/MDB2/MDB2/Driver/Manager/sqlite.php:1.16 pear/MDB2/MDB2/Driver/Manager/sqlite.php:1.17 --- pear/MDB2/MDB2/Driver/Manager/sqlite.php:1.16 Mon Apr 4 04:08:08 2005 +++ pear/MDB2/MDB2/Driver/Manager/sqlite.php Sat Apr 16 18:27:48 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: sqlite.php,v 1.16 2005/04/04 08:08:08 lsmith Exp $ +// $Id: sqlite.php,v 1.17 2005/04/16 22:27:48 lsmith Exp $ // require_once 'MDB2/Driver/Manager/Common.php'; @@ -303,8 +303,8 @@ { $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; $sequence_name = $db->getSequenceName($seq_name); - $seqname_col_name = $db->options['seqname_col_name']; - $query = "CREATE TABLE $sequence_name ($seqname_col_name INTEGER PRIMARY KEY DEFAULT 0 NOT NULL)"; + $seqcol_name = $db->options['seqcol_name']; + $query = "CREATE TABLE $sequence_name ($seqcol_name INTEGER PRIMARY KEY DEFAULT 0 NOT NULL)"; $res = $db->query($query); if (PEAR::isError($res)) { return $res; @@ -312,7 +312,7 @@ if ($start == 1) { return MDB2_OK; } - $res = $db->query("INSERT INTO $sequence_name ($seqname_col_name) VALUES (".($start-1).')'); + $res = $db->query("INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')'); if (!PEAR::isError($res)) { return MDB2_OK; } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/fbsql.php?r1=1.58&r2=1.59&ty=u Index: pear/MDB2/MDB2/Driver/fbsql.php diff -u pear/MDB2/MDB2/Driver/fbsql.php:1.58 pear/MDB2/MDB2/Driver/fbsql.php:1.59 --- pear/MDB2/MDB2/Driver/fbsql.php:1.58 Fri Mar 25 13:12:18 2005 +++ pear/MDB2/MDB2/Driver/fbsql.php Sat Apr 16 18:27:48 2005 @@ -43,7 +43,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: fbsql.php,v 1.58 2005/03/25 18:12:18 lsmith Exp $ +// $Id: fbsql.php,v 1.59 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -387,7 +387,7 @@ function nextID($seq_name, $ondemand = true) { $sequence_name = $this->getSequenceName($seq_name); - $query = "INSERT INTO $sequence_name (".$this->options['seqname_col_name'].") VALUES (NULL);"; + $query = "INSERT INTO $sequence_name (".$this->options['seqcol_name'].") VALUES (NULL);"; $this->expectError(MDB2_ERROR_NOSUCHTABLE); $result = $this->_doQuery($query, true); $this->popExpect(); @@ -410,7 +410,7 @@ } $value = $this->queryOne("SELECT UNIQUE FROM $sequence_name", 'integer'); if (is_numeric($value)) { - $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqname_col_name']." < $value;"; + $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqcol_name']." < $value;"; $result = $this->_doQuery($query, true); if(PEAR::isError($result)) { $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name; @@ -449,7 +449,7 @@ function currID($seq_name) { $sequence_name = $this->getSequenceName($seq_name); - $query = "SELECT MAX(".$this->options['seqname_col_name'].") FROM $sequence_name"; + $query = "SELECT MAX(".$this->options['seqcol_name'].") FROM $sequence_name"; return $this->queryOne($query, 'integer'); } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/mssql.php?r1=1.65&r2=1.66&ty=u Index: pear/MDB2/MDB2/Driver/mssql.php diff -u pear/MDB2/MDB2/Driver/mssql.php:1.65 pear/MDB2/MDB2/Driver/mssql.php:1.66 --- pear/MDB2/MDB2/Driver/mssql.php:1.65 Tue Mar 29 20:33:40 2005 +++ pear/MDB2/MDB2/Driver/mssql.php Sat Apr 16 18:27:48 2005 @@ -43,7 +43,7 @@ // | Author: Frank M. Kromann <frank@kromann.info> | // +----------------------------------------------------------------------+ // -// $Id: mssql.php,v 1.65 2005/03/30 01:33:40 lsmith Exp $ +// $Id: mssql.php,v 1.66 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -407,7 +407,7 @@ function nextID($seq_name, $ondemand = true) { $sequence_name = $this->getSequenceName($seq_name); - $query = "INSERT INTO $sequence_name (".$this->options['seqname_col_name'].") VALUES (0)"; + $query = "INSERT INTO $sequence_name (".$this->options['seqcol_name'].") VALUES (0)"; $this->expectError(MDB2_ERROR_NOSUCHTABLE); $result = $this->_doQuery($query, true); $this->popExpect(); @@ -430,7 +430,7 @@ } $value = $this->queryOne("SELECT @@IDENTITY FROM $sequence_name", 'integer'); if (is_numeric($value)) { - $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqname_col_name']." < $value"; + $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqcol_name']." < $value"; $result = $this->_doQuery($query, true); if (PEAR::isError($result)) { $this->warnings[] = 'nextID: could not delete previous sequence table values'; http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/mysql.php?r1=1.60&r2=1.61&ty=u Index: pear/MDB2/MDB2/Driver/mysql.php diff -u pear/MDB2/MDB2/Driver/mysql.php:1.60 pear/MDB2/MDB2/Driver/mysql.php:1.61 --- pear/MDB2/MDB2/Driver/mysql.php:1.60 Wed Mar 30 05:07:08 2005 +++ pear/MDB2/MDB2/Driver/mysql.php Sat Apr 16 18:27:48 2005 @@ -43,7 +43,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: mysql.php,v 1.60 2005/03/30 10:07:08 lsmith Exp $ +// $Id: mysql.php,v 1.61 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -656,7 +656,7 @@ function nextID($seq_name, $ondemand = true) { $sequence_name = $this->getSequenceName($seq_name); - $query = "INSERT INTO $sequence_name (".$this->options['seqname_col_name'].") VALUES (NULL)"; + $query = "INSERT INTO $sequence_name (".$this->options['seqcol_name'].") VALUES (NULL)"; $this->expectError(MDB2_ERROR_NOSUCHTABLE); $result = $this->_doQuery($query, true); $this->popExpect(); @@ -679,7 +679,7 @@ } $value = $this->queryOne('SELECT LAST_INSERT_ID()', 'integer'); if (is_numeric($value)) { - $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqname_col_name']." < $value"; + $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqcol_name']." < $value"; $result = $this->_doQuery($query, true); if (PEAR::isError($result)) { $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name; @@ -718,7 +718,7 @@ function currID($seq_name) { $sequence_name = $this->getSequenceName($seq_name); - return $this->queryOne("SELECT MAX(".$this->options['seqname_col_name'].") FROM $sequence_name", 'integer'); + return $this->queryOne("SELECT MAX(".$this->options['seqcol_name'].") FROM $sequence_name", 'integer'); } } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/mysqli.php?r1=1.18&r2=1.19&ty=u Index: pear/MDB2/MDB2/Driver/mysqli.php diff -u pear/MDB2/MDB2/Driver/mysqli.php:1.18 pear/MDB2/MDB2/Driver/mysqli.php:1.19 --- pear/MDB2/MDB2/Driver/mysqli.php:1.18 Mon Apr 4 04:04:58 2005 +++ pear/MDB2/MDB2/Driver/mysqli.php Sat Apr 16 18:27:48 2005 @@ -43,7 +43,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: mysqli.php,v 1.18 2005/04/04 08:04:58 lsmith Exp $ +// $Id: mysqli.php,v 1.19 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -646,7 +646,7 @@ function nextID($seq_name, $ondemand = true) { $sequence_name = $this->getSequenceName($seq_name); - $query = "INSERT INTO $sequence_name (".$this->options['seqname_col_name'].") VALUES (NULL)"; + $query = "INSERT INTO $sequence_name (".$this->options['seqcol_name'].") VALUES (NULL)"; $this->expectError(MDB2_ERROR_NOSUCHTABLE); $result = $this->_doQuery($query, true); $this->popExpect(); @@ -669,7 +669,7 @@ } $value = @mysqli_insert_id($this->connection); if (is_numeric($value)) { - $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqname_col_name']." < $value"; + $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqcol_name']." < $value"; $result = $this->_doQuery($query, true); if (PEAR::isError($result)) { $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name; @@ -708,7 +708,7 @@ function currID($seq_name) { $sequence_name = $this->getSequenceName($seq_name); - return $this->queryOne("SELECT MAX(".$this->options['seqname_col_name'].") FROM $sequence_name", 'integer'); + return $this->queryOne("SELECT MAX(".$this->options['seqcol_name'].") FROM $sequence_name", 'integer'); } } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/sqlite.php?r1=1.59&r2=1.60&ty=u Index: pear/MDB2/MDB2/Driver/sqlite.php diff -u pear/MDB2/MDB2/Driver/sqlite.php:1.59 pear/MDB2/MDB2/Driver/sqlite.php:1.60 --- pear/MDB2/MDB2/Driver/sqlite.php:1.59 Fri Mar 25 13:12:18 2005 +++ pear/MDB2/MDB2/Driver/sqlite.php Sat Apr 16 18:27:48 2005 @@ -43,7 +43,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: sqlite.php,v 1.59 2005/03/25 18:12:18 lsmith Exp $ +// $Id: sqlite.php,v 1.60 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -560,7 +560,7 @@ function nextID($seq_name, $ondemand = true) { $sequence_name = $this->getSequenceName($seq_name); - $query = "INSERT INTO $sequence_name (".$this->options['seqname_col_name'].") VALUES (NULL)"; + $query = "INSERT INTO $sequence_name (".$this->options['seqcol_name'].") VALUES (NULL)"; $this->expectError(MDB2_ERROR_NOSUCHTABLE); $result = $this->_doQuery($query, true); $this->popExpect(); @@ -583,7 +583,7 @@ } $value = @sqlite_last_insert_rowid($this->connection); if (is_numeric($value) - && PEAR::isError($this->_doQuery("DELETE FROM $sequence_name WHERE ".$this->options['seqname_col_name']." < $value", true)) + && PEAR::isError($this->_doQuery("DELETE FROM $sequence_name WHERE ".$this->options['seqcol_name']." < $value", true)) ) { $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name; } @@ -620,7 +620,7 @@ function currID($seq_name) { $sequence_name = $this->getSequenceName($seq_name); - return $this->queryOne("SELECT MAX(".$this->options['seqname_col_name'].") FROM $sequence_name", 'integer'); + return $this->queryOne("SELECT MAX(".$this->options['seqcol_name'].") FROM $sequence_name", 'integer'); } }
http://cvs.php.net/diff.php/pear/MDB2/MDB2/Wrapper/peardb.php?r1=1.26&r2=1.27&ty=u Index: pear/MDB2/MDB2/Wrapper/peardb.php diff -u pear/MDB2/MDB2/Wrapper/peardb.php:1.26 pear/MDB2/MDB2/Wrapper/peardb.php:1.27 --- pear/MDB2/MDB2/Wrapper/peardb.php:1.26 Fri Apr 1 07:53:35 2005 +++ pear/MDB2/MDB2/Wrapper/peardb.php Sat Apr 16 18:27:48 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: peardb.php,v 1.26 2005/04/01 12:53:35 lsmith Exp $ +// $Id: peardb.php,v 1.27 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -326,7 +326,7 @@ { $this->db_object =& $db_object; $this->PEAR('DB_Error'); - $this->db_object->setOption('seqname_col_name', 'id'); + $this->db_object->setOption('seqcol_name', 'id'); $this->db_object->setOption('result_wrap_class', 'DB_result'); $this->phptype = $this->db_object->phptype; $this->connection = $this->db_object->connection; http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/fbsql.php?r1=1.20&r2=1.21&ty=u Index: pear/MDB2/MDB2/Driver/Manager/fbsql.php diff -u pear/MDB2/MDB2/Driver/Manager/fbsql.php:1.20 pear/MDB2/MDB2/Driver/Manager/fbsql.php:1.21 --- pear/MDB2/MDB2/Driver/Manager/fbsql.php:1.20 Fri Mar 25 13:12:19 2005 +++ pear/MDB2/MDB2/Driver/Manager/fbsql.php Sat Apr 16 18:27:48 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: fbsql.php,v 1.20 2005/03/25 18:12:19 lsmith Exp $ +// $Id: fbsql.php,v 1.21 2005/04/16 22:27:48 lsmith Exp $ // require_once 'MDB2/Driver/Manager/Common.php'; @@ -484,8 +484,8 @@ { $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; $sequence_name = $db->getSequenceName($seq_name); - $seqname_col_name = $db->options['seqname_col_name']; - $query = "CREATE TABLE $sequence_name ($seqname_col_name INTEGER DEFAULT UNIQUE, PRIMARY KEY($seqname_col_name))"; + $seqcol_name = $db->options['seqcol_name']; + $query = "CREATE TABLE $sequence_name ($seqcol_name INTEGER DEFAULT UNIQUE, PRIMARY KEY($seqcol_name))"; $res = $db->query($query); $res = $db->query("SET UNIQUE = 1 FOR $sequence_name"); if (PEAR::isError($res)) { @@ -494,7 +494,7 @@ if ($start == 1) { return MDB2_OK; } - $res = $db->query("INSERT INTO $sequence_name ($seqname_col_name) VALUES (".($start-1).')'); + $res = $db->query("INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')'); if (!PEAR::isError($res)) { return MDB2_OK; } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/mssql.php?r1=1.22&r2=1.23&ty=u Index: pear/MDB2/MDB2/Driver/Manager/mssql.php diff -u pear/MDB2/MDB2/Driver/Manager/mssql.php:1.22 pear/MDB2/MDB2/Driver/Manager/mssql.php:1.23 --- pear/MDB2/MDB2/Driver/Manager/mssql.php:1.22 Fri Apr 1 07:53:34 2005 +++ pear/MDB2/MDB2/Driver/Manager/mssql.php Sat Apr 16 18:27:48 2005 @@ -42,7 +42,7 @@ // | Author: Frank M. Kromann <frank@kromann.info> | // +----------------------------------------------------------------------+ // -// $Id: mssql.php,v 1.22 2005/04/01 12:53:34 lsmith Exp $ +// $Id: mssql.php,v 1.23 2005/04/16 22:27:48 lsmith Exp $ // require_once 'MDB2/Driver/Manager/Common.php'; @@ -335,7 +335,7 @@ { $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; $sequence_name = $db->getSequenceName($seq_name); - $query = "CREATE TABLE $sequence_name (".$db->options['seqname_col_name'] + $query = "CREATE TABLE $sequence_name (".$db->options['seqcol_name'] ." INT NOT NULL IDENTITY($start,1) PRIMARY KEY CLUSTERED)"; return $db->query($query); } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/mysqli.php?r1=1.5&r2=1.6&ty=u Index: pear/MDB2/MDB2/Driver/Manager/mysqli.php diff -u pear/MDB2/MDB2/Driver/Manager/mysqli.php:1.5 pear/MDB2/MDB2/Driver/Manager/mysqli.php:1.6 --- pear/MDB2/MDB2/Driver/Manager/mysqli.php:1.5 Mon Apr 4 04:05:43 2005 +++ pear/MDB2/MDB2/Driver/Manager/mysqli.php Sat Apr 16 18:27:48 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: mysqli.php,v 1.5 2005/04/04 08:05:43 lsmith Exp $ +// $Id: mysqli.php,v 1.6 2005/04/16 22:27:48 lsmith Exp $ // require_once 'MDB2/Driver/Manager/Common.php'; @@ -606,13 +606,13 @@ { $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; $sequence_name = $db->getSequenceName($seq_name); - $seqname_col_name = $db->options['seqname_col_name']; + $seqcol_name = $db->options['seqcol_name']; $result = $this->_verifyTableType($db->options['default_table_type']); if (PEAR::isError($result)) { return $result; } $res = $db->query("CREATE TABLE $sequence_name". - "($seqname_col_name INT NOT NULL AUTO_INCREMENT, PRIMARY KEY ($seqname_col_name))". + "($seqcol_name INT NOT NULL AUTO_INCREMENT, PRIMARY KEY ($seqcol_name))". (strlen($db->options['default_table_type']) ? ' TYPE='.$db->options['default_table_type'] : '') ); if (PEAR::isError($res)) { @@ -621,7 +621,7 @@ if ($start == 1) { return MDB2_OK; } - $res = $db->query("INSERT INTO $sequence_name ($seqname_col_name) VALUES (".($start-1).')'); + $res = $db->query("INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')'); if (!PEAR::isError($res)) { return MDB2_OK; } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/sqlite.php?r1=1.16&r2=1.17&ty=u Index: pear/MDB2/MDB2/Driver/Manager/sqlite.php diff -u pear/MDB2/MDB2/Driver/Manager/sqlite.php:1.16 pear/MDB2/MDB2/Driver/Manager/sqlite.php:1.17 --- pear/MDB2/MDB2/Driver/Manager/sqlite.php:1.16 Mon Apr 4 04:08:08 2005 +++ pear/MDB2/MDB2/Driver/Manager/sqlite.php Sat Apr 16 18:27:48 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: sqlite.php,v 1.16 2005/04/04 08:08:08 lsmith Exp $ +// $Id: sqlite.php,v 1.17 2005/04/16 22:27:48 lsmith Exp $ // require_once 'MDB2/Driver/Manager/Common.php'; @@ -303,8 +303,8 @@ { $db =& $GLOBALS['_MDB2_databases'][$this->db_index]; $sequence_name = $db->getSequenceName($seq_name); - $seqname_col_name = $db->options['seqname_col_name']; - $query = "CREATE TABLE $sequence_name ($seqname_col_name INTEGER PRIMARY KEY DEFAULT 0 NOT NULL)"; + $seqcol_name = $db->options['seqcol_name']; + $query = "CREATE TABLE $sequence_name ($seqcol_name INTEGER PRIMARY KEY DEFAULT 0 NOT NULL)"; $res = $db->query($query); if (PEAR::isError($res)) { return $res; @@ -312,7 +312,7 @@ if ($start == 1) { return MDB2_OK; } - $res = $db->query("INSERT INTO $sequence_name ($seqname_col_name) VALUES (".($start-1).')'); + $res = $db->query("INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')'); if (!PEAR::isError($res)) { return MDB2_OK; } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/fbsql.php?r1=1.58&r2=1.59&ty=u Index: pear/MDB2/MDB2/Driver/fbsql.php diff -u pear/MDB2/MDB2/Driver/fbsql.php:1.58 pear/MDB2/MDB2/Driver/fbsql.php:1.59 --- pear/MDB2/MDB2/Driver/fbsql.php:1.58 Fri Mar 25 13:12:18 2005 +++ pear/MDB2/MDB2/Driver/fbsql.php Sat Apr 16 18:27:48 2005 @@ -43,7 +43,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: fbsql.php,v 1.58 2005/03/25 18:12:18 lsmith Exp $ +// $Id: fbsql.php,v 1.59 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -387,7 +387,7 @@ function nextID($seq_name, $ondemand = true) { $sequence_name = $this->getSequenceName($seq_name); - $query = "INSERT INTO $sequence_name (".$this->options['seqname_col_name'].") VALUES (NULL);"; + $query = "INSERT INTO $sequence_name (".$this->options['seqcol_name'].") VALUES (NULL);"; $this->expectError(MDB2_ERROR_NOSUCHTABLE); $result = $this->_doQuery($query, true); $this->popExpect(); @@ -410,7 +410,7 @@ } $value = $this->queryOne("SELECT UNIQUE FROM $sequence_name", 'integer'); if (is_numeric($value)) { - $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqname_col_name']." < $value;"; + $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqcol_name']." < $value;"; $result = $this->_doQuery($query, true); if(PEAR::isError($result)) { $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name; @@ -449,7 +449,7 @@ function currID($seq_name) { $sequence_name = $this->getSequenceName($seq_name); - $query = "SELECT MAX(".$this->options['seqname_col_name'].") FROM $sequence_name"; + $query = "SELECT MAX(".$this->options['seqcol_name'].") FROM $sequence_name"; return $this->queryOne($query, 'integer'); } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/mssql.php?r1=1.65&r2=1.66&ty=u Index: pear/MDB2/MDB2/Driver/mssql.php diff -u pear/MDB2/MDB2/Driver/mssql.php:1.65 pear/MDB2/MDB2/Driver/mssql.php:1.66 --- pear/MDB2/MDB2/Driver/mssql.php:1.65 Tue Mar 29 20:33:40 2005 +++ pear/MDB2/MDB2/Driver/mssql.php Sat Apr 16 18:27:48 2005 @@ -43,7 +43,7 @@ // | Author: Frank M. Kromann <frank@kromann.info> | // +----------------------------------------------------------------------+ // -// $Id: mssql.php,v 1.65 2005/03/30 01:33:40 lsmith Exp $ +// $Id: mssql.php,v 1.66 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -407,7 +407,7 @@ function nextID($seq_name, $ondemand = true) { $sequence_name = $this->getSequenceName($seq_name); - $query = "INSERT INTO $sequence_name (".$this->options['seqname_col_name'].") VALUES (0)"; + $query = "INSERT INTO $sequence_name (".$this->options['seqcol_name'].") VALUES (0)"; $this->expectError(MDB2_ERROR_NOSUCHTABLE); $result = $this->_doQuery($query, true); $this->popExpect(); @@ -430,7 +430,7 @@ } $value = $this->queryOne("SELECT @@IDENTITY FROM $sequence_name", 'integer'); if (is_numeric($value)) { - $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqname_col_name']." < $value"; + $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqcol_name']." < $value"; $result = $this->_doQuery($query, true); if (PEAR::isError($result)) { $this->warnings[] = 'nextID: could not delete previous sequence table values'; http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/mysql.php?r1=1.60&r2=1.61&ty=u Index: pear/MDB2/MDB2/Driver/mysql.php diff -u pear/MDB2/MDB2/Driver/mysql.php:1.60 pear/MDB2/MDB2/Driver/mysql.php:1.61 --- pear/MDB2/MDB2/Driver/mysql.php:1.60 Wed Mar 30 05:07:08 2005 +++ pear/MDB2/MDB2/Driver/mysql.php Sat Apr 16 18:27:48 2005 @@ -43,7 +43,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: mysql.php,v 1.60 2005/03/30 10:07:08 lsmith Exp $ +// $Id: mysql.php,v 1.61 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -656,7 +656,7 @@ function nextID($seq_name, $ondemand = true) { $sequence_name = $this->getSequenceName($seq_name); - $query = "INSERT INTO $sequence_name (".$this->options['seqname_col_name'].") VALUES (NULL)"; + $query = "INSERT INTO $sequence_name (".$this->options['seqcol_name'].") VALUES (NULL)"; $this->expectError(MDB2_ERROR_NOSUCHTABLE); $result = $this->_doQuery($query, true); $this->popExpect(); @@ -679,7 +679,7 @@ } $value = $this->queryOne('SELECT LAST_INSERT_ID()', 'integer'); if (is_numeric($value)) { - $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqname_col_name']." < $value"; + $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqcol_name']." < $value"; $result = $this->_doQuery($query, true); if (PEAR::isError($result)) { $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name; @@ -718,7 +718,7 @@ function currID($seq_name) { $sequence_name = $this->getSequenceName($seq_name); - return $this->queryOne("SELECT MAX(".$this->options['seqname_col_name'].") FROM $sequence_name", 'integer'); + return $this->queryOne("SELECT MAX(".$this->options['seqcol_name'].") FROM $sequence_name", 'integer'); } } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/mysqli.php?r1=1.18&r2=1.19&ty=u Index: pear/MDB2/MDB2/Driver/mysqli.php diff -u pear/MDB2/MDB2/Driver/mysqli.php:1.18 pear/MDB2/MDB2/Driver/mysqli.php:1.19 --- pear/MDB2/MDB2/Driver/mysqli.php:1.18 Mon Apr 4 04:04:58 2005 +++ pear/MDB2/MDB2/Driver/mysqli.php Sat Apr 16 18:27:48 2005 @@ -43,7 +43,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: mysqli.php,v 1.18 2005/04/04 08:04:58 lsmith Exp $ +// $Id: mysqli.php,v 1.19 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -646,7 +646,7 @@ function nextID($seq_name, $ondemand = true) { $sequence_name = $this->getSequenceName($seq_name); - $query = "INSERT INTO $sequence_name (".$this->options['seqname_col_name'].") VALUES (NULL)"; + $query = "INSERT INTO $sequence_name (".$this->options['seqcol_name'].") VALUES (NULL)"; $this->expectError(MDB2_ERROR_NOSUCHTABLE); $result = $this->_doQuery($query, true); $this->popExpect(); @@ -669,7 +669,7 @@ } $value = @mysqli_insert_id($this->connection); if (is_numeric($value)) { - $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqname_col_name']." < $value"; + $query = "DELETE FROM $sequence_name WHERE ".$this->options['seqcol_name']." < $value"; $result = $this->_doQuery($query, true); if (PEAR::isError($result)) { $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name; @@ -708,7 +708,7 @@ function currID($seq_name) { $sequence_name = $this->getSequenceName($seq_name); - return $this->queryOne("SELECT MAX(".$this->options['seqname_col_name'].") FROM $sequence_name", 'integer'); + return $this->queryOne("SELECT MAX(".$this->options['seqcol_name'].") FROM $sequence_name", 'integer'); } } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/sqlite.php?r1=1.59&r2=1.60&ty=u Index: pear/MDB2/MDB2/Driver/sqlite.php diff -u pear/MDB2/MDB2/Driver/sqlite.php:1.59 pear/MDB2/MDB2/Driver/sqlite.php:1.60 --- pear/MDB2/MDB2/Driver/sqlite.php:1.59 Fri Mar 25 13:12:18 2005 +++ pear/MDB2/MDB2/Driver/sqlite.php Sat Apr 16 18:27:48 2005 @@ -43,7 +43,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: sqlite.php,v 1.59 2005/03/25 18:12:18 lsmith Exp $ +// $Id: sqlite.php,v 1.60 2005/04/16 22:27:48 lsmith Exp $ // /** @@ -560,7 +560,7 @@ function nextID($seq_name, $ondemand = true) { $sequence_name = $this->getSequenceName($seq_name); - $query = "INSERT INTO $sequence_name (".$this->options['seqname_col_name'].") VALUES (NULL)"; + $query = "INSERT INTO $sequence_name (".$this->options['seqcol_name'].") VALUES (NULL)"; $this->expectError(MDB2_ERROR_NOSUCHTABLE); $result = $this->_doQuery($query, true); $this->popExpect(); @@ -583,7 +583,7 @@ } $value = @sqlite_last_insert_rowid($this->connection); if (is_numeric($value) - && PEAR::isError($this->_doQuery("DELETE FROM $sequence_name WHERE ".$this->options['seqname_col_name']." < $value", true)) + && PEAR::isError($this->_doQuery("DELETE FROM $sequence_name WHERE ".$this->options['seqcol_name']." < $value", true)) ) { $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name; } @@ -620,7 +620,7 @@ function currID($seq_name) { $sequence_name = $this->getSequenceName($seq_name); - return $this->queryOne("SELECT MAX(".$this->options['seqname_col_name'].") FROM $sequence_name", 'integer'); + return $this->queryOne("SELECT MAX(".$this->options['seqcol_name'].") FROM $sequence_name", 'integer'); } }