dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "API: Log non-whitelisted CORS requests with session cookies"
[lhc/web/wiklou.git]
/
includes
/
db
/
DatabaseOracle.php
diff --git
a/includes/db/DatabaseOracle.php
b/includes/db/DatabaseOracle.php
index
9b301a9
..
f9ba050
100644
(file)
--- a/
includes/db/DatabaseOracle.php
+++ b/
includes/db/DatabaseOracle.php
@@
-432,7
+432,7
@@
class DatabaseOracle extends Database {
/**
* Frees resources associated with the LOB descriptor
/**
* Frees resources associated with the LOB descriptor
- * @param ResultWrapper|
resource
$res
+ * @param ResultWrapper|
ORAResult
$res
*/
function freeResult( $res ) {
if ( $res instanceof ResultWrapper ) {
*/
function freeResult( $res ) {
if ( $res instanceof ResultWrapper ) {
@@
-443,7
+443,7
@@
class DatabaseOracle extends Database {
}
/**
}
/**
- * @param ResultWrapper|
stdClass
$res
+ * @param ResultWrapper|
ORAResult
$res
* @return mixed
*/
function fetchObject( $res ) {
* @return mixed
*/
function fetchObject( $res ) {
@@
-454,6
+454,10
@@
class DatabaseOracle extends Database {
return $res->fetchObject();
}
return $res->fetchObject();
}
+ /**
+ * @param ResultWrapper|ORAResult $res
+ * @return mixed
+ */
function fetchRow( $res ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
function fetchRow( $res ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
@@
-462,6
+466,10
@@
class DatabaseOracle extends Database {
return $res->fetchRow();
}
return $res->fetchRow();
}
+ /**
+ * @param ResultWrapper|ORAResult $res
+ * @return int
+ */
function numRows( $res ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
function numRows( $res ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
@@
-470,6
+478,10
@@
class DatabaseOracle extends Database {
return $res->numRows();
}
return $res->numRows();
}
+ /**
+ * @param ResultWrapper|ORAResult $res
+ * @return int
+ */
function numFields( $res ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
function numFields( $res ) {
if ( $res instanceof ResultWrapper ) {
$res = $res->result;
@@
-618,7
+630,7
@@
class DatabaseOracle extends Database {
$table = $this->tableName( $table );
// "INSERT INTO tables (a, b, c)"
$table = $this->tableName( $table );
// "INSERT INTO tables (a, b, c)"
- $sql = "INSERT INTO " . $table . " (" .
join
( ',', array_keys( $row ) ) . ')';
+ $sql = "INSERT INTO " . $table . " (" .
implode
( ',', array_keys( $row ) ) . ')';
$sql .= " VALUES (";
// for each value, append ":key"
$sql .= " VALUES (";
// for each value, append ":key"