version cleanup and documentation update

diff --git a/ChangeLog b/ChangeLog
index 48230d611b621678903f17e0c5895dfdda1867d0..be0dc837c8dfbd1503910f4630f4f94d33414657 100755 (executable)
--- 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 d4c7fe7f75c3052015d6b579a13ae2633012a77b..2cecaaabf51efacc4764e1b7f2b8e5ca47d871ef 100644 (file)
--- 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 ce567e4957222a7b05ccb352bb05c63c6a00fe31..bab7c6df77d8eaa4eb4080d28132ce098f7fa726 100644 (file)
--- 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