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 "Add ability to pre-render thumbnails at upload time"
[lhc/web/wiklou.git]
/
includes
/
db
/
DatabasePostgres.php
diff --git
a/includes/db/DatabasePostgres.php
b/includes/db/DatabasePostgres.php
index
f5fdca1
..
ce14d7a
100644
(file)
--- a/
includes/db/DatabasePostgres.php
+++ b/
includes/db/DatabasePostgres.php
@@
-117,6
+117,7
@@
SQL;
/**
* @since 1.19
/**
* @since 1.19
+ * @return bool|mixed
*/
function defaultValue() {
if ( $this->has_default ) {
*/
function defaultValue() {
if ( $this->has_default ) {
@@
-829,6
+830,7
@@
__INDEXATTR__;
* so causes a DB error. This wrapper checks which tables can be locked and adjusts it accordingly.
*
* MySQL uses "ORDER BY NULL" as an optimization hint, but that syntax is illegal in PostgreSQL.
* so causes a DB error. This wrapper checks which tables can be locked and adjusts it accordingly.
*
* MySQL uses "ORDER BY NULL" as an optimization hint, but that syntax is illegal in PostgreSQL.
+ * @see DatabaseBase::selectSQLText
*/
function selectSQLText( $table, $vars, $conds = '', $fname = __METHOD__,
$options = array(), $join_conds = array()
*/
function selectSQLText( $table, $vars, $conds = '', $fname = __METHOD__,
$options = array(), $join_conds = array()
@@
-1154,7
+1156,7
@@
__INDEXATTR__;
return wfTimestamp( TS_POSTGRES, $ts );
}
return wfTimestamp( TS_POSTGRES, $ts );
}
- /*
+ /*
*
* Posted by cc[plus]php[at]c2se[dot]com on 25-Mar-2009 09:12
* to http://www.php.net/manual/en/ref.pgsql.php
*
* Posted by cc[plus]php[at]c2se[dot]com on 25-Mar-2009 09:12
* to http://www.php.net/manual/en/ref.pgsql.php
*
@@
-1201,6
+1203,9
@@
__INDEXATTR__;
/**
* Return aggregated value function call
/**
* Return aggregated value function call
+ * @param array $valuedata
+ * @param string $valuename
+ * @return array
*/
public function aggregateValue( $valuedata, $valuename = 'value' ) {
return $valuedata;
*/
public function aggregateValue( $valuedata, $valuename = 'value' ) {
return $valuedata;