antoniop
committed
on 26 Apr
Bring sql inline, reduce duplication