From ddd8e1f0aa98128a5328801d5a8e37e3b251fe36 Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Mon, 14 Oct 2024 08:47:57 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Bugfix=20sx=5Fstylesheets.stylesheet=5Ftype?= =?UTF-8?q?=20wird=20=C3=BCberschrieben=20durch=20KERN=20Upgrade=20#2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 76fda7be0fd0063e9c12627fa8e9b50d31e1b2af) --- .../sx_stylesheets_einfuegen.sql | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src-modules/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql b/src-modules/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql index 89b07b6..c2a06d2 100755 --- a/src-modules/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql +++ b/src-modules/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql @@ -113,6 +113,15 @@ update sx_stylesheets set is_generic=1 where filename in (select T.filename from tmp_stylesheets T where T.is_generic=1); +<#if TableFieldExists?exists && TableFieldExists('sx_stylesheets','stylesheet_type')> +update sx_stylesheets set stylesheet_type=T.stylesheet_type, +contenttype=T.contenttype, +usage_resultset_data=T.usage_resultset_data, +jr_datasource=T.jr_datasource +from tmp_stylesheets T +where T.filename=sx_stylesheets.filename +and sx_stylesheets.filename in (select T2.filename from tmp_stylesheets T2); + --delete für tml_stylesheets hinzugefügt #ak 06.03.2013 delete from tmp_stylesheets where filename in (select filename from sx_stylesheets); @@ -208,14 +217,6 @@ FROM tmp_stylesheet_field; drop table tmp_stylesheet_field; drop table tmp_hilf; -update sx_stylesheets -set -contenttype='txt/xml', -is_generic=1, -usage_resultset_data='T', -stylesheet_type='XSL_JRXML' -where filename in ('tabelle_jrxml_a4_quer.xsl'); - <#if SQLdialect='Postgres'> select sp_update_sequence('sx_stylesheets'); From 94829d39e0b95a272582131a15ea436ceedee4fd Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Tue, 15 Oct 2024 12:51:28 +0200 Subject: [PATCH 2/2] Bugfix Insert neue Columns #1 --- ...olumn_layout_sos_stud_astat_rsz_fuellen.sql | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql index f39be0d..294f7de 100644 --- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql +++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql @@ -86,7 +86,7 @@ select count(*) from rpta_resultset where uniquename='sos_stud_astat'; ] /> - ---ab hier nicht mehr ändern: + ---ab hier nicht mehr ändern: CREATE temp TABLE tmp_rpta_column ( @@ -209,7 +209,10 @@ and L.uniquename='${rpta_column_layout.uniquename}' ) ; -select * into temp tmp_rpta_column2 from tmp_rpta_column ; +select * into temp tmp_rpta_column2 +from tmp_rpta_column T +where (resultset_id,uniquename) not in +(select resultset_id,uniquename from rpta_column); INSERT INTO rpta_column (resultset_id, @@ -234,11 +237,9 @@ resultset_id, is_aggregate, description, 0 as custom -from tmp_rpta_column -where (resultset_id,uniquename) not in -(select T.resultset_id,T.uniquename -from tmp_rpta_column2 T) -; +from tmp_rpta_column2; + +--evtl. neuen Satz einfügen, dann alle updaten update rpta_column set ( caption, srcfieldname, @@ -260,7 +261,7 @@ update rpta_column set ( caption, where custom=0 and (resultset_id,uniquename) in (select T.resultset_id,T.uniquename -from tmp_rpta_column2 T) +from tmp_rpta_column T) ; drop table tmp_rpta_column2; @@ -289,4 +290,3 @@ drop table tmp_rpta_column; drop TABLE tmp_rpta_column_layout; -