Upgrade Spark SQL integration code to compile with 1.2.0