fix bug

Author: Jacky Li

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala

@@ -45,11 +45,13 @@ class Analyzer(catalog: Catalog,
                maxIterations: Int = 100)
   extends RuleExecutor[LogicalPlan] with HiveTypeCoercion {
 
-  val resolver = if (conf.getConf(CatalystConf.CASE_SENSITIVE, "true").toBoolean) {
-                  caseSensitiveResolution
-                } else {
-                  caseInsensitiveResolution
-                }
+  def resolver: Resolver = {
+    if (conf.getConf(CatalystConf.CASE_SENSITIVE, "true").toBoolean) {
+      caseSensitiveResolution
+    } else {
+      caseInsensitiveResolution
+    }
+  }
 
   val fixedPoint = FixedPoint(maxIterations)
 

sql/core/src/main/scala/org/apache/spark/sql/test/TestCaseInsensitiveSQLContext.scala

@@ -19,10 +19,10 @@ package org.apache.spark.sql
 
 import java.util.TimeZone
 
-import org.scalatest.BeforeAndAfterAll
-
 import org.apache.spark.sql.catalyst.errors.TreeNodeException
 import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
+import org.apache.spark.sql.catalyst.CatalystConf
+import org.scalatest.BeforeAndAfterAll
 
 /* Implicits */
 import org.apache.spark.sql.TestData._
@@ -1012,4 +1012,13 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll {
     rdd.registerTempTable("distinctData")
     checkAnswer(sql("SELECT COUNT(DISTINCT key,value) FROM distinctData"), 2)
   }
+
+  test("SPARK-4699 case sensitivity SQL query") {
+    setConf(CatalystConf.CASE_SENSITIVE, "false")
+    val data = TestData(1,"val_1") :: TestData(2,"val_2") :: Nil
+    val rdd = sparkContext.parallelize((0 to 1).map(i => data(i)))
+    rdd.registerTempTable("testTable1")
+    checkAnswer(sql("SELECT VALUE FROM TESTTABLE1 where KEY = 1"), "val_1")
+    setConf(CatalystConf.CASE_SENSITIVE, "true")
+  }
 }