fix: remove show tables column retrieval index based (#81)

* fix: remove show tables column retrieval index based

* add ES 7.15 to tests and python 3.9

Author: dpgaspar

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8, 3.9]
     services:
       elasticsearch:
         image: elasticsearch:7.3.2
@@ -64,6 +64,12 @@ jobs:
           discovery.type: single-node
         ports:
           - 39200:9200
+      elasticsearch_7_16:
+        image: elasticsearch:7.16.1
+        env:
+          discovery.type: single-node
+        ports:
+          - 49200:9200
 
     steps:
       - uses: actions/checkout@v2
@@ -90,6 +96,11 @@ jobs:
           export ES_URI="http://localhost:39200"
           export ES_PORT=39200
           nosetests -v --with-coverage --cover-package=es es.tests
+      - name: Run tests on Elasticsearch 7.16.X
+        run: |
+          export ES_URI="http://localhost:49200"
+          export ES_PORT=49200
+          nosetests -v --with-coverage --cover-package=es es.tests
       - name: Run tests on Opendistro
         run: |
           export ES_DRIVER=odelasticsearch

es/elastic/api.py

@@ -89,6 +89,17 @@ def __init__(self, url: str, es: Elasticsearch, **kwargs: Any) -> None:
         super().__init__(url, es, **kwargs)
         self.sql_path = kwargs.get("sql_path") or "_sql"
 
+    def _get_value_for_col_name(self, row: Tuple[Any], name: str) -> Any:
+        """
+        Get the value of a specific column name from a row
+        :param row: The result row
+        :param name: The column name
+        :return: Value
+        """
+        for idx, col_description in enumerate(self.description):
+            if col_description.name == name:
+                return row[idx]
+
     def get_valid_table_view_names(self, type_filter: str) -> "Cursor":
         """
         Custom for "SHOW VALID_TABLES" excludes empty indices from the response
@@ -108,11 +119,14 @@ def get_valid_table_view_names(self, type_filter: str) -> "Cursor":
             is_empty = False
             for item in response:
                 # First column is TABLE_NAME
-                if item["index"] == result[0]:
+                if item["index"] == self._get_value_for_col_name(result, "name"):
                     if int(item["docs.count"]) == 0:
                         is_empty = True
                         break
-            if not is_empty and result[1] == type_filter:
+            if (
+                not is_empty
+                and self._get_value_for_col_name(result, "type") == type_filter
+            ):
                 _results.append(result)
         self._results = _results
         return self

es/exceptions.py

@@ -39,10 +39,10 @@ class NotSupportedError(DatabaseError):
 
 
 class UnexpectedESInitError(Error):
-    """ Should never happen, when a cursor is requested
+    """Should never happen, when a cursor is requested
     without an ElasticSearch object being initialized"""
 
 
 class UnexpectedRequestResponse(Error):
-    """ When perform request returns False, only when HTTP method HEAD
-    and status code 404 """
+    """When perform request returns False, only when HTTP method HEAD
+    and status code 404"""