Loading editor/src/webedit_db.cpp +9 −7 Changes for editor/src/webedit_db.cpp: 9 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -42,9 +42,11 @@ void webedit::Database::initTables() { dbpp::SQL sql; dbpp::DBResult res; const std::string keyColumn = dbpp::quoteIdentifier(*_db, "key"); dbpp::SQL uuidTypeSql; const std::string uuidType = _db->getUUIDType(uuidTypeSql); sql << "CREATE TABLE IF NOT EXISTS documents(" << "id " << _db->getUUIDType(sql) << "," << "id " << uuidType << "," << "owner_uid varchar(255) NOT NULL," << "domain varchar(255) NOT NULL DEFAULT ''," << "group_name varchar(255) NOT NULL DEFAULT ''," Loading @@ -61,7 +63,7 @@ void webedit::Database::initTables() { res.clear(); sql << "CREATE TABLE IF NOT EXISTS session(" << "id " << _db->getUUIDType(sql) << "," << "id " << uuidType << "," << "useragent text," << "created timestamp DEFAULT CURRENT_TIMESTAMP," << "PRIMARY KEY (id)" Loading @@ -73,7 +75,7 @@ void webedit::Database::initTables() { res.clear(); sql << "CREATE TABLE IF NOT EXISTS session_data(" << "sessionid " << _db->getUUIDType(sql) << "," << "sessionid " << uuidType << "," << keyColumn << " varchar(255)," << "value text," << "FOREIGN KEY (sessionid) REFERENCES session (id)" Loading @@ -85,8 +87,8 @@ void webedit::Database::initTables() { res.clear(); sql << "CREATE TABLE IF NOT EXISTS document_revisions(" << "id " << _db->getUUIDType(sql) << "," << "document_id " << _db->getUUIDType(sql) << " NOT NULL," << "id " << uuidType << "," << "document_id " << uuidType << " NOT NULL," << "revision integer NOT NULL," << "name varchar(255) NOT NULL," << "xml text NOT NULL," Loading @@ -102,7 +104,7 @@ void webedit::Database::initTables() { res.clear(); sql << "CREATE TABLE IF NOT EXISTS options(" << "id " << _db->getUUIDType(sql) << "," << "id " << uuidType << "," << keyColumn << " varchar(255) UNIQUE NOT NULL," << "value text NOT NULL," << "PRIMARY KEY (id)" Loading @@ -114,7 +116,7 @@ void webedit::Database::initTables() { res.clear(); sql << "CREATE TABLE IF NOT EXISTS connections(" << "id " << _db->getUUIDType(sql) << "," << "id " << uuidType << "," << "owner_uid varchar(255) NOT NULL," << "name varchar(255) NOT NULL," << "group_name varchar(255) DEFAULT ''," Loading plugins/contact/contact.cpp +3 −1 Changes for plugins/contact/contact.cpp: 3 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -71,8 +71,10 @@ namespace blogi { dbpp::SQL sql; dbpp::DBResult res; dbpp::SQL uuidTypeSql; const std::string uuidType = Args->database[0]->getUUIDType(uuidTypeSql); sql << "CREATE TABLE IF NOT EXISTS contact_pending (" << "token " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "token " << uuidType << " PRIMARY KEY," << "name character varying(255) NOT NULL," << "mail character varying(255) NOT NULL," << "message text NOT NULL," Loading plugins/content/content.cpp +28 −14 Changes for plugins/content/content.cpp: 28 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -1829,30 +1829,44 @@ std::cerr << "DEBUG: authid=" << authid << " currentAuthor=" << currentAuthor << dbpp::SQL sql; dbpp::DBResult res; dbpp::SQL uuidTypeSql; const std::string uuidType = Args->database[0]->getUUIDType(uuidTypeSql); sql << "CREATE TABLE IF NOT EXISTS content (" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "id " << uuidType << " PRIMARY KEY," << "title character varying(255) NOT NULL UNIQUE," << "slug character varying(255) NOT NULL DEFAULT ''," << "text text NOT NULL," << "descrition character varying(255) NOT NULL," << "author " << Args->database[0]->getUUIDType(sql) << "," << "author " << uuidType << "," << "created date NOT NULL," << "FOREIGN KEY (author) REFERENCES users(id)" << "); " << "CREATE TABLE IF NOT EXISTS tags (" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << ");"; Args->database[0]->exec(sql,res); sql.clear(); res.clear(); sql << "CREATE TABLE IF NOT EXISTS tags (" << "id " << uuidType << " PRIMARY KEY," << "name character varying(255) NOT NULL UNIQUE" << "); " << "CREATE TABLE IF NOT EXISTS tags_content (" << "tag_id " << Args->database[0]->getUUIDType(sql) << " NOT NULL," << "content_id " << Args->database[0]->getUUIDType(sql) << " NOT NULL," << ");"; Args->database[0]->exec(sql,res); sql.clear(); res.clear(); sql << "CREATE TABLE IF NOT EXISTS tags_content (" << "tag_id " << uuidType << " NOT NULL," << "content_id " << uuidType << " NOT NULL," << "FOREIGN KEY (content_id) REFERENCES content (id)," << "FOREIGN KEY (tag_id) REFERENCES tags (id)" << "); " << "CREATE TABLE IF NOT EXISTS comments (" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "content_id " << Args->database[0]->getUUIDType(sql) << " NOT NULL," << "user_id " << Args->database[0]->getUUIDType(sql) << "," << ");"; Args->database[0]->exec(sql,res); sql.clear(); res.clear(); sql << "CREATE TABLE IF NOT EXISTS comments (" << "id " << uuidType << " PRIMARY KEY," << "content_id " << uuidType << " NOT NULL," << "user_id " << uuidType << "," << "author_name character varying(255) NOT NULL," << "email character varying(255)," << "text text NOT NULL," Loading plugins/gameinfo/gameinfo.cpp +11 −5 Changes for plugins/gameinfo/gameinfo.cpp: 11 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -79,15 +79,21 @@ namespace blogi { dbpp::SQL sql; dbpp::DBResult res; dbpp::SQL uuidTypeSql; const std::string uuidType = Args->database[0]->getUUIDType(uuidTypeSql); sql << "CREATE TABLE IF NOT EXISTS gameserver_protocols(" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "id " << uuidType << " PRIMARY KEY," << "pname character varying(255) NOT NULL" << "); " << "CREATE TABLE IF NOT EXISTS gameserver(" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "protocol " << Args->database[0]->getUUIDType(sql) << "," << ");"; Args->database[0]->exec(sql,res); sql.clear(); res.clear(); sql << "CREATE TABLE IF NOT EXISTS gameserver(" << "id " << uuidType << " PRIMARY KEY," << "protocol " << uuidType << "," << "addr character varying(255) NOT NULL," << "port integer," << "FOREIGN KEY (protocol) REFERENCES gameserver_protocols (id)" Loading plugins/navbar/navbar.cpp +11 −5 Changes for plugins/navbar/navbar.cpp: 11 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -68,19 +68,25 @@ namespace blogi { dbpp::SQL sql; dbpp::DBResult res; dbpp::SQL uuidTypeSql; const std::string uuidType = Args->database[0]->getUUIDType(uuidTypeSql); sql << "CREATE TABLE IF NOT EXISTS navbar(" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "id " << uuidType << " PRIMARY KEY," << "name character varying(255) NOT NULL," << "container_id character varying(255) NOT NULL" << "); " << "CREATE TABLE IF NOT EXISTS navbar_items(" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << ");"; Args->database[0]->exec(sql,res); sql.clear(); res.clear(); sql << "CREATE TABLE IF NOT EXISTS navbar_items(" << "id " << uuidType << " PRIMARY KEY," << "name character varying(255) NOT NULL," << "url character varying(255) NOT NULL," << "type integer default 0," << "position integer default 0," << "navbar_id " << Args->database[0]->getUUIDType(sql) << "," << "navbar_id " << uuidType << "," << "FOREIGN KEY (navbar_id) REFERENCES navbar (id)" << ");"; Args->database[0]->exec(sql,res); Loading Loading
editor/src/webedit_db.cpp +9 −7 Changes for editor/src/webedit_db.cpp: 9 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -42,9 +42,11 @@ void webedit::Database::initTables() { dbpp::SQL sql; dbpp::DBResult res; const std::string keyColumn = dbpp::quoteIdentifier(*_db, "key"); dbpp::SQL uuidTypeSql; const std::string uuidType = _db->getUUIDType(uuidTypeSql); sql << "CREATE TABLE IF NOT EXISTS documents(" << "id " << _db->getUUIDType(sql) << "," << "id " << uuidType << "," << "owner_uid varchar(255) NOT NULL," << "domain varchar(255) NOT NULL DEFAULT ''," << "group_name varchar(255) NOT NULL DEFAULT ''," Loading @@ -61,7 +63,7 @@ void webedit::Database::initTables() { res.clear(); sql << "CREATE TABLE IF NOT EXISTS session(" << "id " << _db->getUUIDType(sql) << "," << "id " << uuidType << "," << "useragent text," << "created timestamp DEFAULT CURRENT_TIMESTAMP," << "PRIMARY KEY (id)" Loading @@ -73,7 +75,7 @@ void webedit::Database::initTables() { res.clear(); sql << "CREATE TABLE IF NOT EXISTS session_data(" << "sessionid " << _db->getUUIDType(sql) << "," << "sessionid " << uuidType << "," << keyColumn << " varchar(255)," << "value text," << "FOREIGN KEY (sessionid) REFERENCES session (id)" Loading @@ -85,8 +87,8 @@ void webedit::Database::initTables() { res.clear(); sql << "CREATE TABLE IF NOT EXISTS document_revisions(" << "id " << _db->getUUIDType(sql) << "," << "document_id " << _db->getUUIDType(sql) << " NOT NULL," << "id " << uuidType << "," << "document_id " << uuidType << " NOT NULL," << "revision integer NOT NULL," << "name varchar(255) NOT NULL," << "xml text NOT NULL," Loading @@ -102,7 +104,7 @@ void webedit::Database::initTables() { res.clear(); sql << "CREATE TABLE IF NOT EXISTS options(" << "id " << _db->getUUIDType(sql) << "," << "id " << uuidType << "," << keyColumn << " varchar(255) UNIQUE NOT NULL," << "value text NOT NULL," << "PRIMARY KEY (id)" Loading @@ -114,7 +116,7 @@ void webedit::Database::initTables() { res.clear(); sql << "CREATE TABLE IF NOT EXISTS connections(" << "id " << _db->getUUIDType(sql) << "," << "id " << uuidType << "," << "owner_uid varchar(255) NOT NULL," << "name varchar(255) NOT NULL," << "group_name varchar(255) DEFAULT ''," Loading
plugins/contact/contact.cpp +3 −1 Changes for plugins/contact/contact.cpp: 3 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -71,8 +71,10 @@ namespace blogi { dbpp::SQL sql; dbpp::DBResult res; dbpp::SQL uuidTypeSql; const std::string uuidType = Args->database[0]->getUUIDType(uuidTypeSql); sql << "CREATE TABLE IF NOT EXISTS contact_pending (" << "token " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "token " << uuidType << " PRIMARY KEY," << "name character varying(255) NOT NULL," << "mail character varying(255) NOT NULL," << "message text NOT NULL," Loading
plugins/content/content.cpp +28 −14 Changes for plugins/content/content.cpp: 28 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -1829,30 +1829,44 @@ std::cerr << "DEBUG: authid=" << authid << " currentAuthor=" << currentAuthor << dbpp::SQL sql; dbpp::DBResult res; dbpp::SQL uuidTypeSql; const std::string uuidType = Args->database[0]->getUUIDType(uuidTypeSql); sql << "CREATE TABLE IF NOT EXISTS content (" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "id " << uuidType << " PRIMARY KEY," << "title character varying(255) NOT NULL UNIQUE," << "slug character varying(255) NOT NULL DEFAULT ''," << "text text NOT NULL," << "descrition character varying(255) NOT NULL," << "author " << Args->database[0]->getUUIDType(sql) << "," << "author " << uuidType << "," << "created date NOT NULL," << "FOREIGN KEY (author) REFERENCES users(id)" << "); " << "CREATE TABLE IF NOT EXISTS tags (" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << ");"; Args->database[0]->exec(sql,res); sql.clear(); res.clear(); sql << "CREATE TABLE IF NOT EXISTS tags (" << "id " << uuidType << " PRIMARY KEY," << "name character varying(255) NOT NULL UNIQUE" << "); " << "CREATE TABLE IF NOT EXISTS tags_content (" << "tag_id " << Args->database[0]->getUUIDType(sql) << " NOT NULL," << "content_id " << Args->database[0]->getUUIDType(sql) << " NOT NULL," << ");"; Args->database[0]->exec(sql,res); sql.clear(); res.clear(); sql << "CREATE TABLE IF NOT EXISTS tags_content (" << "tag_id " << uuidType << " NOT NULL," << "content_id " << uuidType << " NOT NULL," << "FOREIGN KEY (content_id) REFERENCES content (id)," << "FOREIGN KEY (tag_id) REFERENCES tags (id)" << "); " << "CREATE TABLE IF NOT EXISTS comments (" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "content_id " << Args->database[0]->getUUIDType(sql) << " NOT NULL," << "user_id " << Args->database[0]->getUUIDType(sql) << "," << ");"; Args->database[0]->exec(sql,res); sql.clear(); res.clear(); sql << "CREATE TABLE IF NOT EXISTS comments (" << "id " << uuidType << " PRIMARY KEY," << "content_id " << uuidType << " NOT NULL," << "user_id " << uuidType << "," << "author_name character varying(255) NOT NULL," << "email character varying(255)," << "text text NOT NULL," Loading
plugins/gameinfo/gameinfo.cpp +11 −5 Changes for plugins/gameinfo/gameinfo.cpp: 11 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -79,15 +79,21 @@ namespace blogi { dbpp::SQL sql; dbpp::DBResult res; dbpp::SQL uuidTypeSql; const std::string uuidType = Args->database[0]->getUUIDType(uuidTypeSql); sql << "CREATE TABLE IF NOT EXISTS gameserver_protocols(" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "id " << uuidType << " PRIMARY KEY," << "pname character varying(255) NOT NULL" << "); " << "CREATE TABLE IF NOT EXISTS gameserver(" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "protocol " << Args->database[0]->getUUIDType(sql) << "," << ");"; Args->database[0]->exec(sql,res); sql.clear(); res.clear(); sql << "CREATE TABLE IF NOT EXISTS gameserver(" << "id " << uuidType << " PRIMARY KEY," << "protocol " << uuidType << "," << "addr character varying(255) NOT NULL," << "port integer," << "FOREIGN KEY (protocol) REFERENCES gameserver_protocols (id)" Loading
plugins/navbar/navbar.cpp +11 −5 Changes for plugins/navbar/navbar.cpp: 11 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -68,19 +68,25 @@ namespace blogi { dbpp::SQL sql; dbpp::DBResult res; dbpp::SQL uuidTypeSql; const std::string uuidType = Args->database[0]->getUUIDType(uuidTypeSql); sql << "CREATE TABLE IF NOT EXISTS navbar(" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << "id " << uuidType << " PRIMARY KEY," << "name character varying(255) NOT NULL," << "container_id character varying(255) NOT NULL" << "); " << "CREATE TABLE IF NOT EXISTS navbar_items(" << "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY," << ");"; Args->database[0]->exec(sql,res); sql.clear(); res.clear(); sql << "CREATE TABLE IF NOT EXISTS navbar_items(" << "id " << uuidType << " PRIMARY KEY," << "name character varying(255) NOT NULL," << "url character varying(255) NOT NULL," << "type integer default 0," << "position integer default 0," << "navbar_id " << Args->database[0]->getUUIDType(sql) << "," << "navbar_id " << uuidType << "," << "FOREIGN KEY (navbar_id) REFERENCES navbar (id)" << ");"; Args->database[0]->exec(sql,res); Loading