diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad955519c8854b89ff72682e6fc4f985ca99f6a9..eebb86140ac7699d4307b3c06b5ba419b3d9c154 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ linter: before_script: - apt-get update -y - apt-get install python3-pip -y -qq - - pip install sqlfluff==0.7.1 + - pip install sqlfluff==0.13.0 script: - sqlfluff lint --dialect postgres diff --git a/migrations/00003_create-table-data-unit-tiles.sql b/migrations/00003_create-table-data-unit-tiles.sql index 59f378475c8eb8e79d8c3fe6d15ad970a6f25581..98dbc40d6e6bf7da0bad618d5fdcbc33afeb3a4a 100644 --- a/migrations/00003_create-table-data-unit-tiles.sql +++ b/migrations/00003_create-table-data-unit-tiles.sql @@ -4,7 +4,7 @@ CREATE TABLE public.data_unit_tiles ( quadkey CHAR(18), aggregated_source_id SMALLINT, - occupancy_case occupancycase, + occupancy_case OCCUPANCYCASE, exposure_entity CHAR(3), data_unit_id VARCHAR, size_data_unit_tile_area FLOAT, diff --git a/migrations/00004_create-table-data-units.sql b/migrations/00004_create-table-data-units.sql index 8089b144a75cb5eb9512b51165f0f87991ff8347..e2924319769b1a6d6b6a7a2c7e56a0b039b31411 100644 --- a/migrations/00004_create-table-data-units.sql +++ b/migrations/00004_create-table-data-units.sql @@ -1,7 +1,7 @@ CREATE TABLE public.data_units ( data_unit_id VARCHAR, - occupancy_case occupancycase, + occupancy_case OCCUPANCYCASE, aggregated_source_id SMALLINT, exposure_entity CHAR(3), buildings_total FLOAT, diff --git a/migrations/00005_create-table-exposure-entities-costs-assumptions.sql b/migrations/00005_create-table-exposure-entities-costs-assumptions.sql index 61a6e3836bb03bc2631940172fcc06ee023d4e3a..3bbf0246faaa4f209aa73889340f70e88e4db35e 100644 --- a/migrations/00005_create-table-exposure-entities-costs-assumptions.sql +++ b/migrations/00005_create-table-exposure-entities-costs-assumptions.sql @@ -2,7 +2,7 @@ CREATE TABLE public.exposure_entities_costs_assumptions ( aggregated_source_id SMALLINT, exposure_entity CHAR(3), - occupancy_case occupancycase, + occupancy_case OCCUPANCYCASE, structural FLOAT, non_structural FLOAT, contents FLOAT, diff --git a/migrations/00006_create-table-exposure-entities-population-time-distribution.sql b/migrations/00006_create-table-exposure-entities-population-time-distribution.sql index 363f996775c8af1327425bca92bdbe316cf3fa8f..54f42bcf8fca57598d684af0d18036e22955ed31 100644 --- a/migrations/00006_create-table-exposure-entities-population-time-distribution.sql +++ b/migrations/00006_create-table-exposure-entities-population-time-distribution.sql @@ -2,7 +2,7 @@ CREATE TABLE public.exposure_entities_population_time_distribution ( aggregated_source_id SMALLINT, exposure_entity CHAR(3), - occupancy_case occupancycase, + occupancy_case OCCUPANCYCASE, day FLOAT, night FLOAT, transit FLOAT, diff --git a/migrations/00007_create-table-data-units-buildings.sql b/migrations/00007_create-table-data-units-buildings.sql index ee6bcba2bd1ead6dfbeed9826fe7bf49ca7e7960..f0f23e17b5169e589d604d71bdd3be3a3a19b24a 100644 --- a/migrations/00007_create-table-data-units-buildings.sql +++ b/migrations/00007_create-table-data-units-buildings.sql @@ -3,11 +3,11 @@ CREATE TYPE settlement AS ENUM ('urban', 'rural', 'big_city', 'all'); CREATE TABLE public.data_units_buildings ( building_class_name VARCHAR, - settlement_type settlement, + settlement_type SETTLEMENT, occupancy_subtype VARCHAR, aggregated_source_id SMALLINT, exposure_entity CHAR(3), - occupancy_case occupancycase, + occupancy_case OCCUPANCYCASE, data_unit_id VARCHAR, proportions FLOAT, census_people_per_building FLOAT, diff --git a/migrations/00012_create-table-gde-buildings.sql b/migrations/00012_create-table-gde-buildings.sql index c408e3377a3a5ba0d94fa537e866512689419187..00024fa8e6cabdf5966e0d980574836777647c2e 100644 --- a/migrations/00012_create-table-gde-buildings.sql +++ b/migrations/00012_create-table-gde-buildings.sql @@ -1,13 +1,13 @@ CREATE TABLE public.gde_buildings ( osm_id integer, - aggregated_source_id SMALLINT, + aggregated_source_id smallint, occupancy_case occupancycase, - data_unit_id VARCHAR, - building_class_names VARCHAR[], + data_unit_id varchar, + building_class_names varchar[], settlement_types settlement[], - occupancy_subtypes VARCHAR[], - probabilities FLOAT[], + occupancy_subtypes varchar[], + probabilities float[], PRIMARY KEY (osm_id, aggregated_source_id) );