Merge pull request #8274 from owncloud/appframework-db

Port database layer from appframework to core

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/private/server.php b/lib/private/server.php
index 4c29092cf44..27763ea6477 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -3,6 +3,7 @@
 namespace OC;
 
 use OC\AppFramework\Http\Request;
+use OC\AppFramework\Db\Db;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\Cache\UserCache;
 use OC\DB\ConnectionWrapper;
@@ -177,6 +178,9 @@ class Server extends SimpleContainer implements IServerContainer {
 			}
 			return $router;
 		});
+		$this['Db'] = $this->share(function($c){
+			return new Db();
+		});
 	}
 
 	/**
@@ -400,4 +404,13 @@ class Server extends SimpleContainer implements IServerContainer {
 	function getRouter(){
 		return $this->query('Router');
 	}
+
+
+	/**
+	 * Returns an instance of the db facade
+	 * @return \OCP\IDb
+	 */
+	function getDb() {
+		return $this->query('Db');
+	}
 }