diff options
| -rw-r--r-- | sql/dawn.sql | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/sql/dawn.sql b/sql/dawn.sql index fe77a187..46a6ff11 100644 --- a/sql/dawn.sql +++ b/sql/dawn.sql @@ -2594,11 +2594,22 @@ AS SELECT trades.settle_date, SELECT spots.id, spots.settle_date, spots.fund, - spots.account_code AS cp_code, + spots.cp_code, 'spot'::text AS asset_class, unnest(ARRAY[spots.buy_currency, spots.sell_currency]) AS currency, unnest(ARRAY[spots.buy_amount, - spots.sell_amount]) AS amount - FROM spots) trades + FROM spots + UNION + SELECT fx_swaps.id, + unnest(ARRAY[near_settle_date, near_settle_date, far_settle_date, far_settle_date]) AS settle_date, + + fx_swaps.fund, + fx_swaps.cp_code, + 'spot'::text AS asset_class, + unnest(ARRAY[near_buy_currency, near_sell_currency, far_buy_currency, far_sell_currency]) AS currency, + unnest(ARRAY[near_buy_amount, -near_sell_amount, far_buy_amount, - far_sell_amount]) AS amount + FROM fx_swaps + ) trades LEFT JOIN ( SELECT DISTINCT ON (cp_code.cp_code) cp_code.cp_code, cp_code.name FROM ( SELECT c.code AS cp_code, @@ -2613,7 +2624,7 @@ AS SELECT trades.settle_date, - CREATE TABLE public.equities ( +CREATE TABLE public.equities ( id serial4 NOT NULL, dealid varchar(28) NULL GENERATED ALWAYS AS ((('EQ'::text || id::text))) STORED, lastupdate timestamp NULL DEFAULT now(), |