stop skipping some Cockroach tests (#1349)

Author: sinisaos

scripts/test-cockroach.sh

@@ -9,6 +9,6 @@ python -m pytest \
     --cov=piccolo \
     --cov-report=xml \
     --cov-report=html \
-    --cov-fail-under=80 \
-    -m "not integration and not cockroach_array_slow" \
+    --cov-fail-under=85 \
+    -m "not integration" \
     -s $@

tests/apps/schema/commands/test_generate.py

@@ -151,7 +151,6 @@ def test_exclude_table(self) -> None:
         assert SmallTable_ is not None
         self._compare_table_columns(SmallTable, SmallTable_)
 
-    @engines_skip("cockroach")
     def test_self_referencing_fk(self) -> None:
         """
         Make sure self-referencing foreign keys are handled correctly.

tests/columns/m2m/base.py

@@ -11,7 +11,6 @@
 from piccolo.engine.finder import engine_finder
 from piccolo.schema import SchemaManager
 from piccolo.table import Table, create_db_tables_sync, drop_db_tables_sync
-from tests.base import engines_skip
 
 engine = engine_finder()
 
@@ -85,11 +84,8 @@ def assertEqual(self, first, second, msg=None):
     def assertTrue(self, first, msg=None):
         assert first is True
 
-    @engines_skip("cockroach")
     def test_select_name(self):
-        """
-        🐛 Cockroach bug: https://github.com/cockroachdb/cockroach/issues/71908 "could not decorrelate subquery" error under asyncpg
-        """  # noqa: E501
+
         response = Band.select(
             Band.name, Band.genres(Genre.name, as_list=True)
         ).run_sync()
@@ -115,14 +111,10 @@ def test_select_name(self):
             ],
         )
 
-    @engines_skip("cockroach")
     def test_no_related(self):
         """
         Make sure it still works correctly if there are no related values.
         """
-        """
-        🐛 Cockroach bug: https://github.com/cockroachdb/cockroach/issues/71908 "could not decorrelate subquery" error under asyncpg
-        """  # noqa: E501
 
         GenreToBand.delete(force=True).run_sync()
 
@@ -153,32 +145,33 @@ def test_no_related(self):
             ],
         )
 
-    @engines_skip("cockroach")
     def test_select_multiple(self):
-        """
-        🐛 Cockroach bug: https://github.com/cockroachdb/cockroach/issues/71908 "could not decorrelate subquery" error under asyncpg
-        """  # noqa: E501
 
         response = Band.select(
             Band.name, Band.genres(Genre.id, Genre.name)
         ).run_sync()
 
+        genres = Genre.select().run_sync()
+
         self.assertEqual(
             response,
             [
                 {
                     "name": "Pythonistas",
                     "genres": [
-                        {"id": 1, "name": "Rock"},
-                        {"id": 2, "name": "Folk"},
+                        {"id": genres[0]["id"], "name": "Rock"},
+                        {"id": genres[1]["id"], "name": "Folk"},
                     ],
                 },
-                {"name": "Rustaceans", "genres": [{"id": 2, "name": "Folk"}]},
+                {
+                    "name": "Rustaceans",
+                    "genres": [{"id": genres[1]["id"], "name": "Folk"}],
+                },
                 {
                     "name": "C-Sharps",
                     "genres": [
-                        {"id": 1, "name": "Rock"},
-                        {"id": 3, "name": "Classical"},
+                        {"id": genres[0]["id"], "name": "Rock"},
+                        {"id": genres[2]["id"], "name": "Classical"},
                     ],
                 },
             ],
@@ -189,72 +182,76 @@ def test_select_multiple(self):
             Genre.name, Genre.bands(Band.id, Band.name)
         ).run_sync()
 
+        bands = Band.select().run_sync()
+
         self.assertEqual(
             response,
             [
                 {
                     "name": "Rock",
                     "bands": [
-                        {"id": 1, "name": "Pythonistas"},
-                        {"id": 3, "name": "C-Sharps"},
+                        {"id": bands[0]["id"], "name": "Pythonistas"},
+                        {"id": bands[2]["id"], "name": "C-Sharps"},
                     ],
                 },
                 {
                     "name": "Folk",
                     "bands": [
-                        {"id": 1, "name": "Pythonistas"},
-                        {"id": 2, "name": "Rustaceans"},
+                        {"id": bands[0]["id"], "name": "Pythonistas"},
+                        {"id": bands[1]["id"], "name": "Rustaceans"},
                     ],
                 },
                 {
                     "name": "Classical",
-                    "bands": [{"id": 3, "name": "C-Sharps"}],
+                    "bands": [{"id": bands[2]["id"], "name": "C-Sharps"}],
                 },
             ],
         )
 
-    @engines_skip("cockroach")
     def test_select_id(self):
-        """
-        🐛 Cockroach bug: https://github.com/cockroachdb/cockroach/issues/71908 "could not decorrelate subquery" error under asyncpg
-        """  # noqa: E501
 
         response = Band.select(
             Band.name, Band.genres(Genre.id, as_list=True)
         ).run_sync()
+
+        genres = Genre.select().run_sync()
+
         self.assertEqual(
             response,
             [
-                {"name": "Pythonistas", "genres": [1, 2]},
-                {"name": "Rustaceans", "genres": [2]},
-                {"name": "C-Sharps", "genres": [1, 3]},
+                {
+                    "name": "Pythonistas",
+                    "genres": [genres[0]["id"], genres[1]["id"]],
+                },
+                {"name": "Rustaceans", "genres": [genres[1]["id"]]},
+                {
+                    "name": "C-Sharps",
+                    "genres": [genres[0]["id"], genres[2]["id"]],
+                },
             ],
         )
 
         # Now try it in reverse.
         response = Genre.select(
             Genre.name, Genre.bands(Band.id, as_list=True)
         ).run_sync()
+
+        bands = Band.select().run_sync()
+
         self.assertEqual(
             response,
             [
-                {"name": "Rock", "bands": [1, 3]},
-                {"name": "Folk", "bands": [1, 2]},
-                {"name": "Classical", "bands": [3]},
+                {"name": "Rock", "bands": [bands[0]["id"], bands[2]["id"]]},
+                {"name": "Folk", "bands": [bands[0]["id"], bands[1]["id"]]},
+                {"name": "Classical", "bands": [bands[2]["id"]]},
             ],
         )
 
-    @engines_skip("cockroach")
     def test_select_all_columns(self):
         """
         Make sure ``all_columns`` can be passed in as an argument. ``M2M``
         should flatten the arguments. Reported here:
-
-        https://github.com/piccolo-orm/piccolo/issues/728
-
-        🐛 Cockroach bug: https://github.com/cockroachdb/cockroach/issues/71908 "could not decorrelate subquery" error under asyncpg
-
-        """  # noqa: E501
+        """
 
         response = Band.select(
             Band.name, Band.genres(Genre.all_columns(exclude=(Genre.id,)))