From 692ced7379fc890e9f2689d30098c9205c079db7 Mon Sep 17 00:00:00 2001 From: Matz Rasmus Date: Wed, 18 Dec 2024 15:57:51 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Korjattu=20stg-mallien=20bugi=20jos=20stg-t?= =?UTF-8?q?aulu=20on=20tyhj=C3=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbt/.gitignore | 2 + dbt/models/int/int_organisaatio.sql | 2 +- dbt/models/int/int_sure/int_sure_arvosana.sql | 4 +- .../int/int_sure/int_sure_ensikertalainen.sql | 4 +- .../int/int_sure/int_sure_opiskelija.sql | 4 +- .../int/int_sure/int_sure_opiskeluoikeus.sql | 4 +- dbt/models/int/int_sure/int_sure_suoritus.sql | 4 +- .../int_valintaperusteet_valintatapajono.sql | 42 +++++++++---------- dbt/models/pub/pub_dim_ensikertalainen.sql | 4 +- dbt/models/pub/pub_dim_organisaatio.sql | 4 +- dbt/models/pub/pub_dim_yo_arvosana.sql | 8 ++-- dbt/models/stg/stg_ataru_hakemus.sql | 2 +- dbt/models/stg/stg_ataru_lomake.sql | 2 +- .../stg/stg_hakukohderyhmapalvelu_ryhma.sql | 2 +- dbt/models/stg/stg_kouta_ammattinimike.sql | 2 +- dbt/models/stg/stg_kouta_asiasana.sql | 2 +- dbt/models/stg/stg_kouta_haku.sql | 2 +- dbt/models/stg/stg_kouta_hakukohde.sql | 2 +- dbt/models/stg/stg_kouta_koulutus.sql | 2 +- .../stg/stg_kouta_oppilaitoksetjaosat.sql | 2 +- dbt/models/stg/stg_kouta_pistehistoria.sql | 4 +- dbt/models/stg/stg_kouta_sorakuvaus.sql | 2 +- dbt/models/stg/stg_kouta_toteutus.sql | 2 +- dbt/models/stg/stg_kouta_valintaperuste.sql | 2 +- .../stg/stg_ohjausparametrit_parameter.sql | 2 +- dbt/models/stg/stg_sure_arvosana.sql | 4 +- dbt/models/stg/stg_sure_ensikertalainen.sql | 4 +- .../stg/stg_sure_harkinnanvaraisuus.sql | 4 +- dbt/models/stg/stg_sure_opiskelija.sql | 4 +- dbt/models/stg/stg_sure_opiskeluoikeus.sql | 4 +- dbt/models/stg/stg_sure_proxysuoritus.sql | 4 +- dbt/models/stg/stg_sure_suoritus.sql | 4 +- ...intalaskenta_valintakoe_osallistuminen.sql | 2 +- ...valintalaskenta_valintalaskennan_tulos.sql | 2 +- .../stg/stg_valintaperusteet_hakukohde.sql | 2 +- .../stg_valintapiste_service_pistetieto.sql | 4 +- .../stg_valintarekisteri_ilmoittautuminen.sql | 4 +- .../stg_valintarekisteri_valinnantulos.sql | 4 +- .../stg_valintarekisteri_valintatapajono.sql | 4 +- .../stg/stg_valintarekisteri_vastaanotto.sql | 4 +- .../yleiskayttoiset/stg_koodisto_koodi.sql | 2 +- .../yleiskayttoiset/stg_koodisto_relaatio.sql | 2 +- .../stg/yleiskayttoiset/stg_onr_henkilo.sql | 2 +- .../yleiskayttoiset/stg_onr_yhteystieto.sql | 2 +- .../stg_organisaatio_organisaatio.sql | 2 +- .../stg_organisaatio_organisaatiosuhde.sql | 2 +- .../stg_organisaatio_osoite.sql | 2 +- .../stg_organisaatio_ryhma.sql | 2 +- 48 files changed, 100 insertions(+), 82 deletions(-) diff --git a/dbt/.gitignore b/dbt/.gitignore index 087d062..63094f4 100644 --- a/dbt/.gitignore +++ b/dbt/.gitignore @@ -1,3 +1,5 @@ target/ dbt_packages/ logs/ +.* +!.gitignore diff --git a/dbt/models/int/int_organisaatio.sql b/dbt/models/int/int_organisaatio.sql index 14cade8..f474f9a 100644 --- a/dbt/models/int/int_organisaatio.sql +++ b/dbt/models/int/int_organisaatio.sql @@ -55,7 +55,7 @@ int as ( org1.oppilaitosnumero, org1.alkupvm, org1.lakkautuspvm - from organisaatio as org1 + from organisaatio as org1 left join ylempi_toimipiste as ylto on org1.ylempi_organisaatio = ylto.organisaatio_oid ), diff --git a/dbt/models/int/int_sure/int_sure_arvosana.sql b/dbt/models/int/int_sure/int_sure_arvosana.sql index 4bb02cc..f01b9c0 100644 --- a/dbt/models/int/int_sure/int_sure_arvosana.sql +++ b/dbt/models/int/int_sure/int_sure_arvosana.sql @@ -14,9 +14,7 @@ with raw as ( ), int as ( - select - * - from raw + select * from raw where row_nr = 1 ), diff --git a/dbt/models/int/int_sure/int_sure_ensikertalainen.sql b/dbt/models/int/int_sure/int_sure_ensikertalainen.sql index 47fd150..ea9a179 100644 --- a/dbt/models/int/int_sure/int_sure_ensikertalainen.sql +++ b/dbt/models/int/int_sure/int_sure_ensikertalainen.sql @@ -7,9 +7,7 @@ }} with int as ( - select - * - from {{ ref('dw_sure_ensikertalainen') }} + select * from {{ ref('dw_sure_ensikertalainen') }} ), final as ( diff --git a/dbt/models/int/int_sure/int_sure_opiskelija.sql b/dbt/models/int/int_sure/int_sure_opiskelija.sql index 4cc2fff..5a925e5 100644 --- a/dbt/models/int/int_sure/int_sure_opiskelija.sql +++ b/dbt/models/int/int_sure/int_sure_opiskelija.sql @@ -14,9 +14,7 @@ with raw as ( ), int as ( - select - * - from raw + select * from raw where row_nr = 1 ), diff --git a/dbt/models/int/int_sure/int_sure_opiskeluoikeus.sql b/dbt/models/int/int_sure/int_sure_opiskeluoikeus.sql index 895fde1..f832a3b 100644 --- a/dbt/models/int/int_sure/int_sure_opiskeluoikeus.sql +++ b/dbt/models/int/int_sure/int_sure_opiskeluoikeus.sql @@ -14,9 +14,7 @@ with raw as ( ), int as ( - select - * - from raw + select * from raw where row_nr = 1 ), diff --git a/dbt/models/int/int_sure/int_sure_suoritus.sql b/dbt/models/int/int_sure/int_sure_suoritus.sql index 8a0644b..a4bf8e0 100644 --- a/dbt/models/int/int_sure/int_sure_suoritus.sql +++ b/dbt/models/int/int_sure/int_sure_suoritus.sql @@ -14,9 +14,7 @@ with raw as ( ), int as ( - select - * - from raw + select * from raw where row_nr = 1 ), diff --git a/dbt/models/int/int_valintaperusteet_valintatapajono.sql b/dbt/models/int/int_valintaperusteet_valintatapajono.sql index e78316d..bd57952 100644 --- a/dbt/models/int/int_valintaperusteet_valintatapajono.sql +++ b/dbt/models/int/int_valintaperusteet_valintatapajono.sql @@ -61,27 +61,27 @@ existing_rows as ( select * from {{ this }} where hakukohde_oid in (select hakukohde_oid from valintatapajonoja) {% else %} - select - null as jono_id, - null as valinnanvaihe_id, - null as hakukohde_oid, - null as nimi, - null as kuvaus, - null::int as aloituspaikat, - null as tyyppi_uri, - null::int as prioriteetti, - null::boolean as siirretaan_sijoitteluun, - null as tasasijasaanto, - null::timestamptz as ei_lasketa_paivamaaran_jalkeen, - null::boolean as ei_varasijatayttoa, - null::boolean as merkitse_myoh_auto, - null::boolean as poissa_oleva_taytto, - null::boolean as kaikki_ehdon_tayttavat_hyvaksytaan, - null::boolean as kaytetaan_valintalaskentaa, - null::boolean as valmis_sijoiteltavaksi, - null::boolean as valisijoittelu, - null::boolean as poistetaanko_hylatyt, - null::jsonb as jarjestyskriteerit + select + null as jono_id, + null as valinnanvaihe_id, + null as hakukohde_oid, + null as nimi, + null as kuvaus, + null::int as aloituspaikat, + null as tyyppi_uri, + null::int as prioriteetti, + null::boolean as siirretaan_sijoitteluun, + null as tasasijasaanto, + null::timestamptz as ei_lasketa_paivamaaran_jalkeen, + null::boolean as ei_varasijatayttoa, + null::boolean as merkitse_myoh_auto, + null::boolean as poissa_oleva_taytto, + null::boolean as kaikki_ehdon_tayttavat_hyvaksytaan, + null::boolean as kaytetaan_valintalaskentaa, + null::boolean as valmis_sijoiteltavaksi, + null::boolean as valisijoittelu, + null::boolean as poistetaanko_hylatyt, + null::jsonb as jarjestyskriteerit {% endif %} ) diff --git a/dbt/models/pub/pub_dim_ensikertalainen.sql b/dbt/models/pub/pub_dim_ensikertalainen.sql index 667ae39..50ab1ea 100644 --- a/dbt/models/pub/pub_dim_ensikertalainen.sql +++ b/dbt/models/pub/pub_dim_ensikertalainen.sql @@ -19,7 +19,7 @@ int as ( isensikertalainen, menettamisenperuste, menettamisenpaivamaara - from ensikertalainen + from ensikertalainen ) -select * from int \ No newline at end of file +select * from int diff --git a/dbt/models/pub/pub_dim_organisaatio.sql b/dbt/models/pub/pub_dim_organisaatio.sql index a61b66e..0cbfeb8 100644 --- a/dbt/models/pub/pub_dim_organisaatio.sql +++ b/dbt/models/pub/pub_dim_organisaatio.sql @@ -8,7 +8,7 @@ }} with source as ( - select * from {{ ref('int_organisaatio') }} + select * from {{ ref('int_organisaatio') }} ), final as ( @@ -27,4 +27,4 @@ final as ( from source ) -select * from final \ No newline at end of file +select * from final diff --git a/dbt/models/pub/pub_dim_yo_arvosana.sql b/dbt/models/pub/pub_dim_yo_arvosana.sql index 0dfaaa2..eaa8bc1 100644 --- a/dbt/models/pub/pub_dim_yo_arvosana.sql +++ b/dbt/models/pub/pub_dim_yo_arvosana.sql @@ -9,7 +9,7 @@ }} with arvosana as ( - select * from {{ ref('int_sure_arvosana') }} where asteikko='YO' + select * from {{ ref('int_sure_arvosana') }} where asteikko = 'YO' ), suoritus as ( @@ -32,10 +32,10 @@ int as ( arvosana.source, arvosana.jarjestys, arvosana.arvot, - suoritus.henkilooid as henkilooid, - suoritus.tila as tila, + suoritus.henkilooid, + suoritus.tila, suoritus.valmistuminen as pvm - from arvosana + from arvosana left join suoritus on arvosana.suoritus = suoritus.resourceid ) diff --git a/dbt/models/stg/stg_ataru_hakemus.sql b/dbt/models/stg/stg_ataru_hakemus.sql index 391fd99..34ab065 100644 --- a/dbt/models/stg/stg_ataru_hakemus.sql +++ b/dbt/models/stg/stg_ataru_hakemus.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_ataru_lomake.sql b/dbt/models/stg/stg_ataru_lomake.sql index fb284c3..1bdbf25 100644 --- a/dbt/models/stg/stg_ataru_lomake.sql +++ b/dbt/models/stg/stg_ataru_lomake.sql @@ -2,7 +2,7 @@ with source as ( select * from {{ source('ovara', 'ataru_lomake') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_hakukohderyhmapalvelu_ryhma.sql b/dbt/models/stg/stg_hakukohderyhmapalvelu_ryhma.sql index 074b09c..3a3daa9 100644 --- a/dbt/models/stg/stg_hakukohderyhmapalvelu_ryhma.sql +++ b/dbt/models/stg/stg_hakukohderyhmapalvelu_ryhma.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_ammattinimike.sql b/dbt/models/stg/stg_kouta_ammattinimike.sql index b565889..be3e9f0 100644 --- a/dbt/models/stg/stg_kouta_ammattinimike.sql +++ b/dbt/models/stg/stg_kouta_ammattinimike.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_asiasana.sql b/dbt/models/stg/stg_kouta_asiasana.sql index a772875..0a6ab90 100644 --- a/dbt/models/stg/stg_kouta_asiasana.sql +++ b/dbt/models/stg/stg_kouta_asiasana.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_haku.sql b/dbt/models/stg/stg_kouta_haku.sql index 462a2da..edd9ca4 100644 --- a/dbt/models/stg/stg_kouta_haku.sql +++ b/dbt/models/stg/stg_kouta_haku.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_hakukohde.sql b/dbt/models/stg/stg_kouta_hakukohde.sql index 0bb2a15..4bed1c6 100644 --- a/dbt/models/stg/stg_kouta_hakukohde.sql +++ b/dbt/models/stg/stg_kouta_hakukohde.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_koulutus.sql b/dbt/models/stg/stg_kouta_koulutus.sql index 83542c9..56590dc 100644 --- a/dbt/models/stg/stg_kouta_koulutus.sql +++ b/dbt/models/stg/stg_kouta_koulutus.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_oppilaitoksetjaosat.sql b/dbt/models/stg/stg_kouta_oppilaitoksetjaosat.sql index c45e149..bb9514c 100644 --- a/dbt/models/stg/stg_kouta_oppilaitoksetjaosat.sql +++ b/dbt/models/stg/stg_kouta_oppilaitoksetjaosat.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_pistehistoria.sql b/dbt/models/stg/stg_kouta_pistehistoria.sql index dcfbc11..bb08fc5 100644 --- a/dbt/models/stg/stg_kouta_pistehistoria.sql +++ b/dbt/models/stg/stg_kouta_pistehistoria.sql @@ -2,7 +2,9 @@ with source as ( --noqa: PRS select * from {{ source('ovara', 'kouta_pistehistoria') }} {%- if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }} ) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif -%} ), diff --git a/dbt/models/stg/stg_kouta_sorakuvaus.sql b/dbt/models/stg/stg_kouta_sorakuvaus.sql index 4afe6f0..985315f 100644 --- a/dbt/models/stg/stg_kouta_sorakuvaus.sql +++ b/dbt/models/stg/stg_kouta_sorakuvaus.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_toteutus.sql b/dbt/models/stg/stg_kouta_toteutus.sql index 5a772ff..baeb1a1 100644 --- a/dbt/models/stg/stg_kouta_toteutus.sql +++ b/dbt/models/stg/stg_kouta_toteutus.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_valintaperuste.sql b/dbt/models/stg/stg_kouta_valintaperuste.sql index afefc8d..7fb9976 100644 --- a/dbt/models/stg/stg_kouta_valintaperuste.sql +++ b/dbt/models/stg/stg_kouta_valintaperuste.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_ohjausparametrit_parameter.sql b/dbt/models/stg/stg_ohjausparametrit_parameter.sql index 372778e..e80d720 100644 --- a/dbt/models/stg/stg_ohjausparametrit_parameter.sql +++ b/dbt/models/stg/stg_ohjausparametrit_parameter.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_sure_arvosana.sql b/dbt/models/stg/stg_sure_arvosana.sql index 9b78e5d..0af79df 100644 --- a/dbt/models/stg/stg_sure_arvosana.sql +++ b/dbt/models/stg/stg_sure_arvosana.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_arvosana') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_ensikertalainen.sql b/dbt/models/stg/stg_sure_ensikertalainen.sql index deb251f..0149119 100644 --- a/dbt/models/stg/stg_sure_ensikertalainen.sql +++ b/dbt/models/stg/stg_sure_ensikertalainen.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_ensikertalainen') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_harkinnanvaraisuus.sql b/dbt/models/stg/stg_sure_harkinnanvaraisuus.sql index 5d06761..ea78bf9 100644 --- a/dbt/models/stg/stg_sure_harkinnanvaraisuus.sql +++ b/dbt/models/stg/stg_sure_harkinnanvaraisuus.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_harkinnanvaraisuus') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_opiskelija.sql b/dbt/models/stg/stg_sure_opiskelija.sql index f760c42..28aad98 100644 --- a/dbt/models/stg/stg_sure_opiskelija.sql +++ b/dbt/models/stg/stg_sure_opiskelija.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_opiskelija') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_opiskeluoikeus.sql b/dbt/models/stg/stg_sure_opiskeluoikeus.sql index 1e7af64..b03cb3c 100644 --- a/dbt/models/stg/stg_sure_opiskeluoikeus.sql +++ b/dbt/models/stg/stg_sure_opiskeluoikeus.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_opiskeluoikeus') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_proxysuoritus.sql b/dbt/models/stg/stg_sure_proxysuoritus.sql index ab7d8c2..345f2a2 100644 --- a/dbt/models/stg/stg_sure_proxysuoritus.sql +++ b/dbt/models/stg/stg_sure_proxysuoritus.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_proxysuoritus') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_suoritus.sql b/dbt/models/stg/stg_sure_suoritus.sql index c7d7acd..70193e5 100644 --- a/dbt/models/stg/stg_sure_suoritus.sql +++ b/dbt/models/stg/stg_sure_suoritus.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_suoritus') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_valintalaskenta_valintakoe_osallistuminen.sql b/dbt/models/stg/stg_valintalaskenta_valintakoe_osallistuminen.sql index e34c5aa..a5b7cfa 100644 --- a/dbt/models/stg/stg_valintalaskenta_valintakoe_osallistuminen.sql +++ b/dbt/models/stg/stg_valintalaskenta_valintakoe_osallistuminen.sql @@ -11,7 +11,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_valintalaskenta_valintalaskennan_tulos.sql b/dbt/models/stg/stg_valintalaskenta_valintalaskennan_tulos.sql index 61d2a6d..88c67d8 100644 --- a/dbt/models/stg/stg_valintalaskenta_valintalaskennan_tulos.sql +++ b/dbt/models/stg/stg_valintalaskenta_valintalaskennan_tulos.sql @@ -2,7 +2,7 @@ with source as ( select * from {{ source('ovara', 'valintalaskenta_valintalaskennan_tulos') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} diff --git a/dbt/models/stg/stg_valintaperusteet_hakukohde.sql b/dbt/models/stg/stg_valintaperusteet_hakukohde.sql index afb9c79..ad1089b 100644 --- a/dbt/models/stg/stg_valintaperusteet_hakukohde.sql +++ b/dbt/models/stg/stg_valintaperusteet_hakukohde.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_valintapiste_service_pistetieto.sql b/dbt/models/stg/stg_valintapiste_service_pistetieto.sql index 459064d..cad1705 100644 --- a/dbt/models/stg/stg_valintapiste_service_pistetieto.sql +++ b/dbt/models/stg/stg_valintapiste_service_pistetieto.sql @@ -14,7 +14,9 @@ with source as ( --noqa: PRS select * from {{ source('ovara', 'valintapiste_service_pistetieto') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_valintarekisteri_ilmoittautuminen.sql b/dbt/models/stg/stg_valintarekisteri_ilmoittautuminen.sql index 600bf8f..80995df 100644 --- a/dbt/models/stg/stg_valintarekisteri_ilmoittautuminen.sql +++ b/dbt/models/stg/stg_valintarekisteri_ilmoittautuminen.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'valintarekisteri_ilmoittautuminen') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_valintarekisteri_valinnantulos.sql b/dbt/models/stg/stg_valintarekisteri_valinnantulos.sql index 6cae5b1..8658bfb 100644 --- a/dbt/models/stg/stg_valintarekisteri_valinnantulos.sql +++ b/dbt/models/stg/stg_valintarekisteri_valinnantulos.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'valintarekisteri_valinnantulos') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_valintarekisteri_valintatapajono.sql b/dbt/models/stg/stg_valintarekisteri_valintatapajono.sql index 665ac67..354773d 100644 --- a/dbt/models/stg/stg_valintarekisteri_valintatapajono.sql +++ b/dbt/models/stg/stg_valintarekisteri_valintatapajono.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'valintarekisteri_valintatapajono') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_valintarekisteri_vastaanotto.sql b/dbt/models/stg/stg_valintarekisteri_vastaanotto.sql index f01daf7..401d2ef 100644 --- a/dbt/models/stg/stg_valintarekisteri_vastaanotto.sql +++ b/dbt/models/stg/stg_valintarekisteri_vastaanotto.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'valintarekisteri_vastaanotto') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_koodisto_koodi.sql b/dbt/models/stg/yleiskayttoiset/stg_koodisto_koodi.sql index 9ff4427..a76fc89 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_koodisto_koodi.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_koodisto_koodi.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_koodisto_relaatio.sql b/dbt/models/stg/yleiskayttoiset/stg_koodisto_relaatio.sql index 93c8c11..ff888af 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_koodisto_relaatio.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_koodisto_relaatio.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_onr_henkilo.sql b/dbt/models/stg/yleiskayttoiset/stg_onr_henkilo.sql index b332527..f4369a8 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_onr_henkilo.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_onr_henkilo.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_onr_yhteystieto.sql b/dbt/models/stg/yleiskayttoiset/stg_onr_yhteystieto.sql index f050656..cdf4bab 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_onr_yhteystieto.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_onr_yhteystieto.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatio.sql b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatio.sql index 40dc75e..6adae9c 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatio.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatio.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} diff --git a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatiosuhde.sql b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatiosuhde.sql index c7a4926..3a0ef17 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatiosuhde.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatiosuhde.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_osoite.sql b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_osoite.sql index a314349..4c54eec 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_osoite.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_osoite.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_ryhma.sql b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_ryhma.sql index 41040f7..ed4e8b9 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_ryhma.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_ryhma.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), From 15542b21573c110a639719fc5dd5cdd4549926c2 Mon Sep 17 00:00:00 2001 From: Matz Rasmus Date: Wed, 18 Dec 2024 15:57:51 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Korjattu=20stg-mallien=20bugi=20jos=20stg-t?= =?UTF-8?q?aulu=20on=20tyhj=C3=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbt/.gitignore | 2 + dbt/models/int/int_organisaatio.sql | 2 +- dbt/models/int/int_sure/int_sure_arvosana.sql | 4 +- .../int/int_sure/int_sure_ensikertalainen.sql | 4 +- .../int/int_sure/int_sure_opiskelija.sql | 4 +- .../int/int_sure/int_sure_opiskeluoikeus.sql | 4 +- dbt/models/int/int_sure/int_sure_suoritus.sql | 4 +- .../int_valintaperusteet_valintatapajono.sql | 42 +++++++++---------- dbt/models/pub/pub_dim_ensikertalainen.sql | 4 +- dbt/models/pub/pub_dim_organisaatio.sql | 4 +- dbt/models/pub/pub_dim_yo_arvosana.sql | 8 ++-- dbt/models/stg/stg_ataru_hakemus.sql | 2 +- dbt/models/stg/stg_ataru_lomake.sql | 2 +- .../stg/stg_hakukohderyhmapalvelu_ryhma.sql | 2 +- dbt/models/stg/stg_kouta_ammattinimike.sql | 2 +- dbt/models/stg/stg_kouta_asiasana.sql | 2 +- dbt/models/stg/stg_kouta_haku.sql | 2 +- dbt/models/stg/stg_kouta_hakukohde.sql | 2 +- dbt/models/stg/stg_kouta_koulutus.sql | 2 +- .../stg/stg_kouta_oppilaitoksetjaosat.sql | 2 +- dbt/models/stg/stg_kouta_pistehistoria.sql | 4 +- dbt/models/stg/stg_kouta_sorakuvaus.sql | 2 +- dbt/models/stg/stg_kouta_toteutus.sql | 2 +- dbt/models/stg/stg_kouta_valintaperuste.sql | 2 +- .../stg/stg_ohjausparametrit_parameter.sql | 2 +- dbt/models/stg/stg_sure_arvosana.sql | 4 +- dbt/models/stg/stg_sure_ensikertalainen.sql | 4 +- .../stg/stg_sure_harkinnanvaraisuus.sql | 4 +- dbt/models/stg/stg_sure_opiskelija.sql | 4 +- dbt/models/stg/stg_sure_opiskeluoikeus.sql | 4 +- dbt/models/stg/stg_sure_proxysuoritus.sql | 4 +- dbt/models/stg/stg_sure_suoritus.sql | 4 +- ...intalaskenta_valintakoe_osallistuminen.sql | 2 +- ...valintalaskenta_valintalaskennan_tulos.sql | 2 +- .../stg/stg_valintaperusteet_hakukohde.sql | 2 +- .../stg_valintapiste_service_pistetieto.sql | 4 +- .../stg_valintarekisteri_ilmoittautuminen.sql | 4 +- .../stg_valintarekisteri_valinnantulos.sql | 4 +- .../stg_valintarekisteri_valintatapajono.sql | 4 +- .../stg/stg_valintarekisteri_vastaanotto.sql | 4 +- .../yleiskayttoiset/stg_koodisto_koodi.sql | 2 +- .../yleiskayttoiset/stg_koodisto_relaatio.sql | 2 +- .../stg/yleiskayttoiset/stg_onr_henkilo.sql | 2 +- .../yleiskayttoiset/stg_onr_yhteystieto.sql | 2 +- .../stg_organisaatio_organisaatio.sql | 2 +- .../stg_organisaatio_organisaatiosuhde.sql | 2 +- .../stg_organisaatio_osoite.sql | 2 +- .../stg_organisaatio_ryhma.sql | 2 +- 48 files changed, 100 insertions(+), 82 deletions(-) diff --git a/dbt/.gitignore b/dbt/.gitignore index 087d062..63094f4 100644 --- a/dbt/.gitignore +++ b/dbt/.gitignore @@ -1,3 +1,5 @@ target/ dbt_packages/ logs/ +.* +!.gitignore diff --git a/dbt/models/int/int_organisaatio.sql b/dbt/models/int/int_organisaatio.sql index 14cade8..f474f9a 100644 --- a/dbt/models/int/int_organisaatio.sql +++ b/dbt/models/int/int_organisaatio.sql @@ -55,7 +55,7 @@ int as ( org1.oppilaitosnumero, org1.alkupvm, org1.lakkautuspvm - from organisaatio as org1 + from organisaatio as org1 left join ylempi_toimipiste as ylto on org1.ylempi_organisaatio = ylto.organisaatio_oid ), diff --git a/dbt/models/int/int_sure/int_sure_arvosana.sql b/dbt/models/int/int_sure/int_sure_arvosana.sql index 4bb02cc..f01b9c0 100644 --- a/dbt/models/int/int_sure/int_sure_arvosana.sql +++ b/dbt/models/int/int_sure/int_sure_arvosana.sql @@ -14,9 +14,7 @@ with raw as ( ), int as ( - select - * - from raw + select * from raw where row_nr = 1 ), diff --git a/dbt/models/int/int_sure/int_sure_ensikertalainen.sql b/dbt/models/int/int_sure/int_sure_ensikertalainen.sql index 47fd150..ea9a179 100644 --- a/dbt/models/int/int_sure/int_sure_ensikertalainen.sql +++ b/dbt/models/int/int_sure/int_sure_ensikertalainen.sql @@ -7,9 +7,7 @@ }} with int as ( - select - * - from {{ ref('dw_sure_ensikertalainen') }} + select * from {{ ref('dw_sure_ensikertalainen') }} ), final as ( diff --git a/dbt/models/int/int_sure/int_sure_opiskelija.sql b/dbt/models/int/int_sure/int_sure_opiskelija.sql index 4cc2fff..5a925e5 100644 --- a/dbt/models/int/int_sure/int_sure_opiskelija.sql +++ b/dbt/models/int/int_sure/int_sure_opiskelija.sql @@ -14,9 +14,7 @@ with raw as ( ), int as ( - select - * - from raw + select * from raw where row_nr = 1 ), diff --git a/dbt/models/int/int_sure/int_sure_opiskeluoikeus.sql b/dbt/models/int/int_sure/int_sure_opiskeluoikeus.sql index 895fde1..f832a3b 100644 --- a/dbt/models/int/int_sure/int_sure_opiskeluoikeus.sql +++ b/dbt/models/int/int_sure/int_sure_opiskeluoikeus.sql @@ -14,9 +14,7 @@ with raw as ( ), int as ( - select - * - from raw + select * from raw where row_nr = 1 ), diff --git a/dbt/models/int/int_sure/int_sure_suoritus.sql b/dbt/models/int/int_sure/int_sure_suoritus.sql index 8a0644b..a4bf8e0 100644 --- a/dbt/models/int/int_sure/int_sure_suoritus.sql +++ b/dbt/models/int/int_sure/int_sure_suoritus.sql @@ -14,9 +14,7 @@ with raw as ( ), int as ( - select - * - from raw + select * from raw where row_nr = 1 ), diff --git a/dbt/models/int/int_valintaperusteet_valintatapajono.sql b/dbt/models/int/int_valintaperusteet_valintatapajono.sql index e78316d..bd57952 100644 --- a/dbt/models/int/int_valintaperusteet_valintatapajono.sql +++ b/dbt/models/int/int_valintaperusteet_valintatapajono.sql @@ -61,27 +61,27 @@ existing_rows as ( select * from {{ this }} where hakukohde_oid in (select hakukohde_oid from valintatapajonoja) {% else %} - select - null as jono_id, - null as valinnanvaihe_id, - null as hakukohde_oid, - null as nimi, - null as kuvaus, - null::int as aloituspaikat, - null as tyyppi_uri, - null::int as prioriteetti, - null::boolean as siirretaan_sijoitteluun, - null as tasasijasaanto, - null::timestamptz as ei_lasketa_paivamaaran_jalkeen, - null::boolean as ei_varasijatayttoa, - null::boolean as merkitse_myoh_auto, - null::boolean as poissa_oleva_taytto, - null::boolean as kaikki_ehdon_tayttavat_hyvaksytaan, - null::boolean as kaytetaan_valintalaskentaa, - null::boolean as valmis_sijoiteltavaksi, - null::boolean as valisijoittelu, - null::boolean as poistetaanko_hylatyt, - null::jsonb as jarjestyskriteerit + select + null as jono_id, + null as valinnanvaihe_id, + null as hakukohde_oid, + null as nimi, + null as kuvaus, + null::int as aloituspaikat, + null as tyyppi_uri, + null::int as prioriteetti, + null::boolean as siirretaan_sijoitteluun, + null as tasasijasaanto, + null::timestamptz as ei_lasketa_paivamaaran_jalkeen, + null::boolean as ei_varasijatayttoa, + null::boolean as merkitse_myoh_auto, + null::boolean as poissa_oleva_taytto, + null::boolean as kaikki_ehdon_tayttavat_hyvaksytaan, + null::boolean as kaytetaan_valintalaskentaa, + null::boolean as valmis_sijoiteltavaksi, + null::boolean as valisijoittelu, + null::boolean as poistetaanko_hylatyt, + null::jsonb as jarjestyskriteerit {% endif %} ) diff --git a/dbt/models/pub/pub_dim_ensikertalainen.sql b/dbt/models/pub/pub_dim_ensikertalainen.sql index 667ae39..50ab1ea 100644 --- a/dbt/models/pub/pub_dim_ensikertalainen.sql +++ b/dbt/models/pub/pub_dim_ensikertalainen.sql @@ -19,7 +19,7 @@ int as ( isensikertalainen, menettamisenperuste, menettamisenpaivamaara - from ensikertalainen + from ensikertalainen ) -select * from int \ No newline at end of file +select * from int diff --git a/dbt/models/pub/pub_dim_organisaatio.sql b/dbt/models/pub/pub_dim_organisaatio.sql index a61b66e..0cbfeb8 100644 --- a/dbt/models/pub/pub_dim_organisaatio.sql +++ b/dbt/models/pub/pub_dim_organisaatio.sql @@ -8,7 +8,7 @@ }} with source as ( - select * from {{ ref('int_organisaatio') }} + select * from {{ ref('int_organisaatio') }} ), final as ( @@ -27,4 +27,4 @@ final as ( from source ) -select * from final \ No newline at end of file +select * from final diff --git a/dbt/models/pub/pub_dim_yo_arvosana.sql b/dbt/models/pub/pub_dim_yo_arvosana.sql index 0dfaaa2..eaa8bc1 100644 --- a/dbt/models/pub/pub_dim_yo_arvosana.sql +++ b/dbt/models/pub/pub_dim_yo_arvosana.sql @@ -9,7 +9,7 @@ }} with arvosana as ( - select * from {{ ref('int_sure_arvosana') }} where asteikko='YO' + select * from {{ ref('int_sure_arvosana') }} where asteikko = 'YO' ), suoritus as ( @@ -32,10 +32,10 @@ int as ( arvosana.source, arvosana.jarjestys, arvosana.arvot, - suoritus.henkilooid as henkilooid, - suoritus.tila as tila, + suoritus.henkilooid, + suoritus.tila, suoritus.valmistuminen as pvm - from arvosana + from arvosana left join suoritus on arvosana.suoritus = suoritus.resourceid ) diff --git a/dbt/models/stg/stg_ataru_hakemus.sql b/dbt/models/stg/stg_ataru_hakemus.sql index 391fd99..34ab065 100644 --- a/dbt/models/stg/stg_ataru_hakemus.sql +++ b/dbt/models/stg/stg_ataru_hakemus.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_ataru_lomake.sql b/dbt/models/stg/stg_ataru_lomake.sql index fb284c3..1bdbf25 100644 --- a/dbt/models/stg/stg_ataru_lomake.sql +++ b/dbt/models/stg/stg_ataru_lomake.sql @@ -2,7 +2,7 @@ with source as ( select * from {{ source('ovara', 'ataru_lomake') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_hakukohderyhmapalvelu_ryhma.sql b/dbt/models/stg/stg_hakukohderyhmapalvelu_ryhma.sql index 074b09c..3a3daa9 100644 --- a/dbt/models/stg/stg_hakukohderyhmapalvelu_ryhma.sql +++ b/dbt/models/stg/stg_hakukohderyhmapalvelu_ryhma.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_ammattinimike.sql b/dbt/models/stg/stg_kouta_ammattinimike.sql index b565889..be3e9f0 100644 --- a/dbt/models/stg/stg_kouta_ammattinimike.sql +++ b/dbt/models/stg/stg_kouta_ammattinimike.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_asiasana.sql b/dbt/models/stg/stg_kouta_asiasana.sql index a772875..0a6ab90 100644 --- a/dbt/models/stg/stg_kouta_asiasana.sql +++ b/dbt/models/stg/stg_kouta_asiasana.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_haku.sql b/dbt/models/stg/stg_kouta_haku.sql index 462a2da..edd9ca4 100644 --- a/dbt/models/stg/stg_kouta_haku.sql +++ b/dbt/models/stg/stg_kouta_haku.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_hakukohde.sql b/dbt/models/stg/stg_kouta_hakukohde.sql index 0bb2a15..4bed1c6 100644 --- a/dbt/models/stg/stg_kouta_hakukohde.sql +++ b/dbt/models/stg/stg_kouta_hakukohde.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_koulutus.sql b/dbt/models/stg/stg_kouta_koulutus.sql index 83542c9..56590dc 100644 --- a/dbt/models/stg/stg_kouta_koulutus.sql +++ b/dbt/models/stg/stg_kouta_koulutus.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_oppilaitoksetjaosat.sql b/dbt/models/stg/stg_kouta_oppilaitoksetjaosat.sql index c45e149..bb9514c 100644 --- a/dbt/models/stg/stg_kouta_oppilaitoksetjaosat.sql +++ b/dbt/models/stg/stg_kouta_oppilaitoksetjaosat.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_pistehistoria.sql b/dbt/models/stg/stg_kouta_pistehistoria.sql index dcfbc11..bb08fc5 100644 --- a/dbt/models/stg/stg_kouta_pistehistoria.sql +++ b/dbt/models/stg/stg_kouta_pistehistoria.sql @@ -2,7 +2,9 @@ with source as ( --noqa: PRS select * from {{ source('ovara', 'kouta_pistehistoria') }} {%- if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }} ) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif -%} ), diff --git a/dbt/models/stg/stg_kouta_sorakuvaus.sql b/dbt/models/stg/stg_kouta_sorakuvaus.sql index 4afe6f0..985315f 100644 --- a/dbt/models/stg/stg_kouta_sorakuvaus.sql +++ b/dbt/models/stg/stg_kouta_sorakuvaus.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_toteutus.sql b/dbt/models/stg/stg_kouta_toteutus.sql index 5a772ff..baeb1a1 100644 --- a/dbt/models/stg/stg_kouta_toteutus.sql +++ b/dbt/models/stg/stg_kouta_toteutus.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_kouta_valintaperuste.sql b/dbt/models/stg/stg_kouta_valintaperuste.sql index afefc8d..7fb9976 100644 --- a/dbt/models/stg/stg_kouta_valintaperuste.sql +++ b/dbt/models/stg/stg_kouta_valintaperuste.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_ohjausparametrit_parameter.sql b/dbt/models/stg/stg_ohjausparametrit_parameter.sql index 372778e..e80d720 100644 --- a/dbt/models/stg/stg_ohjausparametrit_parameter.sql +++ b/dbt/models/stg/stg_ohjausparametrit_parameter.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_sure_arvosana.sql b/dbt/models/stg/stg_sure_arvosana.sql index 9b78e5d..0af79df 100644 --- a/dbt/models/stg/stg_sure_arvosana.sql +++ b/dbt/models/stg/stg_sure_arvosana.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_arvosana') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_ensikertalainen.sql b/dbt/models/stg/stg_sure_ensikertalainen.sql index deb251f..0149119 100644 --- a/dbt/models/stg/stg_sure_ensikertalainen.sql +++ b/dbt/models/stg/stg_sure_ensikertalainen.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_ensikertalainen') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_harkinnanvaraisuus.sql b/dbt/models/stg/stg_sure_harkinnanvaraisuus.sql index 5d06761..ea78bf9 100644 --- a/dbt/models/stg/stg_sure_harkinnanvaraisuus.sql +++ b/dbt/models/stg/stg_sure_harkinnanvaraisuus.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_harkinnanvaraisuus') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_opiskelija.sql b/dbt/models/stg/stg_sure_opiskelija.sql index f760c42..28aad98 100644 --- a/dbt/models/stg/stg_sure_opiskelija.sql +++ b/dbt/models/stg/stg_sure_opiskelija.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_opiskelija') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_opiskeluoikeus.sql b/dbt/models/stg/stg_sure_opiskeluoikeus.sql index 1e7af64..b03cb3c 100644 --- a/dbt/models/stg/stg_sure_opiskeluoikeus.sql +++ b/dbt/models/stg/stg_sure_opiskeluoikeus.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_opiskeluoikeus') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_proxysuoritus.sql b/dbt/models/stg/stg_sure_proxysuoritus.sql index ab7d8c2..345f2a2 100644 --- a/dbt/models/stg/stg_sure_proxysuoritus.sql +++ b/dbt/models/stg/stg_sure_proxysuoritus.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_proxysuoritus') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_sure_suoritus.sql b/dbt/models/stg/stg_sure_suoritus.sql index c7d7acd..70193e5 100644 --- a/dbt/models/stg/stg_sure_suoritus.sql +++ b/dbt/models/stg/stg_sure_suoritus.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'sure_suoritus') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_valintalaskenta_valintakoe_osallistuminen.sql b/dbt/models/stg/stg_valintalaskenta_valintakoe_osallistuminen.sql index e34c5aa..a5b7cfa 100644 --- a/dbt/models/stg/stg_valintalaskenta_valintakoe_osallistuminen.sql +++ b/dbt/models/stg/stg_valintalaskenta_valintakoe_osallistuminen.sql @@ -11,7 +11,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_valintalaskenta_valintalaskennan_tulos.sql b/dbt/models/stg/stg_valintalaskenta_valintalaskennan_tulos.sql index 61d2a6d..88c67d8 100644 --- a/dbt/models/stg/stg_valintalaskenta_valintalaskennan_tulos.sql +++ b/dbt/models/stg/stg_valintalaskenta_valintalaskennan_tulos.sql @@ -2,7 +2,7 @@ with source as ( select * from {{ source('ovara', 'valintalaskenta_valintalaskennan_tulos') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} diff --git a/dbt/models/stg/stg_valintaperusteet_hakukohde.sql b/dbt/models/stg/stg_valintaperusteet_hakukohde.sql index afb9c79..ad1089b 100644 --- a/dbt/models/stg/stg_valintaperusteet_hakukohde.sql +++ b/dbt/models/stg/stg_valintaperusteet_hakukohde.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/stg_valintapiste_service_pistetieto.sql b/dbt/models/stg/stg_valintapiste_service_pistetieto.sql index 459064d..cad1705 100644 --- a/dbt/models/stg/stg_valintapiste_service_pistetieto.sql +++ b/dbt/models/stg/stg_valintapiste_service_pistetieto.sql @@ -14,7 +14,9 @@ with source as ( --noqa: PRS select * from {{ source('ovara', 'valintapiste_service_pistetieto') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_valintarekisteri_ilmoittautuminen.sql b/dbt/models/stg/stg_valintarekisteri_ilmoittautuminen.sql index 600bf8f..80995df 100644 --- a/dbt/models/stg/stg_valintarekisteri_ilmoittautuminen.sql +++ b/dbt/models/stg/stg_valintarekisteri_ilmoittautuminen.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'valintarekisteri_ilmoittautuminen') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_valintarekisteri_valinnantulos.sql b/dbt/models/stg/stg_valintarekisteri_valinnantulos.sql index 6cae5b1..8658bfb 100644 --- a/dbt/models/stg/stg_valintarekisteri_valinnantulos.sql +++ b/dbt/models/stg/stg_valintarekisteri_valinnantulos.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'valintarekisteri_valinnantulos') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_valintarekisteri_valintatapajono.sql b/dbt/models/stg/stg_valintarekisteri_valintatapajono.sql index 665ac67..354773d 100644 --- a/dbt/models/stg/stg_valintarekisteri_valintatapajono.sql +++ b/dbt/models/stg/stg_valintarekisteri_valintatapajono.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'valintarekisteri_valintatapajono') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/stg_valintarekisteri_vastaanotto.sql b/dbt/models/stg/stg_valintarekisteri_vastaanotto.sql index f01daf7..401d2ef 100644 --- a/dbt/models/stg/stg_valintarekisteri_vastaanotto.sql +++ b/dbt/models/stg/stg_valintarekisteri_vastaanotto.sql @@ -2,7 +2,9 @@ with source as ( select * from {{ source('ovara', 'valintarekisteri_vastaanotto') }} {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) + {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_koodisto_koodi.sql b/dbt/models/stg/yleiskayttoiset/stg_koodisto_koodi.sql index 9ff4427..a76fc89 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_koodisto_koodi.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_koodisto_koodi.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_koodisto_relaatio.sql b/dbt/models/stg/yleiskayttoiset/stg_koodisto_relaatio.sql index 93c8c11..ff888af 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_koodisto_relaatio.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_koodisto_relaatio.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_onr_henkilo.sql b/dbt/models/stg/yleiskayttoiset/stg_onr_henkilo.sql index b332527..f4369a8 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_onr_henkilo.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_onr_henkilo.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_onr_yhteystieto.sql b/dbt/models/stg/yleiskayttoiset/stg_onr_yhteystieto.sql index f050656..cdf4bab 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_onr_yhteystieto.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_onr_yhteystieto.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatio.sql b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatio.sql index 40dc75e..6adae9c 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatio.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatio.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} diff --git a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatiosuhde.sql b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatiosuhde.sql index c7a4926..3a0ef17 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatiosuhde.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_organisaatiosuhde.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_osoite.sql b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_osoite.sql index a314349..4c54eec 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_osoite.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_osoite.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ), diff --git a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_ryhma.sql b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_ryhma.sql index 41040f7..ed4e8b9 100644 --- a/dbt/models/stg/yleiskayttoiset/stg_organisaatio_ryhma.sql +++ b/dbt/models/stg/yleiskayttoiset/stg_organisaatio_ryhma.sql @@ -3,7 +3,7 @@ with source as ( {% if is_incremental() %} - where dw_metadata_dbt_copied_at > (select max(dw_metadata_dbt_copied_at) from {{ this }}) + where dw_metadata_dbt_copied_at > (select coalesce(max(dw_metadata_dbt_copied_at), '1899-12-31') from {{ this }}) {% endif %} ),