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 "Fix field names and behavior in SlotRecord."
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
database
/
DBConnRef.php
diff --git
a/includes/libs/rdbms/database/DBConnRef.php
b/includes/libs/rdbms/database/DBConnRef.php
index
ef2953e
..
acb21ed
100644
(file)
--- a/
includes/libs/rdbms/database/DBConnRef.php
+++ b/
includes/libs/rdbms/database/DBConnRef.php
@@
-281,7
+281,7
@@
class DBConnRef implements IDatabase {
}
public function estimateRowCount(
}
public function estimateRowCount(
- $table, $vars = '*', $conds = '', $fname = __METHOD__, $options = []
+ $table, $vars = '*', $conds = '', $fname = __METHOD__, $options = []
, $join_conds = []
) {
return $this->__call( __FUNCTION__, func_get_args() );
}
) {
return $this->__call( __FUNCTION__, func_get_args() );
}
@@
-350,10
+350,18
@@
class DBConnRef implements IDatabase {
return $this->__call( __FUNCTION__, func_get_args() );
}
return $this->__call( __FUNCTION__, func_get_args() );
}
+ public function buildSubstring( $input, $startPosition, $length = null ) {
+ return $this->__call( __FUNCTION__, func_get_args() );
+ }
+
public function buildStringCast( $field ) {
return $this->__call( __FUNCTION__, func_get_args() );
}
public function buildStringCast( $field ) {
return $this->__call( __FUNCTION__, func_get_args() );
}
+ public function buildIntegerCast( $field ) {
+ return $this->__call( __FUNCTION__, func_get_args() );
+ }
+
public function databasesAreIndependent() {
return $this->__call( __FUNCTION__, func_get_args() );
}
public function databasesAreIndependent() {
return $this->__call( __FUNCTION__, func_get_args() );
}
@@
-610,6
+618,10
@@
class DBConnRef implements IDatabase {
return $this->__call( __FUNCTION__, func_get_args() );
}
return $this->__call( __FUNCTION__, func_get_args() );
}
+ public function setIndexAliases( array $aliases ) {
+ return $this->__call( __FUNCTION__, func_get_args() );
+ }
+
/**
* Clean up the connection when out of scope
*/
/**
* Clean up the connection when out of scope
*/