@@ -161,16 +161,10 @@ SELECT
161161 , COALESCE(st .id , t .id ) AS id
162162 , COALESCE(st .amount , t .amount ) AS amount
163163 , COALESCE(st .amount , t .amount ) / - 1000 .0 AS amount_major
164- , CASE
165- WHEN
166- COALESCE(st .transfer_account_id , t .transfer_account_id ) IS NULL
167- THEN COALESCE(st .category_id , t .category_id )
168- END AS category_id
169- , CASE
170- WHEN
171- COALESCE(st .transfer_account_id , t .transfer_account_id ) IS NULL
172- THEN COALESCE(st .category_name , t .category_name )
173- END AS category_name
164+ , CASE WHEN st .id IS NULL THEN t .category_id ELSE st .category_id END
165+ AS category_id
166+ , CASE WHEN st .id IS NULL THEN t .category_name ELSE st .category_name END
167+ AS category_name
174168 , COALESCE(NULLIF(st .memo , ' ' ), NULLIF(t .memo , ' ' )) AS memo
175169 , COALESCE(st .payee_id , t .payee_id ) AS payee_id
176170 , COALESCE(st .payee_name , t .payee_name ) AS payee_name
@@ -251,16 +245,10 @@ SELECT
251245 , COALESCE(st .id , t .id ) AS id
252246 , COALESCE(st .amount , t .amount ) AS amount
253247 , COALESCE(st .amount , t .amount ) / - 1000 .0 AS amount_major
254- , CASE
255- WHEN
256- COALESCE(st .transfer_account_id , t .transfer_account_id ) IS NULL
257- THEN COALESCE(st .category_id , t .category_id )
258- END AS category_id
259- , CASE
260- WHEN
261- COALESCE(st .transfer_account_id , t .transfer_account_id ) IS NULL
262- THEN COALESCE(st .category_name , t .category_name )
263- END AS category_name
248+ , CASE WHEN st .id IS NULL THEN t .category_id ELSE st .category_id END
249+ AS category_id
250+ , CASE WHEN st .id IS NULL THEN t .category_name ELSE st .category_name END
251+ AS category_name
264252 , COALESCE(NULLIF(st .memo , ' ' ), NULLIF(t .memo , ' ' )) AS memo
265253 , COALESCE(st .payee_id , t .payee_id ) AS payee_id
266254 , COALESCE(st .transfer_account_id , t .transfer_account_id )
0 commit comments