Sql1

to shrink down my count PR, here are 2 simple sql patch