Skip to content

Commit

Permalink
Collection of fixes for the staging branch (georgia-tech-db#1253)
Browse files Browse the repository at this point in the history
- [x] Remove empty evadb.db file
- [x] Move `test_github_datasource.py` to long integration tests. Fix
- [x] Fix the failing
`test/integration_tests/long/test_create_table_executor.py::CreateTableTest::test_should_create_table_from_select`.
- [x] Update documentation with links
  • Loading branch information
xzdandy authored and a0x8o committed Nov 22, 2023
1 parent 7cfa37d commit 7f7ee6b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 56 deletions.
8 changes: 8 additions & 0 deletions docs/source/reference/databases/github.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Create Connection
Supported Tables
----------------

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
* ``stargazers``: Lists the people that have starred the repository. Check `table_column_info.py <https://github.com/georgia-tech-db/evadb/blob/staging/evadb/third_party/databases/github/table_column_info.py>`_ for all the available columns in the table.
Expand All @@ -51,6 +52,9 @@ Supported Tables
=======
* ``stargazers``: Lists the people that have starred the repository. Check `evadb/third_party/databases/github/table_column_info.py` for all the available columns in the table.
>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
=======
* ``stargazers``: Lists the people that have starred the repository. Check `table_column_info.py <https://github.com/georgia-tech-db/evadb/blob/staging/evadb/third_party/databases/github/table_column_info.py>`_ for all the available columns in the table.
>>>>>>> 858b8c1c (Collection of fixes for the staging branch (#1253))

.. code-block:: sql
Expand All @@ -70,6 +74,7 @@ Here is the query output:
.. note::

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Looking for another table from Github? You can add a table mapping in `github_handler.py <https://github.com/georgia-tech-db/evadb/blob/staging/evadb/third_party/databases/github/github_handler.py>`_, or simply raise a `Feature Request <https://github.com/georgia-tech-db/evadb/issues/new/choose>`_.
Expand All @@ -79,3 +84,6 @@ Here is the query output:
=======
Looking for another table from Github? You can add a table mapping in `evadb/third_party/databases/github/github_handler.py`, or simply raise a `Feature Request <https://github.com/georgia-tech-db/evadb/issues/new/choose>`_.
>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
=======
Looking for another table from Github? You can add a table mapping in `github_handler.py <https://github.com/georgia-tech-db/evadb/blob/staging/evadb/third_party/databases/github/github_handler.py>`_, or simply raise a `Feature Request <https://github.com/georgia-tech-db/evadb/issues/new/choose>`_.
>>>>>>> 858b8c1c (Collection of fixes for the staging branch (#1253))
Empty file removed evadb.db
Empty file.
3 changes: 3 additions & 0 deletions test/integration_tests/long/test_github_datasource.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@ def setUp(self):
def tearDown(self):
execute_query_fetch_all(self.evadb, "DROP DATABASE IF EXISTS github_data;")

<<<<<<< HEAD
@pytest.mark.skip(
reason="Need https://github.com/georgia-tech-db/evadb/pull/1280 for a cost-based rebatch optimization"
)
=======
>>>>>>> 858b8c1c (Collection of fixes for the staging branch (#1253))
@pytest.mark.xfail(reason="Flaky testcase due to `bad request` error message")
def test_should_run_select_query_in_github(self):
# Create database.
Expand Down
56 changes: 0 additions & 56 deletions test/third_party_tests/test_github_datasource.py

This file was deleted.

0 comments on commit 7f7ee6b

Please sign in to comment.