Skip to content

fix #302 #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IlkaCu merged 1 commit into from
Jul 27, 2018
Merged

fix #302 #313

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS
WHERE scenario = 'Status Quo'
AND (shutdown IS NULL or shutdown >= 2015)
AND capacity > 0
AND preversion = 'v0.3.0'
AND version = 'v0.4.4';
--AND preversion = 'v0.3.0'
--AND version = 'v0.4.4';

ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview
OWNER TO oeuser;
Expand All @@ -33,8 +33,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS
AND capacity > 0
AND fuel not in ('hydro', 'run_of_river', 'reservoir')
AND (shutdown IS NULL or shutdown >= 2034)
AND preversion = 'v0.3.0'
AND version = 'v0.4.4';
--AND preversion = 'v0.3.0'
--AND version = 'v0.4.4';

ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview
OWNER TO oeuser;
Expand Down Expand Up @@ -90,8 +90,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS
AND fuel = 'pumped_storage'
AND capacity > 0
AND (shutdown IS NULL or shutdown >= 2049)
AND preversion = 'v0.3.0'
AND version = 'v0.4.4';
--AND preversion = 'v0.3.0'
--AND version = 'v0.4.4';

ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview
OWNER TO oeuser;
Expand All @@ -110,8 +110,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS
FROM supply.ego_dp_res_powerplant
WHERE scenario = 'Status Quo'
AND electrical_capacity > 0
AND preversion = 'v0.3.0'
AND version = 'v0.4.4';
--AND preversion = 'v0.3.0'
--AND version = 'v0.4.4';

ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview
OWNER TO oeuser;
Expand All @@ -129,13 +129,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS
WHERE id not in (
SELECT id
FROM supply.ego_dp_res_powerplant
WHERE version = 'v0.4.4'
--WHERE version = 'v0.4.4'
Group BY id
HAVING count(*) > 1
Order by id)
AND scenario = 'Status Quo'
And preversion = 'v0.3.0'
AND version = 'v0.4.4'
--And preversion = 'v0.3.0'
--AND version = 'v0.4.4'
AND electrical_capacity > 0
ORDER BY id
) as sub
Expand All @@ -151,12 +151,12 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS
SELECT id
FROM supply.ego_dp_res_powerplant
WHERE scenario in ('NEP 2035')
AND version = 'v0.4.4'
--AND version = 'v0.4.4'
Group BY id
Order by id)
AND scenario in ('NEP 2035')
And preversion = 'v0.3.0'
AND version = 'v0.4.4'
-- And preversion = 'v0.3.0'
-- AND version = 'v0.4.4'
AND electrical_capacity > 0
ORDER BY id
) sub2
Expand All @@ -178,13 +178,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS
WHERE id not in (
SELECT id
FROM supply.ego_dp_res_powerplant
WHERE version = 'v0.4.4'
-- WHERE version = 'v0.4.4'
Group BY id
HAVING count(*) > 1
Order by id)
AND scenario = 'Status Quo'
AND preversion = 'v0.3.0'
AND version = 'v0.4.4'
-- AND preversion = 'v0.3.0'
-- AND version = 'v0.4.4'
AND electrical_capacity > 0
AND generation_type in ('solar','wind')
AND generation_subtype not in ('wind_offshore')
Expand All @@ -203,13 +203,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS
FROM supply.ego_dp_res_powerplant
WHERE scenario in ('eGo 100')
AND generation_type not in ('gas')
AND version = 'v0.4.4'
--AND version = 'v0.4.4'
AND flag in ('commissioning', 'repowering')
Group BY id
Order by id)
AND scenario in ('eGo 100')
And preversion = 'v0.3.0'
AND version = 'v0.4.4'
--And preversion = 'v0.3.0'
--AND version = 'v0.4.4'
AND electrical_capacity > 0
ORDER BY id
) sub2
Expand All @@ -225,15 +225,15 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS
SELECT id
FROM supply.ego_dp_res_powerplant
WHERE scenario in ('NEP 2035')
AND version = 'v0.4.4'
--AND version = 'v0.4.4'
AND generation_type not in ('biomass','gas','reservoir','run_of_river')
AND flag in ('commissioning', 'repowering')
AND generation_subtype not in ('wind_offshore')
Group BY id
Order by id)
AND scenario in ('NEP 2035')
And preversion = 'v0.3.0'
AND version = 'v0.4.4'
--And preversion = 'v0.3.0'
--AND version = 'v0.4.4'
AND electrical_capacity > 0
ORDER BY id
) sub3
Expand Down