Skip to content

Commit 003ed25

Browse files
author
IlkaCu
authored
Merge pull request #313 from openego/fix-#302
 fix #302
2 parents cfc4e46 + a366b96 commit 003ed25

1 file changed

Lines changed: 23 additions & 23 deletions

File tree

‎dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS
1818
WHERE scenario = 'Status Quo'
1919
AND (shutdown IS NULL or shutdown >= 2015)
2020
AND capacity > 0
21-
AND preversion = 'v0.3.0'
22-
AND version = 'v0.4.4';
21+
--AND preversion = 'v0.3.0'
22+
--AND version = 'v0.4.4';
2323

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

3939
ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview
4040
OWNER TO oeuser;
@@ -90,8 +90,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS
9090
AND fuel = 'pumped_storage'
9191
AND capacity > 0
9292
AND (shutdown IS NULL or shutdown >= 2049)
93-
AND preversion = 'v0.3.0'
94-
AND version = 'v0.4.4';
93+
--AND preversion = 'v0.3.0'
94+
--AND version = 'v0.4.4';
9595

9696
ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview
9797
OWNER TO oeuser;
@@ -110,8 +110,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS
110110
FROM supply.ego_dp_res_powerplant
111111
WHERE scenario = 'Status Quo'
112112
AND electrical_capacity > 0
113-
AND preversion = 'v0.3.0'
114-
AND version = 'v0.4.4';
113+
--AND preversion = 'v0.3.0'
114+
--AND version = 'v0.4.4';
115115

116116
ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview
117117
OWNER TO oeuser;
@@ -129,13 +129,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS
129129
WHERE id not in (
130130
SELECT id
131131
FROM supply.ego_dp_res_powerplant
132-
WHERE version = 'v0.4.4'
132+
--WHERE version = 'v0.4.4'
133133
Group BY id
134134
HAVING count(*) > 1
135135
Order by id)
136136
AND scenario = 'Status Quo'
137-
And preversion = 'v0.3.0'
138-
AND version = 'v0.4.4'
137+
--And preversion = 'v0.3.0'
138+
--AND version = 'v0.4.4'
139139
AND electrical_capacity > 0
140140
ORDER BY id
141141
) as sub
@@ -151,12 +151,12 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS
151151
SELECT id
152152
FROM supply.ego_dp_res_powerplant
153153
WHERE scenario in ('NEP 2035')
154-
AND version = 'v0.4.4'
154+
--AND version = 'v0.4.4'
155155
Group BY id
156156
Order by id)
157157
AND scenario in ('NEP 2035')
158-
And preversion = 'v0.3.0'
159-
AND version = 'v0.4.4'
158+
-- And preversion = 'v0.3.0'
159+
-- AND version = 'v0.4.4'
160160
AND electrical_capacity > 0
161161
ORDER BY id
162162
) sub2
@@ -178,13 +178,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS
178178
WHERE id not in (
179179
SELECT id
180180
FROM supply.ego_dp_res_powerplant
181-
WHERE version = 'v0.4.4'
181+
-- WHERE version = 'v0.4.4'
182182
Group BY id
183183
HAVING count(*) > 1
184184
Order by id)
185185
AND scenario = 'Status Quo'
186-
AND preversion = 'v0.3.0'
187-
AND version = 'v0.4.4'
186+
-- AND preversion = 'v0.3.0'
187+
-- AND version = 'v0.4.4'
188188
AND electrical_capacity > 0
189189
AND generation_type in ('solar','wind')
190190
AND generation_subtype not in ('wind_offshore')
@@ -203,13 +203,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS
203203
FROM supply.ego_dp_res_powerplant
204204
WHERE scenario in ('eGo 100')
205205
AND generation_type not in ('gas')
206-
AND version = 'v0.4.4'
206+
--AND version = 'v0.4.4'
207207
AND flag in ('commissioning', 'repowering')
208208
Group BY id
209209
Order by id)
210210
AND scenario in ('eGo 100')
211-
And preversion = 'v0.3.0'
212-
AND version = 'v0.4.4'
211+
--And preversion = 'v0.3.0'
212+
--AND version = 'v0.4.4'
213213
AND electrical_capacity > 0
214214
ORDER BY id
215215
) sub2
@@ -225,15 +225,15 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS
225225
SELECT id
226226
FROM supply.ego_dp_res_powerplant
227227
WHERE scenario in ('NEP 2035')
228-
AND version = 'v0.4.4'
228+
--AND version = 'v0.4.4'
229229
AND generation_type not in ('biomass','gas','reservoir','run_of_river')
230230
AND flag in ('commissioning', 'repowering')
231231
AND generation_subtype not in ('wind_offshore')
232232
Group BY id
233233
Order by id)
234234
AND scenario in ('NEP 2035')
235-
And preversion = 'v0.3.0'
236-
AND version = 'v0.4.4'
235+
--And preversion = 'v0.3.0'
236+
--AND version = 'v0.4.4'
237237
AND electrical_capacity > 0
238238
ORDER BY id
239239
) sub3

0 commit comments

Comments
 (0)