Merge branch 'new-ci-cd' into 'dev'

fix create procedures

See merge request spatial/postamates!140
dev
Timofey Malinin 3 years ago
commit 92b8928d95

@ -1,8 +1,8 @@
from django.core.management.base import BaseCommand from django.core.management.base import BaseCommand
from service.utils import run_sql_command, log_to_telegram from service.utils import run_sql_command, log_to_telegram
CMD_PIVOT_DIST = """DROP VIEW IF EXISTS compact_placementpoint; CMD_PIVOT_DIST = """DROP VIEW IF EXISTS points_with_dist;
CREATE OR REPLACE VIEW compact_placementpoint AS CREATE OR REPLACE VIEW points_with_dist AS
SELECT status, category, age_day, fact, area_id, district_id, address, name, prediction_first, prediction_current, doors, flat_cnt, rival_post_cnt, rival_pvz_cnt, target_post_cnt, flats_cnt, tc_cnt, culture_cnt, mfc_cnt, public_stop_cnt, supermarket_cnt, target_dist, metro_dist, geometry FROM service_placementpoint; SELECT status, category, age_day, fact, area_id, district_id, address, name, prediction_first, prediction_current, doors, flat_cnt, rival_post_cnt, rival_pvz_cnt, target_post_cnt, flats_cnt, tc_cnt, culture_cnt, mfc_cnt, public_stop_cnt, supermarket_cnt, target_dist, metro_dist, geometry FROM service_placementpoint;
CREATE OR REPLACE PROCEDURE pivot_dist() CREATE OR REPLACE PROCEDURE pivot_dist()
--RETURNS SET OF record --RETURNS SET OF record
@ -21,7 +21,7 @@ FROM CROSSTAB(
ORDER BY 1, 2 ORDER BY 1, 2
$$ $$
) AS ct(%s) ) AS ct(%s)
LEFT JOIN compact_placementpoint ON placement_point_id=id' LEFT JOIN service_placementpoint ON placement_point_id=id'
,columnNames); ,columnNames);
END; END;
$BODY$ $BODY$

Loading…
Cancel
Save