From 687319540e42ad380a8c8a18c1fcb93a96b53aa1 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 6 Jan 2014 19:32:50 +0100
Subject: [PATCH] Return correct values and types

Change-Id: Ia069856160aae1ab937daee2da0d6800fe89698f
---
 includes/db/DatabaseMysqlBase.php | 3 ++-
 includes/db/DatabaseOracle.php    | 4 ++--
 includes/db/DatabasePostgres.php  | 2 +-
 includes/db/DatabaseSqlite.php    | 4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/includes/db/DatabaseMysqlBase.php b/includes/db/DatabaseMysqlBase.php
index 587d72718b..273cd8f82d 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -1023,7 +1023,8 @@ abstract class DatabaseMysqlBase extends DatabaseBase {
 		$newName = $this->addIdentifierQuotes( $newName );
 		$oldName = $this->addIdentifierQuotes( $oldName );
 		$query = "CREATE $tmp TABLE $newName (LIKE $oldName)";
-		$this->query( $query, $fname );
+
+		return $this->query( $query, $fname );
 	}
 
 	/**
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index bb901b1999..b1a8f66e98 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -723,7 +723,7 @@ class DatabaseOracle extends DatabaseBase {
 			oci_commit( $this->mConn );
 		}
 
-		oci_free_statement( $stmt );
+		return oci_free_statement( $stmt );
 	}
 
 	function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = __METHOD__,
@@ -1497,7 +1497,7 @@ class DatabaseOracle extends DatabaseBase {
 			oci_commit( $this->mConn );
 		}
 
-		oci_free_statement( $stmt );
+		return oci_free_statement( $stmt );
 	}
 
 	function bitNot( $field ) {
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 3e58c66446..9f96ccbf57 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -381,7 +381,7 @@ class DatabasePostgres extends DatabaseBase {
 		global $wgDBport;
 
 		if ( !strlen( $user ) ) { # e.g. the class is being loaded
-			return;
+			return null;
 		}
 
 		$this->mServer = $server;
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 6d2693f6fb..5f14aefb1e 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -150,8 +150,10 @@ class DatabaseSqlite extends DatabaseBase {
 			# Enforce LIKE to be case sensitive, just like MySQL
 			$this->query( 'PRAGMA case_sensitive_like = 1' );
 
-			return true;
+			return $this->mConn;
 		}
+
+		return false;
 	}
 
 	/**
-- 
2.20.1