Merge branch 'rpta_0.2_Release'

(cherry picked from commit 76fda7be0f)

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;
 
 
-