From b2c7842a96a49358b44bbc5e107d991a35792345 Mon Sep 17 00:00:00 2001 From: Banana <banana@optimus.de> Date: Sat, 15 Jul 2017 12:09:46 +0200 Subject: [PATCH] version cleanup and documentation update --- ChangeLog | 7 ++++--- VERSION | 2 +- documentation/insipid-edit-me.sql | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48230d6..be0dc83 100755 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,8 @@ version 2.1 alpha - Guardian of Fire - (tba) * cleanups * edit area for a bookmark - + * documentation and sql setup cleanup + version 2.0alpha - Bright Crucible - (2017-01-05) * This is a not prodction ready version of the complete rewrite. @@ -10,8 +11,8 @@ version 2.0alpha - Bright Crucible - (2017-01-05) version 1.5 (30 Nov. 2012) - * support phantomjs as a screenshot tool for a bookmark - * code updates and cleanup + * support phantomjs as a screenshot tool for a bookmark + * code updates and cleanup version 1.1 (20 Feb. 2012) diff --git a/VERSION b/VERSION index d4c7fe7..2cecaaa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1 alpha - Guardian of Fire - (tba) \ No newline at end of file +2.1 alpha - Guardian of Fire - (tba) diff --git a/documentation/insipid-edit-me.sql b/documentation/insipid-edit-me.sql index ce567e4..bab7c6d 100644 --- a/documentation/insipid-edit-me.sql +++ b/documentation/insipid-edit-me.sql @@ -102,7 +102,7 @@ CREATE TABLE `#REPLACEME#_tagrelation` ( -- DROP TABLE IF EXISTS `#REPLACEME#_combined`; -CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `#REPLACEME#_combined` AS select `#REPLACEME#_link`.`id` AS `id`,`#REPLACEME#_link`.`link` AS `link`,`#REPLACEME#_link`.`created` AS `created`,`#REPLACEME#_link`.`status` AS `status`,`#REPLACEME#_link`.`description` AS `description`,`#REPLACEME#_link`.`title` AS `title`,`#REPLACEME#_link`.`image` AS `image`,`#REPLACEME#_link`.`hash` AS `hash`,`#REPLACEME#_tag`.`name` AS `tag`,`#REPLACEME#_category`.`name` AS `category` from ((((`#REPLACEME#_link` left join `#REPLACEME#_tagrelation` on((`#REPLACEME#_tagrelation`.`linkid` = `#REPLACEME#_link`.`id`))) left join `#REPLACEME#_tag` on((`#REPLACEME#_tag`.`id` = `#REPLACEME#_tagrelation`.`tagid`))) left join `#REPLACEME#_categoryrelation` on((`#REPLACEME#_categoryrelation`.`linkid` = `#REPLACEME#_link`.`id`))) left join `#REPLACEME#_category` on((`#REPLACEME#_category`.`id` = `#REPLACEME#_categoryrelation`.`categoryid`))) ; +CREATE VIEW `#REPLACEME#_combined` AS select `#REPLACEME#_link`.`id` AS `id`,`#REPLACEME#_link`.`link` AS `link`,`#REPLACEME#_link`.`created` AS `created`,`#REPLACEME#_link`.`status` AS `status`,`#REPLACEME#_link`.`description` AS `description`,`#REPLACEME#_link`.`title` AS `title`,`#REPLACEME#_link`.`image` AS `image`,`#REPLACEME#_link`.`hash` AS `hash`,`#REPLACEME#_tag`.`name` AS `tag`,`#REPLACEME#_category`.`name` AS `category` from ((((`#REPLACEME#_link` left join `#REPLACEME#_tagrelation` on((`#REPLACEME#_tagrelation`.`linkid` = `#REPLACEME#_link`.`id`))) left join `#REPLACEME#_tag` on((`#REPLACEME#_tag`.`id` = `#REPLACEME#_tagrelation`.`tagid`))) left join `#REPLACEME#_categoryrelation` on((`#REPLACEME#_categoryrelation`.`linkid` = `#REPLACEME#_link`.`id`))) left join `#REPLACEME#_category` on((`#REPLACEME#_category`.`id` = `#REPLACEME#_categoryrelation`.`categoryid`))) ; -- -- Indexes for dumped tables -- 2.39.5