[Mapbender-commits] r7875 - trunk/mapbender/resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2011-06-16 00:23:09 -0700 (Thu, 16 Jun 2011)
New Revision: 7875

Modified:
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.1_to_2.7.2_pgsql_UTF-8.sql
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7rc1_to_2.7rc2_pgsql_UTF-8.sql
Log:
cleaned up sqls for compatibility with postgres version 8.1, merged with 2.7

Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.1_to_2.7.2_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.1_to_2.7.2_pgsql_UTF-8.sql	2011-06-16 07:22:40 UTC (rev 7874)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7.1_to_2.7.2_pgsql_UTF-8.sql	2011-06-16 07:23:09 UTC (rev 7875)
@@ -54,5 +54,32 @@
 
 UPDATE gui_element set e_attributes = 'href = "../php/mod_category_filteredGUI.php?sessionID&e_id_css=category_filteredGUI"' where fkey_gui_id = 'Administration' and e_id ='category_filteredGUI' ;
 
+--
+-- refers to #786: after update the applications with savewmc and load wmc do not work as jq_ui_dialog and button are missing
+--
+INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, 
+e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, 
+e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) 
+Select fkey_gui_id, foo.* from (
+SELECT 'jq_ui_button',e_pos,e_public,e_comment,e_title,e_element, e_src, e_attributes, 
+e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, 
+e_js_file, e_mb_mod, e_target, e_requires, e_url FROM gui_element 
+WHERE e_id = 'jq_ui_button' AND fkey_gui_id = 'gui1' 
+) as foo , gui_element where e_id = 'loadwmc' AND fkey_gui_id IN 
+ (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'loadwmc' AND fkey_gui_id NOT IN (
+	SELECT fkey_gui_id FROM gui_element WHERE e_id = 'jq_ui_button'
+ ));
 
 
+INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, 
+e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, 
+e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) 
+Select fkey_gui_id, foo.* from (
+SELECT 'jq_ui_dialog',e_pos,e_public,e_comment,e_title,e_element, e_src, e_attributes, 
+e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, 
+e_js_file, e_mb_mod, e_target, e_requires, e_url FROM gui_element 
+WHERE e_id = 'jq_ui_dialog' AND fkey_gui_id = 'gui1' 
+) as foo , gui_element where e_id = 'loadwmc' AND fkey_gui_id IN 
+ (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'loadwmc' AND fkey_gui_id NOT IN (
+	SELECT fkey_gui_id FROM gui_element WHERE e_id = 'jq_ui_dialog'
+ ));

Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7rc1_to_2.7rc2_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7rc1_to_2.7rc2_pgsql_UTF-8.sql	2011-06-16 07:22:40 UTC (rev 7874)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.7rc1_to_2.7rc2_pgsql_UTF-8.sql	2011-06-16 07:23:09 UTC (rev 7875)
@@ -22,8 +22,7 @@
 END IF;
 END;
 $BODY$
-  LANGUAGE 'plpgsql' VOLATILE
-  COST 100;
+  LANGUAGE 'plpgsql' VOLATILE;
 
 
 --
@@ -72,8 +71,7 @@
     RETURN l_result;
 END;
 $BODY$
-  LANGUAGE 'plpgsql' VOLATILE
-  COST 100;
+  LANGUAGE 'plpgsql' VOLATILE;
 
 --Bugfix in integral monitoring table