cvs: pear /MDB/MDB ibase.php oci8.php
| From: | Lukas Smith | Date: | Mon, 08 Sep 2003 17:48:20 +0000 |
| Subject: | cvs: pear /MDB/MDB ibase.php oci8.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-12555@lists.php.net to get a copy of this message | ||
lsmith Mon Sep 8 13:48:20 2003 EDT
Modified files:
/pear/MDB/MDB oci8.php ibase.php
Log:
cosmetic fix: limit_queries -> limit_queries
minor fixes to fetchRow
Index: pear/MDB/MDB/oci8.php
diff -u pear/MDB/MDB/oci8.php:1.47 pear/MDB/MDB/oci8.php:1.48
--- pear/MDB/MDB/oci8.php:1.47 Wed Sep 3 11:10:19 2003
+++ pear/MDB/MDB/oci8.php Mon Sep 8 13:48:20 2003
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@backendmedia.com> |
// +----------------------------------------------------------------------+
-// $Id: oci8.php,v 1.47 2003/09/03 15:10:19 lsmith Exp $
+// $Id: oci8.php,v 1.48 2003/09/08 17:48:20 lsmith Exp $
require_once 'MDB/Common.php';
@@ -89,7 +89,7 @@
$this->supported['order_by_text'] = 1;
$this->supported['affected_rows']= 1;
$this->supported['transactions'] = 1;
- $this->supported['limit_querys'] = 1;
+ $this->supported['limit_queries'] = 1;
$this->supported['LOBs'] = 1;
$this->supported['replace'] = 1;
$this->supported['sub_selects'] = 1;
@@ -965,19 +965,19 @@
} else {
$moredata = @OCIFetchInto($result, $row, OCI_RETURN_NULLS);
}
- $this->results[$result_value]['current_row']++;
-
$this->results[$result_value][$this->results[$result_value]['current_row']] = $row;
if (!$moredata) {
if ($this->options['autofree']) {
$this->freeResult($result);
}
return null;
}
+ $this->results[$result_value]['current_row']++;
+
$this->results[$result_value][$this->results[$result_value]['current_row']] = $row;
}
if ($fetchmode == MDB_FETCHMODE_ASSOC) {
- $row = $this->results[$result_value][$rownum];
+ $row = $this->results[$result_value][$rownum+1];
} else {
- $row = array_values($this->results[$result_value][$rownum]);
+ $row = array_values($this->results[$result_value][$rownum+1]);
}
$this->results[$result_value]['highest_fetched_row'] =
max($this->results[$result_value]['highest_fetched_row'], $rownum);
Index: pear/MDB/MDB/ibase.php
diff -u pear/MDB/MDB/ibase.php:1.45 pear/MDB/MDB/ibase.php:1.46
--- pear/MDB/MDB/ibase.php:1.45 Mon Sep 8 13:29:07 2003
+++ pear/MDB/MDB/ibase.php Mon Sep 8 13:48:20 2003
@@ -42,7 +42,7 @@
// | Author: Lorenzo Alberton <l.alberton@quipo.it> |
// +----------------------------------------------------------------------+
//
-// $Id: ibase.php,v 1.45 2003/09/08 17:29:07 quipo Exp $
+// $Id: ibase.php,v 1.46 2003/09/08 17:48:20 lsmith Exp $
require_once 'MDB/Common.php';
@@ -88,7 +88,7 @@
$this->supported['transactions'] = 1;
$this->supported['current_id'] = 1;
// maybe this needs different handling for ibase and firebird?
- $this->supported['limit_querys'] = 1;
+ $this->supported['limit_queries'] = 1;
$this->supported['LOBs'] = 1;
$this->supported['replace'] = 0;
$this->supported['sub_selects'] = 1;
@@ -979,13 +979,14 @@
$row[$key] = rtrim($value_with_space);
}
}
-
$this->results[$result_value][$this->results[$result_value]['current_row']+1] =
$row;
if (!$row) {
if ($this->options['autofree']) {
$this->freeResult($result);
}
return null;
}
+ $this->results[$result_value]['current_row']++;
+
$this->results[$result_value][$this->results[$result_value]['current_row']] = $row;
}
if ($fetchmode == MDB_FETCHMODE_ASSOC) {
$row = $this->results[$result_value][$rownum+1];
@@ -1001,10 +1002,11 @@
} else {
$row = @ibase_fetch_row($result);
}
- foreach ($row as $key => $value_with_space) {
- $row[$key] = rtrim($value_with_space);
+ if (is_array($row)) {
+ foreach ($row as $key => $value_with_space) {
+ $row[$key] = rtrim($value_with_space);
+ }
}
-
$this->results[$result_value][$this->results[$result_value]['current_row']+1] =
$row;
if (!$row) {
if ($this->options['autofree']) {
$this->freeResult($result);