fix
This commit is contained in:
parent
6f41e1c6ef
commit
778297fe77
1 changed files with 2 additions and 5 deletions
|
|
@ -94,12 +94,12 @@ SELECT
|
||||||
COALESCE(COUNT(r.id) FILTER (
|
COALESCE(COUNT(r.id) FILTER (
|
||||||
WHERE r.military_registration_date >= ys.year_date
|
WHERE r.military_registration_date >= ys.year_date
|
||||||
AND r.military_registration_date < ys.year_date + INTERVAL '1 year'
|
AND r.military_registration_date < ys.year_date + INTERVAL '1 year'
|
||||||
AND r.registration_reasons @> '["3"]'::jsonb
|
AND r.registration_reasons @> '["5"]'::jsonb
|
||||||
), 0) AS reaching_17_age,
|
), 0) AS reaching_17_age,
|
||||||
COALESCE(COUNT(r.id) FILTER (
|
COALESCE(COUNT(r.id) FILTER (
|
||||||
WHERE r.military_registration_date >= ys.year_date
|
WHERE r.military_registration_date >= ys.year_date
|
||||||
AND r.military_registration_date < ys.year_date + INTERVAL '1 year'
|
AND r.military_registration_date < ys.year_date + INTERVAL '1 year'
|
||||||
AND r.registration_reasons @> '["5"]'::jsonb
|
AND r.registration_reasons @> '["3"]'::jsonb
|
||||||
), 0) AS women_military_specialty,
|
), 0) AS women_military_specialty,
|
||||||
'Department' as schema
|
'Department' as schema
|
||||||
FROM year_series ys
|
FROM year_series ys
|
||||||
|
|
@ -183,14 +183,11 @@ ORDER BY idm_id, updated_at DESC
|
||||||
<only_when_have_rows>N</only_when_have_rows>
|
<only_when_have_rows>N</only_when_have_rows>
|
||||||
<partitioning_daily>N</partitioning_daily>
|
<partitioning_daily>N</partitioning_daily>
|
||||||
<partitioning_enabled>N</partitioning_enabled>
|
<partitioning_enabled>N</partitioning_enabled>
|
||||||
<partitioning_field/>
|
|
||||||
<partitioning_monthly>Y</partitioning_monthly>
|
<partitioning_monthly>Y</partitioning_monthly>
|
||||||
<return_field/>
|
|
||||||
<return_keys>N</return_keys>
|
<return_keys>N</return_keys>
|
||||||
<schema>forecast</schema>
|
<schema>forecast</schema>
|
||||||
<specify_fields>Y</specify_fields>
|
<specify_fields>Y</specify_fields>
|
||||||
<table>registered_citizens</table>
|
<table>registered_citizens</table>
|
||||||
<tablename_field/>
|
|
||||||
<tablename_in_field>N</tablename_in_field>
|
<tablename_in_field>N</tablename_in_field>
|
||||||
<tablename_in_table>Y</tablename_in_table>
|
<tablename_in_table>Y</tablename_in_table>
|
||||||
<truncate>Y</truncate>
|
<truncate>Y</truncate>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue