more generic way for autoincrement (bca4d384) · Commits · jan.koester / blogi

plugins/content/content.cpp

+5 −3

Original line number	Diff line number	Diff line
		@@ -627,8 +627,9 @@ namespace blogi {
		void initPlugin(){
		blogi::SQL sql;
		blogi::DBResult res;
		sql << "CREATE TABLE IF NOT EXISTS content ("
		<< "id INTEGER PRIMARY KEY,"
		sql << "CREATE SEQUENCE IF NOT EXISTS content_sequence; "
		<< "CREATE TABLE IF NOT EXISTS content ("
		<< "id INTEGER PRIMARY KEY DEFAULT nextval('content_sequence')"
		<< "title character varying(255) NOT NULL,"
		<< "text text NOT NULL,"
		<< "descrition character varying(255) NOT NULL,"
		@@ -636,8 +637,9 @@ namespace blogi {
		<< "created date NOT NULL,"
		<< "FOREIGN KEY (author) REFERENCES users(id)"
		<< "); "
		<< "CREATE SEQUENCE IF NOT EXISTS tags_sequence; "
		<< "CREATE TABLE IF NOT EXISTS tags ("
		<< "id INTEGER PRIMARY KEY,"
		<< "id INTEGER PRIMARY KEY DEFAULT nextval('tags_sequence')"
		<< "name character varying(255) NOT NULL UNIQUE"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS tags_content ("

plugins/gameinfo/gameinfo.cpp

+5 −3

Original line number	Diff line number	Diff line
		@@ -65,12 +65,14 @@ namespace blogi {
		blogi::DBResult res;


		sql << "CREATE TABLE IF NOT EXISTS gameserver_protocols("
		<< "id INTEGER PRIMARY KEY,"
		sql << "CREATE SEQUENCE IF NOT EXISTS gameserver_protocols_sequence; "
		<< "CREATE TABLE IF NOT EXISTS gameserver_protocols("
		<< "id INTEGER PRIMARY KEY DEFAULT NEXTVAL('gameserver_protocols_sequence'),"
		<< "pname character varying(255) NOT NULL"
		<< "); "
		<< "CREATE SEQUENCE IF NOT EXISTS gameserver_sequence;"
		<< "CREATE TABLE IF NOT EXISTS gameserver("
		<< "id INTEGER PRIMARY KEY,"
		<< "id INTEGER PRIMARY KEY DEFAULT NEXTVAL('gameserver_sequence'),"
		<< "protocol integer,"
		<< "addr character varying(255) NOT NULL,"
		<< "port integer,"

plugins/media/media.cpp

+13 −7

Original line number	Diff line number	Diff line
		@@ -425,27 +425,31 @@ namespace blogi {

		blogi::SQL sql;
		blogi::DBResult res;
		sql << "CREATE TABLE IF NOT EXISTS media_albums ("
		<< "id INTEGER PRIMARY KEY,"
		sql << "CREATE SEQUENCE IF NOT EXISTS media_albums_sequence; "
		<< "CREATE TABLE IF NOT EXISTS media_albums ("
		<< "id INTEGER PRIMARY KEY DEFAULT NEXTVAL('media_albums_sequence'),"
		<< "name character varying(255) NOT NULL,"
		<< "owner integer NOT NULL,"
		<< "created date NOT NULL,"
		<< "FOREIGN KEY (owner) REFERENCES users (id)"
		<< "); "
		<< "CREATE SEQUENCE IF NOT EXISTS media_type_sequence; "
		<< "CREATE TABLE IF NOT EXISTS media_type ("
		<< "id INTEGER PRIMARY KEY,"
		<< "id INTEGER PRIMARY KEY DEFAULT NEXTVAL('media_type_sequence'),"
		<< "type integer NOT NULL,"
		<< "ext character varying(255) NOT NULL,"
		<< "ctype character varying(255) NOT NULL"
		<< "); "
		<< "CREATE SEQUENCE IF NOT EXISTS media_items_sequence; "
		<< "CREATE TABLE IF NOT EXISTS media_items ("
		<< "id INTEGER PRIMARY KEY,"
		<< "id INTEGER PRIMARY KEY DEFAULT NEXTVAL('media_items_sequence'),"
		<< "album_id integer NOT NULL,"
		<< "name character varying(255) NOT NULL,"
		<< "FOREIGN KEY (album_id) REFERENCES media_albums (id)"
		<< "); "
		<< "CREATE SEQUENCE IF NOT EXISTS media_items_files_sequence; "
		<< "CREATE TABLE IF NOT EXISTS media_items_files ("
		<< "id INTEGER PRIMARY KEY ,"
		<< "id INTEGER PRIMARY KEY DEFAULT NEXTVAL('media_items_files_sequence'),"
		<< "media_items_id integer NOT NULL,"
		<< "redis_uuid uuid NOT NULL,"
		<< "media_type_id integer NOT NULL,"
		@@ -453,15 +457,17 @@ namespace blogi {
		<< "FOREIGN KEY (media_items_id) REFERENCES media_items (id),"
		<< "FOREIGN KEY (media_type_id) REFERENCES media_type (id)"
		<< "); "
		<< "CREATE SEQUENCE IF NOT EXISTS media_preview_sequence; "
		<< "CREATE TABLE IF NOT EXISTS media_preview ("
		<< "id INTEGER PRIMARY KEY,"
		<< "id INTEGER PRIMARY KEY DEFAULT NEXTVAL('media_preview_sequence'),"
		<< "name character varying(255) NOT NULL,"
		<< "options character varying(255),"
		<< "media_type_id integer,"
		<< "FOREIGN KEY (media_type_id) REFERENCES media_type (id)"
		<< "); "
		<< "CREATE SEQUENCE IF NOT EXISTS media_items_preview_sequence; "
		<< "CREATE TABLE IF NOT EXISTS media_items_preview ("
		<< "id INTEGER PRIMARY KEY,"
		<< "id INTEGER PRIMARY KEY DEFAULT NEXTVAL('media_items_preview_sequence'),"
		<< "media_items_id integer NOT NULL,"
		<< "redis_uuid uuid NOT NULL,"
		<< "media_type_id integer NOT NULL,"

plugins/navbar/navbar.cpp

+5 −3

Original line number	Diff line number	Diff line
		@@ -57,13 +57,15 @@ namespace blogi {
		void initPlugin(){
		blogi::SQL sql;
		blogi::DBResult res;
		sql << "CREATE TABLE IF NOT EXISTS navbar("
		<< "id INTEGER PRIMARY KEY,"
		sql << "CREATE SEQUENCE IF NOT EXISTS navbar; "
		<< "CREATE TABLE IF NOT EXISTS navbar("
		<< "id INTEGER PRIMARY KEY DEFAULT NEXTVAL('navbar_sequence'),"
		<< "name character varying(255) NOT NULL,"
		<< "container_id character varying(255) NOT NULL"
		<< "); "
		<< "CREATE SEQUENCE IF NOT EXISTS navbar_items; "
		<< "CREATE TABLE IF NOT EXISTS navbar_items("
		<< "id INTEGER PRIMARY KEY,"
		<< "id INTEGER PRIMARY KEY DEFAULT NEXTVAL('navbar_items_sequence'),"
		<< "name character varying(255) NOT NULL,"
		<< "url character varying(255) NOT NULL,"
		<< "navbar_id integer,"

plugins/staticpage/static.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -44,8 +44,9 @@ blogi::StaticPage::~StaticPage(){
		void blogi::StaticPage::initPlugin(){
		blogi::SQL sql;
		blogi::DBResult res;
		sql << "CREATE TABLE IF NOT EXISTS static_content ("
		<< "id INTEGER PRIMARY KEY,"
		sql << "CREATE SEQUENCE IF NOT EXISTS static_content_sequence; "
		<< "CREATE TABLE IF NOT EXISTS static_content ("
		<< "id INTEGER PRIMARY KEY DEFAULT nextval('static_content_sequence'),"
		<< "text text,"
		<< "meta text,"
		<< "url character varying(255) NOT NULL UNIQUE"