dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
88e8af8
)
Fix for fatal error in r90429: you can't have a protected function in an interface.
author
Tim Starling
<tstarling@users.mediawiki.org>
Mon, 20 Jun 2011 07:19:20 +0000
(07:19 +0000)
committer
Tim Starling
<tstarling@users.mediawiki.org>
Mon, 20 Jun 2011 07:19:20 +0000
(07:19 +0000)
includes/db/Database.php
patch
|
blob
|
history
diff --git
a/includes/db/Database.php
b/includes/db/Database.php
index
c1b3246
..
78d31a4
100644
(file)
--- a/
includes/db/Database.php
+++ b/
includes/db/Database.php
@@
-42,14
+42,6
@@
interface DatabaseType {
*/
function open( $server, $user, $password, $dbName );
*/
function open( $server, $user, $password, $dbName );
- /**
- * The DBMS-dependent part of query()
- *
- * @param $sql String: SQL query.
- * @return Result object to feed to fetchObject, fetchRow, ...; or false on failure
- */
- protected function doQuery( $sql );
-
/**
* Fetch the next row from the given result object, in object form.
* Fields can be retrieved with $row->fieldname, with fields acting like
/**
* Fetch the next row from the given result object, in object form.
* Fields can be retrieved with $row->fieldname, with fields acting like
@@
-684,6
+676,14
@@
abstract class DatabaseBase implements DatabaseType {
throw new DBConnectionError( $this, $error );
}
throw new DBConnectionError( $this, $error );
}
+ /**
+ * The DBMS-dependent part of query()
+ *
+ * @param $sql String: SQL query.
+ * @return Result object to feed to fetchObject, fetchRow, ...; or false on failure
+ */
+ protected abstract function doQuery( $sql );
+
/**
* Determine whether a query writes to the DB.
* Should return true if unsure.
/**
* Determine whether a query writes to the DB.
* Should return true if unsure.