diff --git a/warehouses/accelerator/extract_load/opralogweb/.dlt/config.toml b/warehouses/accelerator/extract_load/opralogweb/.dlt/config.toml index 22e7fcb0..ae3b5f3d 100644 --- a/warehouses/accelerator/extract_load/opralogweb/.dlt/config.toml +++ b/warehouses/accelerator/extract_load/opralogweb/.dlt/config.toml @@ -8,9 +8,6 @@ schema = "dbo" [[sources.sql_database.tables]] name = "Entries" -# Spark seems to have an issue with seeing a table named 'entries' regardless of the namespace it is in -# so we rename it -destination_name = "user_entries" incremental_id = "EntryId" html_to_markdown_columns = ["AdditionalComment"] diff --git a/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/_opralogweb__sources.yml b/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/_opralogweb__sources.yml index 155ec29d..322dd215 100644 --- a/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/_opralogweb__sources.yml +++ b/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/_opralogweb__sources.yml @@ -3,7 +3,7 @@ version: 2 sources: - name: src_opralogweb tables: - - name: user_entries + - name: entries - name: chapter_entry - name: logbook_chapter - name: logbooks diff --git a/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__user_entries.sql b/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__entries.sql similarity index 81% rename from warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__user_entries.sql rename to warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__entries.sql index 39003968..839d21a7 100644 --- a/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__user_entries.sql +++ b/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__entries.sql @@ -2,7 +2,7 @@ with source as ( - select * from {{ source('src_opralogweb', 'user_entries') }} + select * from {{ source('src_opralogweb', 'entries') }} ), diff --git a/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__entries.yml b/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__entries.yml new file mode 100644 index 00000000..ef22cea4 --- /dev/null +++ b/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__entries.yml @@ -0,0 +1,8 @@ +models: + - name: base_opralogweb__entries + description: > + Opralogweb "entries" table with basic cleaning. + columns: + - name: entry_id + tests: + - not_null diff --git a/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__user_entries.yml b/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__user_entries.yml deleted file mode 100644 index 5ef7806e..00000000 --- a/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/base/base_opralogweb__user_entries.yml +++ /dev/null @@ -1,9 +0,0 @@ -models: - - name: base_opralogweb__user_entries - description: > - Opralogweb "entries" table with basic cleaning. Table has been renamed from "entries" - due to an expected clash with a reserved internal name in Iceberg. - columns: - - name: entry_id - tests: - - not_null diff --git a/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/stg_opralogweb__mcr_equipment_downtime.sql b/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/stg_opralogweb__mcr_equipment_downtime.sql index 07f7a9a4..c191019f 100644 --- a/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/stg_opralogweb__mcr_equipment_downtime.sql +++ b/warehouses/accelerator/transform/accelerator/models/staging/opralogweb/stg_opralogweb__mcr_equipment_downtime.sql @@ -3,7 +3,7 @@ with -staging_entries as ( select * from {{ ref('base_opralogweb__user_entries') }} ), +staging_entries as ( select * from {{ ref('base_opralogweb__entries') }} ), staging_chapter_entry as ( select * from {{ ref('base_opralogweb__chapter_entry') }} ),