tested against sqlite (e317fab2) · Commits · jan.koester / blogi

plugins/content/content.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -61,19 +61,19 @@ namespace blogi {
		int ncount=0;

		if (tag) {
		sql = "select id from tags where name='"; sql.escaped(tag) << "' LIMIT 1";
		sql = "SELECT id FROM tags where name='"; sql.escaped(tag) << "' LIMIT 1";
		if(Args->database->exec(&sql,res)<1){
		excep[libhttppp::HTTPException::Critical] << "no tag data found for this name!";
		throw excep;
		}else {
		sql = "select content.id,content.title,content.descrition,users.displayname,content.created from content ";
		sql = "SELECT content.id,content.title,content.descrition,users.displayname,content.created FROM content ";
		sql <<"LEFT JOIN users ON content.author=users.id LEFT JOIN tags_content ON tags_content.content_id=content.id where tags_content.tag_id='"
		<< res[0][0]
		<<"' ORDER BY content.id DESC LIMIT '" << end << "' OFFSET " << start;
		ncount=Args->database->exec(&sql,res);
		}
		} else {
		sql="select content.id,content.title,content.descrition,users.displayname,content.created from content LEFT JOIN users ON content.author=users.id ORDER BY content.id DESC";
		sql="SELECT content.id,content.title,content.descrition,users.displayname,content.created FROM content LEFT JOIN users ON content.author=users.id ORDER BY content.id DESC";
		sql << " LIMIT '" << end << "' OFFSET " << start;
		ncount=Args->database->exec(&sql,res);
		}
		@@ -135,7 +135,7 @@ namespace blogi {
		condat << "<div id=\"idxtags\"><ul>";

		for (int i = 0; i < tcount; i++) {
		sql="select from tags_content where tag_id = '";
		sql="select tag_id FROM tags_content where tag_id = '";
		sql << res[i][1] << "'";
		blogi::DBResult rescnt;
		condat << "<li><a href=\""
		@@ -628,7 +628,7 @@ namespace blogi {
		blogi::SQL sql;
		blogi::DBResult res;
		sql << "CREATE TABLE IF NOT EXISTS content ("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "title character varying(255) NOT NULL,"
		<< "text text NOT NULL,"
		<< "descrition character varying(255) NOT NULL,"
		@@ -637,7 +637,7 @@ namespace blogi {
		<< "FOREIGN KEY (author) REFERENCES users(id)"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS tags ("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "name character varying(255) NOT NULL UNIQUE"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS tags_content ("

plugins/gameinfo/gameinfo.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -66,11 +66,11 @@ namespace blogi {


		sql << "CREATE TABLE IF NOT EXISTS gameserver_protocols("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "pname character varying(255) NOT NULL"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS gameserver("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "protocol integer,"
		<< "addr character varying(255) NOT NULL,"
		<< "port integer,"

plugins/media/media.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -426,26 +426,26 @@ namespace blogi {
		blogi::SQL sql;
		blogi::DBResult res;
		sql << "CREATE TABLE IF NOT EXISTS media_albums ("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "name character varying(255) NOT NULL,"
		<< "owner integer NOT NULL,"
		<< "created date NOT NULL,"
		<< "FOREIGN KEY (owner) REFERENCES users (id)"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS media_type ("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "type integer NOT NULL,"
		<< "ext character varying(255) NOT NULL,"
		<< "ctype character varying(255) NOT NULL"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS media_items ("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "album_id integer NOT NULL,"
		<< "name character varying(255) NOT NULL,"
		<< "FOREIGN KEY (album_id) REFERENCES media_albums (id)"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS media_items_files ("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "media_items_id integer NOT NULL,"
		<< "redis_uuid uuid NOT NULL,"
		<< "media_type_id integer NOT NULL,"
		@@ -454,14 +454,14 @@ namespace blogi {
		<< "FOREIGN KEY (media_type_id) REFERENCES media_type (id)"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS media_preview ("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "name character varying(255) NOT NULL,"
		<< "options character varying(255),"
		<< "media_type_id integer,"
		<< "FOREIGN KEY (media_type_id) REFERENCES media_type (id)"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS media_items_preview ("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "media_items_id integer NOT NULL,"
		<< "redis_uuid uuid NOT NULL,"
		<< "media_type_id integer NOT NULL,"

plugins/navbar/navbar.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,12 +58,12 @@ namespace blogi {
		blogi::SQL sql;
		blogi::DBResult res;
		sql << "CREATE TABLE IF NOT EXISTS navbar("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "name character varying(255) NOT NULL,"
		<< "container_id character varying(255) NOT NULL"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS navbar_items("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "name character varying(255) NOT NULL,"
		<< "url character varying(255) NOT NULL,"
		<< "navbar_id integer,"

plugins/staticpage/static.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ void blogi::StaticPage::initPlugin(){
		blogi::SQL sql;
		blogi::DBResult res;
		sql << "CREATE TABLE IF NOT EXISTS static_content ("
		<< "id integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,"
		<< "id integer PRIMARY KEY " << Args->database->autoincrement() << ","
		<< "text text,"
		<< "meta text,"
		<< "url character varying(255) NOT NULL UNIQUE"