Apply feedback on /query endpoint

Signed-off-by: Carlos Martín <[email protected]>

Author: carlosms

server/handler/query.go

@@ -113,20 +113,19 @@ func Query(db *sql.DB) RequestProcessFunc {
 						colData[columnNames[i]] = sqlVal.String
 					}
 				case *[]byte:
-					// TODO (carlosms) this may not always be a JSON array, it could
-					// be a JSON object
-
-					// DatabaseTypeName JSON is used for arrays, but we don't know the
-					// type of each element. We try with uast node first and text later
+					// DatabaseTypeName JSON is used for arrays of uast nodes and
+					// arrays of strings, but we don't know the exact type.
+					// We try with arry of uast nodes first and any JSON later
 					nodes, err := unmarshallUAST(val)
 					if err == nil {
 						colData[columnNames[i]] = nodes
 					} else {
-						var strings []string
-						if err := json.Unmarshal(*val.(*[]byte), &strings); err != nil {
+						var data interface{}
+
+						if err := json.Unmarshal(*val.(*[]byte), &data); err != nil {
 							return nil, err
 						}
-						colData[columnNames[i]] = strings
+						colData[columnNames[i]] = data
 					}
 				}
 			}
@@ -185,11 +184,9 @@ func unmarshallUAST(data interface{}) ([]*uast.Node, error) {
 // addLimit adds LIMIT to the query, performing basic tests to skip it
 // for DESCRIBE TABLE, SHOW TABLES, and avoid '; limit'
 func addLimit(query string, limit int) string {
-	upper := strings.ToUpper(query)
-	if strings.Contains(upper, "DESCRIBE") || strings.Contains(upper, "SHOW") {
-		return query
+	query = strings.TrimRight(strings.TrimSpace(query), ";")
+	if strings.HasPrefix(strings.ToUpper(query), "SELECT") {
+		return fmt.Sprintf("%s LIMIT %d", query, limit)
 	}
-
-	trimmed := strings.TrimRight(strings.TrimSpace(query), ";")
-	return fmt.Sprintf("%s LIMIT %d", trimmed, limit)
+	return query
 }