More SQL test fixes

Author: markharwood

x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/FieldExtractorTestCase.java

@@ -128,7 +128,7 @@ public void testConstantKeywordField() throws IOException {
         Map<String, Object> expected = new HashMap<>();
         expected.put(
             "columns",
-            Arrays.asList(columnInfo("plain", "constant_keyword_field", "constant_keyword", JDBCType.VARCHAR, Integer.MAX_VALUE))
+            Arrays.asList(columnInfo("plain", "constant_keyword_field", "keyword", JDBCType.VARCHAR, Integer.MAX_VALUE))
         );
         expected.put("rows", singletonList(singletonList(value)));
         assertResponse(expected, runSql("SELECT constant_keyword_field FROM test"));

x-pack/plugin/sql/qa/server/src/main/resources/command.csv-spec

@@ -281,7 +281,7 @@ emp_no              |INTEGER        |integer
 extra               |STRUCT         |object
 extra.info          |STRUCT         |object
 extra.info.gender   |VARCHAR        |keyword
-extra_gender        |VARCHAR        |constant_keyword
+extra_gender        |VARCHAR        |keyword
 extra_no            |INTEGER        |integer
 first_name          |VARCHAR        |text
 first_name.keyword  |VARCHAR        |keyword
@@ -290,7 +290,7 @@ hire_date           |TIMESTAMP      |datetime
 languages           |TINYINT        |byte
 last_name           |VARCHAR        |text
 last_name.keyword   |VARCHAR        |keyword
-null_constant       |VARCHAR        |constant_keyword
+null_constant       |VARCHAR        |keyword
 salary              |INTEGER        |integer
 ;
 
@@ -310,7 +310,7 @@ emp_no              |INTEGER        |integer
 extra               |STRUCT         |object
 extra.info          |STRUCT         |object
 extra.info.gender   |VARCHAR        |keyword
-extra_gender        |VARCHAR        |constant_keyword
+extra_gender        |VARCHAR        |keyword
 extra_no            |INTEGER        |integer
 first_name          |VARCHAR        |text
 first_name.keyword  |VARCHAR        |keyword
@@ -319,7 +319,7 @@ hire_date           |TIMESTAMP      |datetime
 languages           |TINYINT        |byte
 last_name           |VARCHAR        |text
 last_name.keyword   |VARCHAR        |keyword
-null_constant       |VARCHAR        |constant_keyword
+null_constant       |VARCHAR        |keyword
 salary              |INTEGER        |integer
 ;