diff --git a/warehouse/models/mart/annual_reporting/_mart_annual_reporting.yml b/warehouse/models/mart/annual_reporting/_mart_annual_reporting.yml new file mode 100644 index 0000000000..55746ca8ff --- /dev/null +++ b/warehouse/models/mart/annual_reporting/_mart_annual_reporting.yml @@ -0,0 +1,39 @@ +version: 2 + +models: + - name: fct_breakdowns + - name: fct_breakdowns_by_agency + - name: fct_capital_expenses_by_capital_use + - name: fct_capital_expenses_by_mode + - name: fct_capital_expenses_for_existing_service + - name: fct_capital_expenses_for_expansion_of_service + - name: fct_employees_by_agency + - name: fct_employees_by_mode + - name: fct_employees_by_mode_and_employee_type + - name: fct_fuel_and_energy + - name: fct_fuel_and_energy_by_agency + - name: fct_funding_sources_by_expense_type + - name: fct_funding_sources_directly_generated + - name: fct_funding_sources_federal + - name: fct_funding_sources_local + - name: fct_funding_sources_state + - name: fct_funding_sources_taxes_levied_by_agency + - name: fct_maintenance_facilities + - name: fct_maintenance_facilities_by_agency + - name: fct_metrics + - name: fct_operating_expenses_by_function + - name: fct_operating_expenses_by_function_and_agency + - name: fct_operating_expenses_by_type + - name: fct_operating_expenses_by_type_and_agency + - name: fct_service_by_agency + - name: fct_service_by_mode + - name: fct_service_by_mode_and_time_period + - name: fct_stations_and_facilities_by_agency_and_facility_type + - name: fct_stations_by_mode_and_age + - name: fct_track_and_roadway_by_agency + - name: fct_track_and_roadway_by_mode + - name: fct_track_and_roadway_guideway_age_distribution + - name: fct_vehicles_age_distribution + - name: fct_vehicles_type_count_by_agency + - name: dim_2023_agency_information + - name: fct_2023_contractual_relationships diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__2023_agency_information.sql b/warehouse/models/mart/annual_reporting/dim_2023_agency_information.sql similarity index 59% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__2023_agency_information.sql rename to warehouse/models/mart/annual_reporting/dim_2023_agency_information.sql index d604e7c44e..d025c265c3 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__2023_agency_information.sql +++ b/warehouse/models/mart/annual_reporting/dim_2023_agency_information.sql @@ -3,9 +3,9 @@ WITH staging_agency_information AS ( FROM {{ ref('stg_ntd__2023_agency_information') }} ), -fct_ntd_annual_data__2023_agency_information AS ( +dim_2023_agency_information AS ( SELECT * FROM staging_agency_information ) -SELECT * FROM fct_ntd_annual_data__2023_agency_information +SELECT * FROM dim_2023_agency_information diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__2023_contractual_relationships.sql b/warehouse/models/mart/annual_reporting/fct_2023_contractual_relationships.sql similarity index 59% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__2023_contractual_relationships.sql rename to warehouse/models/mart/annual_reporting/fct_2023_contractual_relationships.sql index e394dce832..fb1500810e 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__2023_contractual_relationships.sql +++ b/warehouse/models/mart/annual_reporting/fct_2023_contractual_relationships.sql @@ -3,9 +3,9 @@ WITH staging_contractual_relationships AS ( FROM {{ ref('stg_ntd__2023_contractual_relationships') }} ), -fct_ntd_annual_data__2023_contractual_relationships AS ( +fct_2023_contractual_relationships AS ( SELECT * FROM staging_contractual_relationships ) -SELECT * FROM fct_ntd_annual_data__2023_contractual_relationships +SELECT * FROM fct_2023_contractual_relationships diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__breakdowns.sql b/warehouse/models/mart/annual_reporting/fct_breakdowns.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__breakdowns.sql rename to warehouse/models/mart/annual_reporting/fct_breakdowns.sql index 1f00698c62..7b4d5e8449 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__breakdowns.sql +++ b/warehouse/models/mart/annual_reporting/fct_breakdowns.sql @@ -3,9 +3,9 @@ WITH staging_breakdowns AS ( FROM {{ ref('stg_ntd__breakdowns') }} ), -fct_ntd_annual_data__breakdowns AS ( +fct_breakdowns AS ( SELECT * FROM staging_breakdowns ) -SELECT * FROM fct_ntd_annual_data__breakdowns +SELECT * FROM fct_breakdowns diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__breakdowns_by_agency.sql b/warehouse/models/mart/annual_reporting/fct_breakdowns_by_agency.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__breakdowns_by_agency.sql rename to warehouse/models/mart/annual_reporting/fct_breakdowns_by_agency.sql index 3433f5fb83..b5839f67b8 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__breakdowns_by_agency.sql +++ b/warehouse/models/mart/annual_reporting/fct_breakdowns_by_agency.sql @@ -3,9 +3,9 @@ WITH staging_breakdowns_by_agency AS ( FROM {{ ref('stg_ntd__breakdowns_by_agency') }} ), -fct_ntd_annual_data__breakdowns_by_agency AS ( +fct_breakdowns_by_agency AS ( SELECT * FROM staging_breakdowns_by_agency ) -SELECT * FROM fct_ntd_annual_data__breakdowns_by_agency +SELECT * FROM fct_breakdowns_by_agency diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_by_capital_use.sql b/warehouse/models/mart/annual_reporting/fct_capital_expenses_by_capital_use.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_by_capital_use.sql rename to warehouse/models/mart/annual_reporting/fct_capital_expenses_by_capital_use.sql index d2fe8eb6d5..b97ee4b31a 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_by_capital_use.sql +++ b/warehouse/models/mart/annual_reporting/fct_capital_expenses_by_capital_use.sql @@ -3,9 +3,9 @@ WITH staging_capital_expenses_by_capital_use AS ( FROM {{ ref('stg_ntd__capital_expenses_by_capital_use') }} ), -fct_ntd_annual_data__capital_expenses_by_capital_use AS ( +fct_capital_expenses_by_capital_use AS ( SELECT * FROM staging_capital_expenses_by_capital_use ) -SELECT * FROM fct_ntd_annual_data__capital_expenses_by_capital_use +SELECT * FROM fct_capital_expenses_by_capital_use diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_by_mode.sql b/warehouse/models/mart/annual_reporting/fct_capital_expenses_by_mode.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_by_mode.sql rename to warehouse/models/mart/annual_reporting/fct_capital_expenses_by_mode.sql index d3303759a0..d8e05d4b49 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_by_mode.sql +++ b/warehouse/models/mart/annual_reporting/fct_capital_expenses_by_mode.sql @@ -3,9 +3,9 @@ WITH staging_capital_expenses_by_mode AS ( FROM {{ ref('stg_ntd__capital_expenses_by_mode') }} ), -fct_ntd_annual_data__capital_expenses_by_mode AS ( +fct_capital_expenses_by_mode AS ( SELECT * FROM staging_capital_expenses_by_mode ) -SELECT * FROM fct_ntd_annual_data__capital_expenses_by_mode +SELECT * FROM fct_capital_expenses_by_mode diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_for_existing_service.sql b/warehouse/models/mart/annual_reporting/fct_capital_expenses_for_existing_service.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_for_existing_service.sql rename to warehouse/models/mart/annual_reporting/fct_capital_expenses_for_existing_service.sql index dc8b9ae5d2..7741c2b9af 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_for_existing_service.sql +++ b/warehouse/models/mart/annual_reporting/fct_capital_expenses_for_existing_service.sql @@ -3,9 +3,9 @@ WITH staging_capital_expenses_for_existing_service AS ( FROM {{ ref('stg_ntd__capital_expenses_for_existing_service') }} ), -fct_ntd_annual_data__capital_expenses_for_existing_service AS ( +fct_capital_expenses_for_existing_service AS ( SELECT * FROM staging_capital_expenses_for_existing_service ) -SELECT * FROM fct_ntd_annual_data__capital_expenses_for_existing_service +SELECT * FROM fct_capital_expenses_for_existing_service diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_for_expansion_of_service.sql b/warehouse/models/mart/annual_reporting/fct_capital_expenses_for_expansion_of_service.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_for_expansion_of_service.sql rename to warehouse/models/mart/annual_reporting/fct_capital_expenses_for_expansion_of_service.sql index 4f40499924..af1c07bcd7 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__capital_expenses_for_expansion_of_service.sql +++ b/warehouse/models/mart/annual_reporting/fct_capital_expenses_for_expansion_of_service.sql @@ -3,9 +3,9 @@ WITH staging_capital_expenses_for_expansion_of_service AS ( FROM {{ ref('stg_ntd__capital_expenses_for_expansion_of_service') }} ), -fct_ntd_annual_data__capital_expenses_for_expansion_of_service AS ( +fct_capital_expenses_for_expansion_of_service AS ( SELECT * FROM staging_capital_expenses_for_expansion_of_service ) -SELECT * FROM fct_ntd_annual_data__capital_expenses_for_expansion_of_service +SELECT * FROM fct_capital_expenses_for_expansion_of_service diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__employees_by_agency.sql b/warehouse/models/mart/annual_reporting/fct_employees_by_agency.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__employees_by_agency.sql rename to warehouse/models/mart/annual_reporting/fct_employees_by_agency.sql index abbd03be1d..d578cc025b 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__employees_by_agency.sql +++ b/warehouse/models/mart/annual_reporting/fct_employees_by_agency.sql @@ -3,9 +3,9 @@ WITH staging_employees_by_agency AS ( FROM {{ ref('stg_ntd__employees_by_agency') }} ), -fct_ntd_annual_data__employees_by_agency AS ( +fct_employees_by_agency AS ( SELECT * FROM staging_employees_by_agency ) -SELECT * FROM fct_ntd_annual_data__employees_by_agency +SELECT * FROM fct_employees_by_agency diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__employees_by_mode.sql b/warehouse/models/mart/annual_reporting/fct_employees_by_mode.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__employees_by_mode.sql rename to warehouse/models/mart/annual_reporting/fct_employees_by_mode.sql index 9a7d79458a..8ad6d539d3 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__employees_by_mode.sql +++ b/warehouse/models/mart/annual_reporting/fct_employees_by_mode.sql @@ -3,9 +3,9 @@ WITH staging_employees_by_mode AS ( FROM {{ ref('stg_ntd__employees_by_mode') }} ), -fct_ntd_annual_data__employees_by_mode AS ( +fct_employees_by_mode AS ( SELECT * FROM staging_employees_by_mode ) -SELECT * FROM fct_ntd_annual_data__employees_by_mode +SELECT * FROM fct_employees_by_mode diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__employees_by_mode_and_employee_type.sql b/warehouse/models/mart/annual_reporting/fct_employees_by_mode_and_employee_type.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__employees_by_mode_and_employee_type.sql rename to warehouse/models/mart/annual_reporting/fct_employees_by_mode_and_employee_type.sql index 286ec61946..205cf5831e 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__employees_by_mode_and_employee_type.sql +++ b/warehouse/models/mart/annual_reporting/fct_employees_by_mode_and_employee_type.sql @@ -3,9 +3,9 @@ WITH staging_employees_by_mode_and_employee_type AS ( FROM {{ ref('stg_ntd__employees_by_mode_and_employee_type') }} ), -fct_ntd_annual_data__employees_by_mode_and_employee_type AS ( +fct_employees_by_mode_and_employee_type AS ( SELECT * FROM staging_employees_by_mode_and_employee_type ) -SELECT * FROM fct_ntd_annual_data__employees_by_mode_and_employee_type +SELECT * FROM fct_employees_by_mode_and_employee_type diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__fuel_and_energy.sql b/warehouse/models/mart/annual_reporting/fct_fuel_and_energy.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__fuel_and_energy.sql rename to warehouse/models/mart/annual_reporting/fct_fuel_and_energy.sql index 8e992f0b4a..f0bac78f4f 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__fuel_and_energy.sql +++ b/warehouse/models/mart/annual_reporting/fct_fuel_and_energy.sql @@ -3,9 +3,9 @@ WITH staging_fuel_and_energy AS ( FROM {{ ref('stg_ntd__fuel_and_energy') }} ), -fct_ntd_annual_data__fuel_and_energy AS ( +fct_fuel_and_energy AS ( SELECT * FROM staging_fuel_and_energy ) -SELECT * FROM fct_ntd_annual_data__fuel_and_energy +SELECT * FROM fct_fuel_and_energy diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__fuel_and_energy_by_agency.sql b/warehouse/models/mart/annual_reporting/fct_fuel_and_energy_by_agency.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__fuel_and_energy_by_agency.sql rename to warehouse/models/mart/annual_reporting/fct_fuel_and_energy_by_agency.sql index 4e469fd2af..8ff904f352 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__fuel_and_energy_by_agency.sql +++ b/warehouse/models/mart/annual_reporting/fct_fuel_and_energy_by_agency.sql @@ -3,9 +3,9 @@ WITH staging_fuel_and_energy_by_agency AS ( FROM {{ ref('stg_ntd__fuel_and_energy_by_agency') }} ), -fct_ntd_annual_data__fuel_and_energy_by_agency AS ( +fct_fuel_and_energy_by_agency AS ( SELECT * FROM staging_fuel_and_energy_by_agency ) -SELECT * FROM fct_ntd_annual_data__fuel_and_energy_by_agency +SELECT * FROM fct_fuel_and_energy_by_agency diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_by_expense_type.sql b/warehouse/models/mart/annual_reporting/fct_funding_sources_by_expense_type.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_by_expense_type.sql rename to warehouse/models/mart/annual_reporting/fct_funding_sources_by_expense_type.sql index 83c9e0ee08..5f19d6f7a3 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_by_expense_type.sql +++ b/warehouse/models/mart/annual_reporting/fct_funding_sources_by_expense_type.sql @@ -3,9 +3,9 @@ WITH staging_funding_sources_by_expense_type AS ( FROM {{ ref('stg_ntd__funding_sources_by_expense_type') }} ), -fct_ntd_annual_data__funding_sources_by_expense_type AS ( +fct_funding_sources_by_expense_type AS ( SELECT * FROM staging_funding_sources_by_expense_type ) -SELECT * FROM fct_ntd_annual_data__funding_sources_by_expense_type +SELECT * FROM fct_funding_sources_by_expense_type diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_directly_generated.sql b/warehouse/models/mart/annual_reporting/fct_funding_sources_directly_generated.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_directly_generated.sql rename to warehouse/models/mart/annual_reporting/fct_funding_sources_directly_generated.sql index b1c37aa364..d997cc097d 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_directly_generated.sql +++ b/warehouse/models/mart/annual_reporting/fct_funding_sources_directly_generated.sql @@ -3,9 +3,9 @@ WITH staging_funding_sources_directly_generated AS ( FROM {{ ref('stg_ntd__funding_sources_directly_generated') }} ), -fct_ntd_annual_data__funding_sources_directly_generated AS ( +fct_funding_sources_directly_generated AS ( SELECT * FROM staging_funding_sources_directly_generated ) -SELECT * FROM fct_ntd_annual_data__funding_sources_directly_generated +SELECT * FROM fct_funding_sources_directly_generated diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_federal.sql b/warehouse/models/mart/annual_reporting/fct_funding_sources_federal.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_federal.sql rename to warehouse/models/mart/annual_reporting/fct_funding_sources_federal.sql index 7c2df008e1..a4b550d6cf 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_federal.sql +++ b/warehouse/models/mart/annual_reporting/fct_funding_sources_federal.sql @@ -3,9 +3,9 @@ WITH staging_funding_sources_federal AS ( FROM {{ ref('stg_ntd__funding_sources_federal') }} ), -fct_ntd_annual_data__funding_sources_federal AS ( +fct_funding_sources_federal AS ( SELECT * FROM staging_funding_sources_federal ) -SELECT * FROM fct_ntd_annual_data__funding_sources_federal +SELECT * FROM fct_funding_sources_federal diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_local.sql b/warehouse/models/mart/annual_reporting/fct_funding_sources_local.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_local.sql rename to warehouse/models/mart/annual_reporting/fct_funding_sources_local.sql index b10a173fcb..8309405a41 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_local.sql +++ b/warehouse/models/mart/annual_reporting/fct_funding_sources_local.sql @@ -3,9 +3,9 @@ WITH staging_funding_sources_local AS ( FROM {{ ref('stg_ntd__funding_sources_local') }} ), -fct_ntd_annual_data__funding_sources_local AS ( +fct_funding_sources_local AS ( SELECT * FROM staging_funding_sources_local ) -SELECT * FROM fct_ntd_annual_data__funding_sources_local +SELECT * FROM fct_funding_sources_local diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_state.sql b/warehouse/models/mart/annual_reporting/fct_funding_sources_state.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_state.sql rename to warehouse/models/mart/annual_reporting/fct_funding_sources_state.sql index 52ba8ea8be..e97cc3a363 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_state.sql +++ b/warehouse/models/mart/annual_reporting/fct_funding_sources_state.sql @@ -3,9 +3,9 @@ WITH staging_funding_sources_state AS ( FROM {{ ref('stg_ntd__funding_sources_state') }} ), -fct_ntd_annual_data__funding_sources_state AS ( +fct_funding_sources_state AS ( SELECT * FROM staging_funding_sources_state ) -SELECT * FROM fct_ntd_annual_data__funding_sources_state +SELECT * FROM fct_funding_sources_state diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_taxes_levied_by_agency.sql b/warehouse/models/mart/annual_reporting/fct_funding_sources_taxes_levied_by_agency.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_taxes_levied_by_agency.sql rename to warehouse/models/mart/annual_reporting/fct_funding_sources_taxes_levied_by_agency.sql index acfd7f3cb0..72e0a8b9c4 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__funding_sources_taxes_levied_by_agency.sql +++ b/warehouse/models/mart/annual_reporting/fct_funding_sources_taxes_levied_by_agency.sql @@ -3,9 +3,9 @@ WITH staging_funding_sources_taxes_levied_by_agency AS ( FROM {{ ref('stg_ntd__funding_sources_taxes_levied_by_agency') }} ), -fct_ntd_annual_data__funding_sources_taxes_levied_by_agency AS ( +fct_funding_sources_taxes_levied_by_agency AS ( SELECT * FROM staging_funding_sources_taxes_levied_by_agency ) -SELECT * FROM fct_ntd_annual_data__funding_sources_taxes_levied_by_agency +SELECT * FROM fct_funding_sources_taxes_levied_by_agency diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__maintenance_facilities.sql b/warehouse/models/mart/annual_reporting/fct_maintenance_facilities.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__maintenance_facilities.sql rename to warehouse/models/mart/annual_reporting/fct_maintenance_facilities.sql index 6380ce4db5..530ded5c41 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__maintenance_facilities.sql +++ b/warehouse/models/mart/annual_reporting/fct_maintenance_facilities.sql @@ -3,9 +3,9 @@ WITH staging_maintenance_facilities AS ( FROM {{ ref('stg_ntd__maintenance_facilities') }} ), -fct_ntd_annual_data__maintenance_facilities AS ( +fct_maintenance_facilities AS ( SELECT * FROM staging_maintenance_facilities ) -SELECT * FROM fct_ntd_annual_data__maintenance_facilities +SELECT * FROM fct_maintenance_facilities diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__maintenance_facilities_by_agency.sql b/warehouse/models/mart/annual_reporting/fct_maintenance_facilities_by_agency.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__maintenance_facilities_by_agency.sql rename to warehouse/models/mart/annual_reporting/fct_maintenance_facilities_by_agency.sql index 82d7048929..f45ba8f08f 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__maintenance_facilities_by_agency.sql +++ b/warehouse/models/mart/annual_reporting/fct_maintenance_facilities_by_agency.sql @@ -3,9 +3,9 @@ WITH staging_maintenance_facilities_by_agency AS ( FROM {{ ref('stg_ntd__maintenance_facilities_by_agency') }} ), -fct_ntd_annual_data__maintenance_facilities_by_agency AS ( +fct_maintenance_facilities_by_agency AS ( SELECT * FROM staging_maintenance_facilities_by_agency ) -SELECT * FROM fct_ntd_annual_data__maintenance_facilities_by_agency +SELECT * FROM fct_maintenance_facilities_by_agency diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__metrics.sql b/warehouse/models/mart/annual_reporting/fct_metrics.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__metrics.sql rename to warehouse/models/mart/annual_reporting/fct_metrics.sql index 7769a5281b..c8d517af7e 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__metrics.sql +++ b/warehouse/models/mart/annual_reporting/fct_metrics.sql @@ -3,9 +3,9 @@ WITH staging_metrics AS ( FROM {{ ref('stg_ntd__metrics') }} ), -fct_ntd_annual_data__metrics AS ( +fct_metrics AS ( SELECT * FROM staging_metrics ) -SELECT * FROM fct_ntd_annual_data__metrics +SELECT * FROM fct_metrics diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_function.sql b/warehouse/models/mart/annual_reporting/fct_operating_expenses_by_function.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_function.sql rename to warehouse/models/mart/annual_reporting/fct_operating_expenses_by_function.sql index 3542d35cc5..a87a0154d8 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_function.sql +++ b/warehouse/models/mart/annual_reporting/fct_operating_expenses_by_function.sql @@ -3,9 +3,9 @@ WITH staging_operating_expenses_by_function AS ( FROM {{ ref('stg_ntd__operating_expenses_by_function') }} ), -fct_ntd_annual_data__operating_expenses_by_function AS ( +fct_operating_expenses_by_function AS ( SELECT * FROM staging_operating_expenses_by_function ) -SELECT * FROM fct_ntd_annual_data__operating_expenses_by_function +SELECT * FROM fct_operating_expenses_by_function diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_function_and_agency.sql b/warehouse/models/mart/annual_reporting/fct_operating_expenses_by_function_and_agency.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_function_and_agency.sql rename to warehouse/models/mart/annual_reporting/fct_operating_expenses_by_function_and_agency.sql index ae36acaeaa..386eff8329 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_function_and_agency.sql +++ b/warehouse/models/mart/annual_reporting/fct_operating_expenses_by_function_and_agency.sql @@ -3,9 +3,9 @@ WITH staging_operating_expenses_by_function_and_agency AS ( FROM {{ ref('stg_ntd__operating_expenses_by_function_and_agency') }} ), -fct_ntd_annual_data__operating_expenses_by_function_and_agency AS ( +fct_operating_expenses_by_function_and_agency AS ( SELECT * FROM staging_operating_expenses_by_function_and_agency ) -SELECT * FROM fct_ntd_annual_data__operating_expenses_by_function_and_agency +SELECT * FROM fct_operating_expenses_by_function_and_agency diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_type.sql b/warehouse/models/mart/annual_reporting/fct_operating_expenses_by_type.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_type.sql rename to warehouse/models/mart/annual_reporting/fct_operating_expenses_by_type.sql index a3b4ca1b54..98187e2608 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_type.sql +++ b/warehouse/models/mart/annual_reporting/fct_operating_expenses_by_type.sql @@ -3,9 +3,9 @@ WITH staging_operating_expenses_by_type AS ( FROM {{ ref('stg_ntd__operating_expenses_by_type') }} ), -fct_ntd_annual_data__operating_expenses_by_type AS ( +fct_operating_expenses_by_type AS ( SELECT * FROM staging_operating_expenses_by_type ) -SELECT * FROM fct_ntd_annual_data__operating_expenses_by_type +SELECT * FROM fct_operating_expenses_by_type diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_type_and_agency.sql b/warehouse/models/mart/annual_reporting/fct_operating_expenses_by_type_and_agency.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_type_and_agency.sql rename to warehouse/models/mart/annual_reporting/fct_operating_expenses_by_type_and_agency.sql index 6aee3a7f15..8c39a3c286 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__operating_expenses_by_type_and_agency.sql +++ b/warehouse/models/mart/annual_reporting/fct_operating_expenses_by_type_and_agency.sql @@ -3,9 +3,9 @@ WITH staging_operating_expenses_by_type_and_agency AS ( FROM {{ ref('stg_ntd__operating_expenses_by_type_and_agency') }} ), -fct_ntd_annual_data__operating_expenses_by_type_and_agency AS ( +fct_operating_expenses_by_type_and_agency AS ( SELECT * FROM staging_operating_expenses_by_type_and_agency ) -SELECT * FROM fct_ntd_annual_data__operating_expenses_by_type_and_agency +SELECT * FROM fct_operating_expenses_by_type_and_agency diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__service_by_agency.sql b/warehouse/models/mart/annual_reporting/fct_service_by_agency.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__service_by_agency.sql rename to warehouse/models/mart/annual_reporting/fct_service_by_agency.sql index 2fe4ebc356..49df2a8c74 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__service_by_agency.sql +++ b/warehouse/models/mart/annual_reporting/fct_service_by_agency.sql @@ -3,9 +3,9 @@ WITH staging_service_by_agency AS ( FROM {{ ref('stg_ntd__service_by_agency') }} ), -fct_ntd_annual_data__service_by_agency AS ( +fct_service_by_agency AS ( SELECT * FROM staging_service_by_agency ) -SELECT * FROM fct_ntd_annual_data__service_by_agency +SELECT * FROM fct_service_by_agency diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__service_by_mode.sql b/warehouse/models/mart/annual_reporting/fct_service_by_mode.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__service_by_mode.sql rename to warehouse/models/mart/annual_reporting/fct_service_by_mode.sql index 0f25a647a7..15c7e7879a 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__service_by_mode.sql +++ b/warehouse/models/mart/annual_reporting/fct_service_by_mode.sql @@ -3,9 +3,9 @@ WITH staging_service_by_mode AS ( FROM {{ ref('stg_ntd__service_by_mode') }} ), -fct_ntd_annual_data__service_by_mode AS ( +fct_service_by_mode AS ( SELECT * FROM staging_service_by_mode ) -SELECT * FROM fct_ntd_annual_data__service_by_mode +SELECT * FROM fct_service_by_mode diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__service_by_mode_and_time_period.sql b/warehouse/models/mart/annual_reporting/fct_service_by_mode_and_time_period.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__service_by_mode_and_time_period.sql rename to warehouse/models/mart/annual_reporting/fct_service_by_mode_and_time_period.sql index a65d2562bf..027708510a 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__service_by_mode_and_time_period.sql +++ b/warehouse/models/mart/annual_reporting/fct_service_by_mode_and_time_period.sql @@ -3,9 +3,9 @@ WITH staging_service_by_mode_and_time_period AS ( FROM {{ ref('stg_ntd__service_by_mode_and_time_period') }} ), -fct_ntd_annual_data__service_by_mode_and_time_period AS ( +fct_service_by_mode_and_time_period AS ( SELECT * FROM staging_service_by_mode_and_time_period ) -SELECT * FROM fct_ntd_annual_data__service_by_mode_and_time_period +SELECT * FROM fct_service_by_mode_and_time_period diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__stations_and_facilities_by_agency_and_facility_type.sql b/warehouse/models/mart/annual_reporting/fct_stations_and_facilities_by_agency_and_facility_type.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__stations_and_facilities_by_agency_and_facility_type.sql rename to warehouse/models/mart/annual_reporting/fct_stations_and_facilities_by_agency_and_facility_type.sql index ad7b4e652e..bbceb59206 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__stations_and_facilities_by_agency_and_facility_type.sql +++ b/warehouse/models/mart/annual_reporting/fct_stations_and_facilities_by_agency_and_facility_type.sql @@ -3,9 +3,9 @@ WITH staging_stations_and_facilities_by_agency_and_facility_type AS ( FROM {{ ref('stg_ntd__stations_and_facilities_by_agency_and_facility_type') }} ), -fct_ntd_annual_data__stations_and_facilities_by_agency_and_facility_type AS ( +fct_stations_and_facilities_by_agency_and_facility_type AS ( SELECT * FROM staging_stations_and_facilities_by_agency_and_facility_type ) -SELECT * FROM fct_ntd_annual_data__stations_and_facilities_by_agency_and_facility_type +SELECT * FROM fct_stations_and_facilities_by_agency_and_facility_type diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__stations_by_mode_and_age.sql b/warehouse/models/mart/annual_reporting/fct_stations_by_mode_and_age.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__stations_by_mode_and_age.sql rename to warehouse/models/mart/annual_reporting/fct_stations_by_mode_and_age.sql index 254289a4d8..b376ab5dc5 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__stations_by_mode_and_age.sql +++ b/warehouse/models/mart/annual_reporting/fct_stations_by_mode_and_age.sql @@ -3,9 +3,9 @@ WITH staging_stations_by_mode_and_age AS ( FROM {{ ref('stg_ntd__stations_by_mode_and_age') }} ), -fct_ntd_annual_data__stations_by_mode_and_age AS ( +fct_stations_by_mode_and_age AS ( SELECT * FROM staging_stations_by_mode_and_age ) -SELECT * FROM fct_ntd_annual_data__stations_by_mode_and_age +SELECT * FROM fct_stations_by_mode_and_age diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__track_and_roadway_by_agency.sql b/warehouse/models/mart/annual_reporting/fct_track_and_roadway_by_agency.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__track_and_roadway_by_agency.sql rename to warehouse/models/mart/annual_reporting/fct_track_and_roadway_by_agency.sql index c6823f164c..d9b11b6bff 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__track_and_roadway_by_agency.sql +++ b/warehouse/models/mart/annual_reporting/fct_track_and_roadway_by_agency.sql @@ -3,9 +3,9 @@ WITH staging_track_and_roadway_by_agency AS ( FROM {{ ref('stg_ntd__track_and_roadway_by_agency') }} ), -fct_ntd_annual_data__track_and_roadway_by_agency AS ( +fct_track_and_roadway_by_agency AS ( SELECT * FROM staging_track_and_roadway_by_agency ) -SELECT * FROM fct_ntd_annual_data__track_and_roadway_by_agency +SELECT * FROM fct_track_and_roadway_by_agency diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__track_and_roadway_by_mode.sql b/warehouse/models/mart/annual_reporting/fct_track_and_roadway_by_mode.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__track_and_roadway_by_mode.sql rename to warehouse/models/mart/annual_reporting/fct_track_and_roadway_by_mode.sql index a5b3d5cc40..713a48c73a 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__track_and_roadway_by_mode.sql +++ b/warehouse/models/mart/annual_reporting/fct_track_and_roadway_by_mode.sql @@ -3,9 +3,9 @@ WITH staging_track_and_roadway_by_mode AS ( FROM {{ ref('stg_ntd__track_and_roadway_by_mode') }} ), -fct_ntd_annual_data__track_and_roadway_by_mode AS ( +fct_track_and_roadway_by_mode AS ( SELECT * FROM staging_track_and_roadway_by_mode ) -SELECT * FROM fct_ntd_annual_data__track_and_roadway_by_mode +SELECT * FROM fct_track_and_roadway_by_mode diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__track_and_roadway_guideway_age_distribution.sql b/warehouse/models/mart/annual_reporting/fct_track_and_roadway_guideway_age_distribution.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__track_and_roadway_guideway_age_distribution.sql rename to warehouse/models/mart/annual_reporting/fct_track_and_roadway_guideway_age_distribution.sql index 27a31662a4..074f083aa1 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__track_and_roadway_guideway_age_distribution.sql +++ b/warehouse/models/mart/annual_reporting/fct_track_and_roadway_guideway_age_distribution.sql @@ -3,9 +3,9 @@ WITH staging_track_and_roadway_guideway_age_distribution AS ( FROM {{ ref('stg_ntd__track_and_roadway_guideway_age_distribution') }} ), -fct_ntd_annual_data__track_and_roadway_guideway_age_distribution AS ( +fct_track_and_roadway_guideway_age_distribution AS ( SELECT * FROM staging_track_and_roadway_guideway_age_distribution ) -SELECT * FROM fct_ntd_annual_data__track_and_roadway_guideway_age_distribution +SELECT * FROM fct_track_and_roadway_guideway_age_distribution diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__vehicles_age_distribution.sql b/warehouse/models/mart/annual_reporting/fct_vehicles_age_distribution.sql similarity index 61% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__vehicles_age_distribution.sql rename to warehouse/models/mart/annual_reporting/fct_vehicles_age_distribution.sql index be5080c8e0..630d959c7a 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__vehicles_age_distribution.sql +++ b/warehouse/models/mart/annual_reporting/fct_vehicles_age_distribution.sql @@ -3,9 +3,9 @@ WITH staging_vehicles_age_distribution AS ( FROM {{ ref('stg_ntd__vehicles_age_distribution') }} ), -fct_ntd_annual_data__vehicles_age_distribution AS ( +fct_vehicles_age_distribution AS ( SELECT * FROM staging_vehicles_age_distribution ) -SELECT * FROM fct_ntd_annual_data__vehicles_age_distribution +SELECT * FROM fct_vehicles_age_distribution diff --git a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__vehicles_type_count_by_agency.sql b/warehouse/models/mart/annual_reporting/fct_vehicles_type_count_by_agency.sql similarity index 60% rename from warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__vehicles_type_count_by_agency.sql rename to warehouse/models/mart/annual_reporting/fct_vehicles_type_count_by_agency.sql index 9d735c2463..32928c9c91 100644 --- a/warehouse/models/mart/ntd_fct_annual/fct_ntd_annual_data__vehicles_type_count_by_agency.sql +++ b/warehouse/models/mart/annual_reporting/fct_vehicles_type_count_by_agency.sql @@ -3,9 +3,9 @@ WITH staging_vehicles_type_count_by_agency AS ( FROM {{ ref('stg_ntd__vehicles_type_count_by_agency') }} ), -fct_ntd_annual_data__vehicles_type_count_by_agency AS ( +fct_vehicles_type_count_by_agency AS ( SELECT * FROM staging_vehicles_type_count_by_agency ) -SELECT * FROM fct_ntd_annual_data__vehicles_type_count_by_agency +SELECT * FROM fct_vehicles_type_count_by_agency diff --git a/warehouse/models/mart/ntd_fct_annual/_mart_ntd_fct_annual.yml b/warehouse/models/mart/ntd_fct_annual/_mart_ntd_fct_annual.yml deleted file mode 100644 index 5fb38a0e67..0000000000 --- a/warehouse/models/mart/ntd_fct_annual/_mart_ntd_fct_annual.yml +++ /dev/null @@ -1,39 +0,0 @@ -version: 2 - -models: - - name: fct_ntd_annual_data__breakdowns - - name: fct_ntd_annual_data__breakdowns_by_agency - - name: fct_ntd_annual_data__capital_expenses_by_capital_use - - name: fct_ntd_annual_data__capital_expenses_by_mode - - name: fct_ntd_annual_data__capital_expenses_for_existing_service - - name: fct_ntd_annual_data__capital_expenses_for_expansion_of_service - - name: fct_ntd_annual_data__employees_by_agency - - name: fct_ntd_annual_data__employees_by_mode - - name: fct_ntd_annual_data__employees_by_mode_and_employee_type - - name: fct_ntd_annual_data__fuel_and_energy - - name: fct_ntd_annual_data__fuel_and_energy_by_agency - - name: fct_ntd_annual_data__funding_sources_by_expense_type - - name: fct_ntd_annual_data__funding_sources_directly_generated - - name: fct_ntd_annual_data__funding_sources_federal - - name: fct_ntd_annual_data__funding_sources_local - - name: fct_ntd_annual_data__funding_sources_state - - name: fct_ntd_annual_data__funding_sources_taxes_levied_by_agency - - name: fct_ntd_annual_data__maintenance_facilities - - name: fct_ntd_annual_data__maintenance_facilities_by_agency - - name: fct_ntd_annual_data__metrics - - name: fct_ntd_annual_data__operating_expenses_by_function - - name: fct_ntd_annual_data__operating_expenses_by_function_and_agency - - name: fct_ntd_annual_data__operating_expenses_by_type - - name: fct_ntd_annual_data__operating_expenses_by_type_and_agency - - name: fct_ntd_annual_data__service_by_agency - - name: fct_ntd_annual_data__service_by_mode - - name: fct_ntd_annual_data__service_by_mode_and_time_period - - name: fct_ntd_annual_data__stations_and_facilities_by_agency_and_facility_type - - name: fct_ntd_annual_data__stations_by_mode_and_age - - name: fct_ntd_annual_data__track_and_roadway_by_agency - - name: fct_ntd_annual_data__track_and_roadway_by_mode - - name: fct_ntd_annual_data__track_and_roadway_guideway_age_distribution - - name: fct_ntd_annual_data__vehicles_age_distribution - - name: fct_ntd_annual_data__vehicles_type_count_by_agency - - name: fct_ntd_annual_data__2023_agency_information - - name: fct_ntd_annual_data__2023_contractual_relationships diff --git a/warehouse/models/mart/ridership/_mart_ridership.yml b/warehouse/models/mart/ridership/_mart_ridership.yml new file mode 100644 index 0000000000..aa1884a4f2 --- /dev/null +++ b/warehouse/models/mart/ridership/_mart_ridership.yml @@ -0,0 +1,12 @@ +version: 2 + +models: + - name: fct_complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_upt + - name: fct_complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_vrm + - name: fct_complete_monthly_ridership_with_adjustments_and_estimates__master + - name: fct_complete_monthly_ridership_with_adjustments_and_estimates__upt_estimates + - name: fct_complete_monthly_ridership_with_adjustments_and_estimates__upt + - name: fct_complete_monthly_ridership_with_adjustments_and_estimates__voms + - name: fct_complete_monthly_ridership_with_adjustments_and_estimates__vrh + - name: fct_complete_monthly_ridership_with_adjustments_and_estimates__vrm_estimates + - name: fct_complete_monthly_ridership_with_adjustments_and_estimates__vrm diff --git a/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_upt.sql b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_upt.sql new file mode 100644 index 0000000000..852801400e --- /dev/null +++ b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_upt.sql @@ -0,0 +1,11 @@ +WITH staging_calendar_year_upt AS ( + SELECT * + FROM {{ ref('stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_upt') }} +), + +stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_upt AS ( + SELECT * + FROM staging_calendar_year_upt +) + +SELECT * FROM stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_upt diff --git a/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_vrm.sql b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_vrm.sql new file mode 100644 index 0000000000..1adfc11544 --- /dev/null +++ b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_vrm.sql @@ -0,0 +1,11 @@ +WITH staging_calendar_year_vrm AS ( + SELECT * + FROM {{ ref('stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_vrm') }} +), + +stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_vrm AS ( + SELECT * + FROM staging_calendar_year_vrm +) + +SELECT * FROM stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__calendar_year_vrm diff --git a/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__master.sql b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__master.sql new file mode 100644 index 0000000000..454ba82153 --- /dev/null +++ b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__master.sql @@ -0,0 +1,11 @@ +WITH staging_master AS ( + SELECT * + FROM {{ ref('stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__master') }} +), + +stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__master AS ( + SELECT * + FROM staging_master +) + +SELECT * FROM stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__master diff --git a/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__upt.sql b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__upt.sql new file mode 100644 index 0000000000..f289f7ee6b --- /dev/null +++ b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__upt.sql @@ -0,0 +1,11 @@ +WITH staging_upt AS ( + SELECT * + FROM {{ ref('stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__upt') }} +), + +stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__upt AS ( + SELECT * + FROM staging_upt +) + +SELECT * FROM stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__upt diff --git a/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__upt_estimates.sql b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__upt_estimates.sql new file mode 100644 index 0000000000..d79a553ab1 --- /dev/null +++ b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__upt_estimates.sql @@ -0,0 +1,11 @@ +WITH staging_upt_estimates AS ( + SELECT * + FROM {{ ref('stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__upt_estimates') }} +), + +stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__upt_estimates AS ( + SELECT * + FROM staging_upt_estimates +) + +SELECT * FROM stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__upt_estimates diff --git a/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__voms.sql b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__voms.sql new file mode 100644 index 0000000000..6ed07124d3 --- /dev/null +++ b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__voms.sql @@ -0,0 +1,11 @@ +WITH staging_voms AS ( + SELECT * + FROM {{ ref('stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__voms') }} +), + +stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__voms AS ( + SELECT * + FROM staging_voms +) + +SELECT * FROM stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__voms diff --git a/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__vrh.sql b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__vrh.sql new file mode 100644 index 0000000000..3c01b1cc05 --- /dev/null +++ b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__vrh.sql @@ -0,0 +1,11 @@ +WITH staging_vrh AS ( + SELECT * + FROM {{ ref('stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__vrh') }} +), + +stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__vrh AS ( + SELECT * + FROM staging_vrh +) + +SELECT * FROM stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__vrh diff --git a/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__vrm.sql b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__vrm.sql new file mode 100644 index 0000000000..e0128d5b01 --- /dev/null +++ b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__vrm.sql @@ -0,0 +1,11 @@ +WITH staging_vrm AS ( + SELECT * + FROM {{ ref('stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__vrm') }} +), + +stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__vrm AS ( + SELECT * + FROM staging_vrm +) + +SELECT * FROM stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__vrm diff --git a/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__vrm_estimates.sql b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__vrm_estimates.sql new file mode 100644 index 0000000000..33234e94c2 --- /dev/null +++ b/warehouse/models/mart/ridership/fct_complete_monthly_ridership_with_adjustments_and_estimates__vrm_estimates.sql @@ -0,0 +1,11 @@ +WITH staging_vrm_estimates AS ( + SELECT * + FROM {{ ref('stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__vrm_estimates') }} +), + +stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__vrm_estimates AS ( + SELECT * + FROM staging_vrm_estimates +) + +SELECT * FROM stg_ntd__complete_monthly_ridership_with_adjustments_and_estimates__vrm_estimates diff --git a/warehouse/models/mart/safety_and_security/_mart_safety_and_security.yml b/warehouse/models/mart/safety_and_security/_mart_safety_and_security.yml index 0c700dbe19..39c287987e 100644 --- a/warehouse/models/mart/safety_and_security/_mart_safety_and_security.yml +++ b/warehouse/models/mart/safety_and_security/_mart_safety_and_security.yml @@ -1,7 +1,7 @@ version: 2 models: - - name: fct_safety_and_security__fra_regulated_mode_major_security_events - - name: fct_safety_and_security__major_safety_events - - name: fct_safety_and_security__monthly_modal_time_series_safety_and_service - - name: fct_safety_and_security__nonmajor_safety_and_security_events + - name: fct_fra_regulated_mode_major_security_events + - name: fct_major_safety_events + - name: fct_monthly_modal_time_series_safety_and_service + - name: fct_nonmajor_safety_and_security_events diff --git a/warehouse/models/mart/safety_and_security/fct_safety_and_security__fra_regulated_mode_major_security_events.sql b/warehouse/models/mart/safety_and_security/fct_fra_regulated_mode_major_security_events.sql similarity index 59% rename from warehouse/models/mart/safety_and_security/fct_safety_and_security__fra_regulated_mode_major_security_events.sql rename to warehouse/models/mart/safety_and_security/fct_fra_regulated_mode_major_security_events.sql index fc84f45aba..d57af421cc 100644 --- a/warehouse/models/mart/safety_and_security/fct_safety_and_security__fra_regulated_mode_major_security_events.sql +++ b/warehouse/models/mart/safety_and_security/fct_fra_regulated_mode_major_security_events.sql @@ -3,9 +3,9 @@ WITH staging_fra_regulated_mode_major_security_events AS ( FROM {{ ref('stg_ntd__fra_regulated_mode_major_security_events') }} ), -fct_safety_and_security__fra_regulated_mode_major_security_events AS ( +fct_fra_regulated_mode_major_security_events AS ( SELECT * FROM staging_fra_regulated_mode_major_security_events ) -SELECT * FROM fct_safety_and_security__fra_regulated_mode_major_security_events +SELECT * FROM fct_fra_regulated_mode_major_security_events diff --git a/warehouse/models/mart/safety_and_security/fct_safety_and_security__major_safety_events.sql b/warehouse/models/mart/safety_and_security/fct_major_safety_events.sql similarity index 59% rename from warehouse/models/mart/safety_and_security/fct_safety_and_security__major_safety_events.sql rename to warehouse/models/mart/safety_and_security/fct_major_safety_events.sql index 059e0239e3..1cb061a1ce 100644 --- a/warehouse/models/mart/safety_and_security/fct_safety_and_security__major_safety_events.sql +++ b/warehouse/models/mart/safety_and_security/fct_major_safety_events.sql @@ -3,9 +3,9 @@ WITH staging_major_safety_events AS ( FROM {{ ref('stg_ntd__major_safety_events') }} ), -fct_safety_and_security__major_safety_events AS ( +fct_major_safety_events AS ( SELECT * FROM staging_major_safety_events ) -SELECT * FROM fct_safety_and_security__major_safety_events +SELECT * FROM fct_major_safety_events diff --git a/warehouse/models/mart/safety_and_security/fct_safety_and_security__monthly_modal_time_series_safety_and_service.sql b/warehouse/models/mart/safety_and_security/fct_monthly_modal_time_series_safety_and_service.sql similarity index 59% rename from warehouse/models/mart/safety_and_security/fct_safety_and_security__monthly_modal_time_series_safety_and_service.sql rename to warehouse/models/mart/safety_and_security/fct_monthly_modal_time_series_safety_and_service.sql index 0c58006a75..e7fad5efd5 100644 --- a/warehouse/models/mart/safety_and_security/fct_safety_and_security__monthly_modal_time_series_safety_and_service.sql +++ b/warehouse/models/mart/safety_and_security/fct_monthly_modal_time_series_safety_and_service.sql @@ -3,9 +3,9 @@ WITH staging_monthly_modal_time_series_safety_and_service AS ( FROM {{ ref('stg_ntd__monthly_modal_time_series_safety_and_service') }} ), -fct_safety_and_security__monthly_modal_time_series_safety_and_service AS ( +fct_monthly_modal_time_series_safety_and_service AS ( SELECT * FROM staging_monthly_modal_time_series_safety_and_service ) -SELECT * FROM fct_safety_and_security__monthly_modal_time_series_safety_and_service +SELECT * FROM fct_monthly_modal_time_series_safety_and_service diff --git a/warehouse/models/mart/safety_and_security/fct_safety_and_security__nonmajor_safety_and_security_events.sql b/warehouse/models/mart/safety_and_security/fct_nonmajor_safety_and_security_events.sql similarity index 59% rename from warehouse/models/mart/safety_and_security/fct_safety_and_security__nonmajor_safety_and_security_events.sql rename to warehouse/models/mart/safety_and_security/fct_nonmajor_safety_and_security_events.sql index 7ab1113841..f81b20ad15 100644 --- a/warehouse/models/mart/safety_and_security/fct_safety_and_security__nonmajor_safety_and_security_events.sql +++ b/warehouse/models/mart/safety_and_security/fct_nonmajor_safety_and_security_events.sql @@ -3,9 +3,9 @@ WITH staging_nonmajor_safety_and_security_events AS ( FROM {{ ref('stg_ntd__nonmajor_safety_and_security_events') }} ), -fct_safety_and_security__nonmajor_safety_and_security_events AS ( +fct_nonmajor_safety_and_security_events AS ( SELECT * FROM staging_nonmajor_safety_and_security_events ) -SELECT * FROM fct_safety_and_security__nonmajor_safety_and_security_events +SELECT * FROM fct_nonmajor_safety_and_security_events