add import support
add sql import support, add oauth config support
fix merge conflic
fix merge conflic