diff --git a/src-modules/module/rpta/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql index 82e1746..691dbf4 100644 --- a/src-modules/module/rpta/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql +++ b/src-modules/module/rpta/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql @@ -3,7 +3,7 @@ select sp_table_exists('sos_lab_pord') from xdummy; - + select name from sx_tables where name ='sos_lab_pord' @@ -31,7 +31,7 @@ caption, select tid, table_name, name, name as targetname - from sx_fields where table_name ='${fact_table_source.name}' + from sx_fields where table_name ='${fact_table_source}' --and currentlyused=1 and name in ('matrikel_nr', 'sem_der_pruefung', @@ -153,7 +153,7 @@ table_type, systeminfo_id, thema, sachgebiete_id -from sx_tables where name='${fact_table_source.name}' +from sx_tables where name='${fact_table_source}' ; @@ -193,7 +193,7 @@ select '${fact_table_target.name}' as table_name, check_integrity, is_sum, foreignkey_uniquename - from sx_fields where table_name ='${fact_table_source.name}' + from sx_fields where table_name ='${fact_table_source}' and currentlyused=1; <#foreach added_table in added_tables> insert into tmp_fields (table_name, @@ -260,7 +260,7 @@ update tmp_rpta_resultset set fieldclause=' ${field_target.table_name}.${field_target.name} as ${field_target.targetname}, null::varchar as dummy', -joinclause='${fact_table_source.name} +joinclause='${fact_table_source} <#foreach added_table in added_tables> left outer join ${added_table.name} on (${added_table.joinclause}) '; diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql index 24567cf..7b5dcf1 100644 --- a/src-modules/module/rpta/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql +++ b/src-modules/module/rpta/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql @@ -3,7 +3,7 @@ select sp_table_exists('rpta_exam_unit') from xdummy; - + select name from sx_tables where name ='rpta_exam_unit' @@ -20,7 +20,7 @@ caption, select tid, table_name, name, name as targetname - from sx_fields where table_name ='${fact_table_source.name}' + from sx_fields where table_name ='${fact_table_source}' and currentlyused=1 union @@ -107,7 +107,7 @@ table_type, systeminfo_id, thema, sachgebiete_id -from sx_tables where name='${fact_table_source.name}' +from sx_tables where name='${fact_table_source}' ; @@ -147,7 +147,7 @@ select '${fact_table_target.name}' as table_name, check_integrity, is_sum, foreignkey_uniquename - from sx_fields where table_name ='${fact_table_source.name}' + from sx_fields where table_name ='${fact_table_source}' and currentlyused=1; <#foreach added_table in added_tables> insert into tmp_fields (table_name, @@ -214,7 +214,7 @@ update tmp_rpta_resultset set fieldclause=' ${field_target.table_name}.${field_target.name} as ${field_target.targetname}, null::varchar as dummy', -joinclause='${fact_table_source.name} +joinclause='${fact_table_source} <#foreach added_table in added_tables> left outer join ${added_table.name} on (${added_table.joinclause}) '; diff --git a/src-modules/module/rpta/schluesseltabellen/stellen_besetzung_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/stellen_besetzung_virtuell.sql index 70aefa0..4db4d5e 100644 --- a/src-modules/module/rpta/schluesseltabellen/stellen_besetzung_virtuell.sql +++ b/src-modules/module/rpta/schluesseltabellen/stellen_besetzung_virtuell.sql @@ -4,7 +4,7 @@ select sp_table_exists('sva_sgd_aggr') from xdummy; - + select name from sx_tables where name ='sva_sgd_aggr' @@ -27,7 +27,7 @@ caption, select tid, table_name, name, name as targetname - from sx_fields where table_name ='${fact_table_source.name}' + from sx_fields where table_name ='${fact_table_source}' and currentlyused=1 union @@ -118,7 +118,7 @@ table_type, systeminfo_id, thema, sachgebiete_id -from sx_tables where name='${fact_table_source.name}' +from sx_tables where name='${fact_table_source}' ; @@ -158,7 +158,7 @@ select '${fact_table_target.name}' as table_name, check_integrity, is_sum, foreignkey_uniquename - from sx_fields where table_name ='${fact_table_source.name}' + from sx_fields where table_name ='${fact_table_source}' and currentlyused=1; <#foreach added_table in added_tables> insert into tmp_fields (table_name, @@ -225,7 +225,7 @@ update tmp_rpta_resultset set fieldclause=' ${field_target.table_name}.${field_target.name} as ${field_target.targetname}, null::varchar as dummy', -joinclause='${fact_table_source.name} +joinclause='${fact_table_source} <#foreach added_table in added_tables> left outer join ${added_table.name} on (${added_table.joinclause}) '; diff --git a/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_virtuell.sql index 7b0fc77..1ff3a38 100644 --- a/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_virtuell.sql +++ b/src-modules/module/rpta/schluesseltabellen/studierende_datenblatt_virtuell.sql @@ -3,7 +3,7 @@ select sp_table_exists('sos_stg_aggr') from xdummy; - + select name from sx_tables where name ='sos_stg_aggr' @@ -51,7 +51,7 @@ order by 1 select tid, table_name, name, name as targetname - from sx_fields where table_name ='${fact_table_source.name}' + from sx_fields where table_name ='${fact_table_source}' and currentlyused=1 <#foreach added_table in added_tables> union @@ -173,7 +173,7 @@ table_type, systeminfo_id, thema, sachgebiete_id -from sx_tables where name='${fact_table_source.name}' +from sx_tables where name='${fact_table_source}' ; @@ -213,7 +213,7 @@ select '${fact_table_target.name}' as table_name, check_integrity, is_sum, foreignkey_uniquename - from sx_fields where table_name ='${fact_table_source.name}' + from sx_fields where table_name ='${fact_table_source}' and currentlyused=1; <#foreach added_table in added_tables> insert into tmp_fields (table_name, @@ -280,7 +280,7 @@ update tmp_rpta_resultset set fieldclause=' ${field_target.table_name}.${field_target.name} as ${field_target.targetname}, null::varchar as dummy', -joinclause='${fact_table_source.name} +joinclause='${fact_table_source} <#foreach added_table in added_tables> left outer join ${added_table.name} on (${added_table.joinclause}) ';