[SQL] Applied latest SQLs to main repo