diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/dawn.sql | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/dawn.sql b/sql/dawn.sql index 86a3d64e..16cdf4bf 100644 --- a/sql/dawn.sql +++ b/sql/dawn.sql @@ -764,7 +764,8 @@ query:= 'WITH left_table AS ( WITH temp AS (SELECT * from %I where date(timestamp)=$1) SELECT a.cusip, a.pv as v1, b.pv as v2, c.pv AS v3, a.modDur, c.delta_yield, - c.wal, c.pv_io, c.pv_po, c.pv_RnW, c.delta_ir_io, c.delta_ir_po, c.delta_hpi + c.wal, c.pv_io, c.pv_po, c.pv_RnW, c.delta_ir_io, c.delta_ir_po, + c.delta_hpi, c.delta_RnW FROM (SELECT * FROM temp WHERE model_version=1) a, (SELECT * FROM temp WHERE model_version=2) b, (SELECT * FROM temp WHERE model_version=3) c @@ -787,9 +788,10 @@ query:= SELECT left_table.v1, left_table.v2, left_table.v3, left_table.moddur, right_table.pv5, right_table.pv25, right_table.pv50, right_table.pv75, right_table.pv95, left_table.delta_yield, left_table.wal, left_table.pv_io, left_table.pv_po, left_table.pv_RnW, - left_table.delta_ir_io, left_table.delta_ir_po, left_table.delta_hpi -FROM left_table, right_table, (SELECT unnest($2) AS cusip) l -WHERE left_table.cusip=right_table.cusip AND left_table.cusip=l.cusip'; + left_table.delta_ir_io, left_table.delta_ir_po, left_table.delta_hpi, left_table.delta_RnW +FROM (SELECT unnest($2) AS cusip) l +LEFT JOIN left_table ON left_table.cusip=l.cusip +LEFT JOIN right_table ON left_table.cusip=right_table.cusip'; IF orig_flag THEN query := format(query, 'priced_orig_ntl', 'priced_percentiles_orig_ntl'); ELSE |