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
Add CollationFa
[lhc/web/wiklou.git]
/
includes
/
db
/
DatabasePostgres.php
diff --git
a/includes/db/DatabasePostgres.php
b/includes/db/DatabasePostgres.php
index
d428710
..
c9127ff
100644
(file)
--- a/
includes/db/DatabasePostgres.php
+++ b/
includes/db/DatabasePostgres.php
@@
-392,9
+392,7
@@
class DatabasePostgres extends Database {
}
public function doQuery( $sql ) {
}
public function doQuery( $sql ) {
- if ( function_exists( 'mb_convert_encoding' ) ) {
- $sql = mb_convert_encoding( $sql, 'UTF-8' );
- }
+ $sql = mb_convert_encoding( $sql, 'UTF-8' );
// Clear previously left over PQresult
while ( $res = pg_get_result( $this->mConn ) ) {
pg_free_result( $res );
// Clear previously left over PQresult
while ( $res = pg_get_result( $this->mConn ) ) {
pg_free_result( $res );
@@
-840,7
+838,7
@@
__INDEXATTR__;
$tempres = (bool)$this->query( $tempsql, $fname, $savepoint );
if ( $savepoint ) {
$tempres = (bool)$this->query( $tempsql, $fname, $savepoint );
if ( $savepoint ) {
- $bar = pg_
last_error(
);
+ $bar = pg_
result_error( $this->mLastResult
);
if ( $bar != false ) {
$savepoint->rollback();
} else {
if ( $bar != false ) {
$savepoint->rollback();
} else {
@@
-865,7
+863,7
@@
__INDEXATTR__;
$sql .= '(' . $this->makeList( $args ) . ')';
$res = (bool)$this->query( $sql, $fname, $savepoint );
if ( $savepoint ) {
$sql .= '(' . $this->makeList( $args ) . ')';
$res = (bool)$this->query( $sql, $fname, $savepoint );
if ( $savepoint ) {
- $bar = pg_
last_error(
);
+ $bar = pg_
result_error( $this->mLastResult
);
if ( $bar != false ) {
$savepoint->rollback();
} else {
if ( $bar != false ) {
$savepoint->rollback();
} else {
@@
-948,7
+946,7
@@
__INDEXATTR__;
$res = (bool)$this->query( $sql, $fname, $savepoint );
if ( $savepoint ) {
$res = (bool)$this->query( $sql, $fname, $savepoint );
if ( $savepoint ) {
- $bar = pg_
last_error(
);
+ $bar = pg_
result_error( $this->mLastResult
);
if ( $bar != false ) {
$savepoint->rollback();
} else {
if ( $bar != false ) {
$savepoint->rollback();
} else {
@@
-1385,6
+1383,11
@@
SQL;
return (bool)$exists;
}
return (bool)$exists;
}
+ /**
+ * @var string $table
+ * @var string $field
+ * @return PostgresField|null
+ */
function fieldInfo( $table, $field ) {
return PostgresField::fromText( $this, $table, $field );
}
function fieldInfo( $table, $field ) {
return PostgresField::fromText( $this, $table, $field );
}