Keyword sanitize on aggs & base migration

Author: pdphilip

src/DSL/Bridge.php

@@ -842,9 +842,15 @@ private function processBuckets($columns, $keys, $response, $index, $includeDocC
         if (!empty($response[$keys[$index]]['buckets'])) {
             foreach ($response[$keys[$index]]['buckets'] as $res) {
                 $datum = $currentData;
-                $datum[$columns[$index]] = $res['key'];
+                //clear keyword from column name
+                $col = $columns[$index];
+                if (str_contains($col, '.keyword')) {
+                    $col = str_replace('.keyword', '', $col);
+                }
+                
+                $datum[$col] = $res['key'];
                 if ($includeDocCount) {
-                    $datum[$columns[$index].'_count'] = $res['doc_count'];
+                    $datum[$col.'_count'] = $res['doc_count'];
                 }
 
                 if (isset($columns[$index + 1])) {

src/Schema/IndexBlueprint.php

@@ -173,12 +173,12 @@ public function buildIndexModify(Connection $connection)
 
     public function increments($column)
     {
-        return $this->addField('text', $column);
+        return $this->addField('keyword', $column);
     }
 
     public function string($column)
     {
-        return $this->addField('text', $column);
+        return $this->addField('keyword', $column);
     }