antoniop
committed
on 26 Apr 19
Bring sql inline, reduce duplication