From e8fa2d34424a7dda34e62e3feb3e934330c1e9f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20BERNIGAUD?= Date: Sat, 27 Aug 2011 18:09:14 +0200 Subject: [PATCH] Added db4app lib, and apps test_db that shows how it works. Also fixed a typo in db.php --- apps/test_db/appinfo/app.php | 17 +++++ apps/test_db/appinfo/info.xml | 10 +++ apps/test_db/appinfo/install.php | 7 ++ apps/test_db/index.php | 26 +++++++ apps/test_db/templates/index.php | 17 +++++ lib/db.php | 2 +- lib/db4app.php | 117 +++++++++++++++++++++++++++++++ 7 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 apps/test_db/appinfo/app.php create mode 100644 apps/test_db/appinfo/info.xml create mode 100644 apps/test_db/appinfo/install.php create mode 100644 apps/test_db/index.php create mode 100644 apps/test_db/templates/index.php create mode 100644 lib/db4app.php diff --git a/apps/test_db/appinfo/app.php b/apps/test_db/appinfo/app.php new file mode 100644 index 00000000000..b1ec4c4639c --- /dev/null +++ b/apps/test_db/appinfo/app.php @@ -0,0 +1,17 @@ + 11, + 'id' => 'test_db', + 'name' => 'Test' )); + +OC_App::addNavigationEntry( array( + 'id' => 'test_db_index', + 'order' => 11, + 'href' => OC_Helper::linkTo( 'test_db', 'index.php' ), +/* + 'icon' => OC_Helper::imagePath( 'openstreetgame', 'icon.svg' ), +*/ + 'name' => 'Test DB' )); + +?> diff --git a/apps/test_db/appinfo/info.xml b/apps/test_db/appinfo/info.xml new file mode 100644 index 00000000000..06c716453cc --- /dev/null +++ b/apps/test_db/appinfo/info.xml @@ -0,0 +1,10 @@ + + + test_db + Test DB + A test of the db + 0.1 + AGPL + Côme BERNIGAUD + 2 + diff --git a/apps/test_db/appinfo/install.php b/apps/test_db/appinfo/install.php new file mode 100644 index 00000000000..034bf359140 --- /dev/null +++ b/apps/test_db/appinfo/install.php @@ -0,0 +1,7 @@ +execute(array('bar',42)); +*/ +?> diff --git a/apps/test_db/index.php b/apps/test_db/index.php new file mode 100644 index 00000000000..2569aedb9b3 --- /dev/null +++ b/apps/test_db/index.php @@ -0,0 +1,26 @@ +test1 = "test1"; + $this->test2 = 2; + } + public function show() { + echo "test1:".$this->test1."
test2:".$this->test2."
"; + } +}; + +$tmpl = new OC_Template( 'test_db', 'index', 'user' ); + +$tmpl->printPage(); +?> diff --git a/apps/test_db/templates/index.php b/apps/test_db/templates/index.php new file mode 100644 index 00000000000..3209e4d4b7b --- /dev/null +++ b/apps/test_db/templates/index.php @@ -0,0 +1,17 @@ +init(); +$t1->show(); +$testid = OC_DB4App::store('test_db','main',OC_User::getUser(),$t1); +echo "id in db is $testid
\n"; + +$t2 = OC_DB4App::get_object('test_db','main',$testid); +$t2->show(); + +print_r(OC_DB4App::get_objects('test_db','main',OC_User::getUser())); + +OC_DB4App::delete_object('test_db','main',$testid); + +OC_DB4App::drop('test_db','main'); +?> diff --git a/lib/db.php b/lib/db.php index 76d3fe5efcb..414525ae207 100644 --- a/lib/db.php +++ b/lib/db.php @@ -129,7 +129,7 @@ class OC_DB { // Die if we have an error (error means: bad query, not 0 results!) if( PEAR::isError($result)) { $entry = 'DB Error: "'.$result->getMessage().'"
'; - $entry .= 'Offending command was: '.$cmd.'
'; + $entry .= 'Offending command was: '.$query.'
'; error_log( $entry ); die( $entry ); } diff --git a/lib/db4app.php b/lib/db4app.php new file mode 100644 index 00000000000..1200652fada --- /dev/null +++ b/lib/db4app.php @@ -0,0 +1,117 @@ +. + * + */ + +require_once('base.php'); + +/** + * This class manages the access to the database from apps. It basically is a wrapper for + * OC_DB. It allows that apps doesn't contains SQL code. + */ +class OC_DB4App { + /** + * @brief Store an object in the database + * @param $appname Name of the application + * @param $table Name of the database table + * @param $userid Id of owner of the object + * @param $object Object to save in the database + * @returns id of the object in the database + * + */ + static public function store($appname,$tablename,$userid,$object) { + $table = $appname."_".$tablename; + if(OC_DB::connect()) { + $CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" ); + if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){ + $idline = "id INTEGER PRIMARY KEY AUTOINCREMENT"; + } else { + $idline = "id int NOT NULL AUTO_INCREMENT"; + } + $query = "CREATE TABLE IF NOT EXISTS *PREFIX*$table ($idline,uid int REFERENCES user(id),object text)"; + OC_DB::query($query); + $query = "INSERT INTO *PREFIX*$table (uid,object) VALUES ('$userid','".OC_DB::escape(base64_encode(serialize($object)))."')"; + OC_DB::query($query); + return OC_DB::insertid(); + } else { + die ("could not connect to database"); + } + } + + /** + * @brief Get an object from the database + * @param $appname Name of the application + * @param $table Name of the database table + * @param $objectid Id of the object + * @returns the object + * + */ + static public function get_object($appname,$tablename,$objectid) { + $table = $appname."_".$tablename; + if(OC_DB::connect()) { + $query = "SELECT object FROM *PREFIX*$table WHERE id='".OC_DB::escape($objectid)."'"; + $q = OC_DB::prepare($query); + $result = $q->execute()->fetchOne(); + return unserialize(base64_decode($result)); + } else { + die ("could not connect to database"); + } + + } + + static public function get_objects($appname,$tablename,$userid) { + $table = $appname."_".$tablename; + if(OC_DB::connect()) { + $query = "SELECT id FROM *PREFIX*$table WHERE uid='".OC_DB::escape($userid)."'"; + $q = OC_DB::prepare($query); + $result = $q->execute()->fetchAll(); + return $result; + } else { + die ("could not connect to database"); + } + } + + static public function delete_object($appname,$tablename,$objectid) { + $table = $appname."_".$tablename; + if(OC_DB::connect()) { + $query = "DELETE FROM *PREFIX*$table WHERE id='".OC_DB::escape($objectid)."'"; + $q = OC_DB::prepare($query); + $q->execute(); + return true; + } else { + die ("could not connect to database"); + } + + } + + static public function drop($appname,$tablename) { + $table = $appname."_".$tablename; + if(OC_DB::connect()) { + $query = "DROP TABLE *PREFIX*$table"; + $q = OC_DB::prepare($query); + $q->execute(); + return true; + } else { + die ("could not connect to database"); + } + + } +} +?> -- 2.39.5