Add tableExists to public db api

3 files changed, 23 insertions, 38 deletions

diff --git a/lib/private/db.php b/lib/private/db.php
index 9387cc48457..dc25092e276 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -325,42 +325,7 @@ class OC_DB {
 	 * @throws \OC\DatabaseException
 	 */
 	public static function tableExists($table) {
-
-		$table = OC_Config::getValue('dbtableprefix', 'oc_' ) . trim($table);
-
-		$dbType = OC_Config::getValue( 'dbtype', 'sqlite' );
-		switch ($dbType) {
-			case 'sqlite':
-			case 'sqlite3':
-				$sql = "SELECT name FROM sqlite_master "
-					.  "WHERE type = 'table' AND name = ? "
-					.  "UNION ALL SELECT name FROM sqlite_temp_master "
-					.  "WHERE type = 'table' AND name = ?";
-				$result = \OC_DB::executeAudited($sql, array($table, $table));
-				break;
-			case 'mysql':
-				$sql = 'SHOW TABLES LIKE ?';
-				$result = \OC_DB::executeAudited($sql, array($table));
-				break;
-			case 'pgsql':
-				$sql = 'SELECT tablename AS table_name, schemaname AS schema_name '
-					.  'FROM pg_tables WHERE schemaname NOT LIKE \'pg_%\' '
-					.  'AND schemaname != \'information_schema\' '
-					.  'AND tablename = ?';
-				$result = \OC_DB::executeAudited($sql, array($table));
-				break;
-			case 'oci':
-				$sql = 'SELECT TABLE_NAME FROM USER_TABLES WHERE TABLE_NAME = ?';
-				$result = \OC_DB::executeAudited($sql, array($table));
-				break;
-			case 'mssql':
-				$sql = 'SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = ?';
-				$result = \OC_DB::executeAudited($sql, array($table));
-				break;
-			default:
-				throw new \OC\DatabaseException("Unknown database type: $dbType");
-		}
-
-		return $result->fetchOne() === $table;
+		$connection = \OC::$server->getDatabaseConnection();
+		return $connection->tableExists($table);
 	}
 }
diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php
index e2d90c8fc82..9de7a719ff5 100644
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -177,6 +177,18 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
 		}
 	}
 
+	/**
+	 * Check if a table exists
+	 *
+	 * @param string $table table name without the prefix
+	 * @return bool
+	 */
+	public function tableExists($table){
+		$table = $this->tablePrefix . trim($table);
+		$schema = $this->getSchemaManager();
+		return $schema->tablesExist(array($table));
+	}
+
 	// internal use
 	/**
 	 * @param string $statement
diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php
index bc563d20b42..32310fe755f 100644
--- a/lib/public/idbconnection.php
+++ b/lib/public/idbconnection.php
@@ -162,7 +162,15 @@ interface IDBConnection {
 	/**
 	 * Drop a table from the database if it exists
 	 *
-	 * @param string $table
+	 * @param string $table table name without the prefix
 	 */
 	public function dropTable($table);
+
+	/**
+	 * Check if a table exists
+	 *
+	 * @param string $table table name without the prefix
+	 * @return bool
+	 */
+	public function tableExists($table);
 }