[sql] Simplify entity declaration
[sql] Continuying function highlight