server: Upgrade to CockroachDB 22.2 nightly and enable skipped tests from oid error

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/6046 GitOrigin-RevId: 21a660bf4deab9bbe0465443685338191b90e485
2024-09-11 10:46:25 +03:00 · 2022-09-27 09:54:31 +01:00 · 2022-09-27 09:54:31 +01:00 · bfa5296ecf
commit bfa5296ecf
parent a1c5ac46f6
9 changed files with 9 additions and 16 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -94,7 +94,7 @@ services:
      - ./docker-compose/postgres/init.sh:/docker-entrypoint-initdb.d/init-hasura.sh:ro

  cockroach:
-    image: us-docker.pkg.dev/cockroach-cloud-images/cockroachdb/cockroach:v22.1.7-28-g19985f9b60
+    image: us-docker.pkg.dev/cockroach-cloud-images/cockroachdb/cockroach:v22.2.0-alpha.4-203-g492c3c88c3
    command:
      - start-single-node
      - --insecure
--- a/server/tests-hspec/Test/Postgres/JsonbSpec.hs
+++ b/server/tests-hspec/Test/Postgres/JsonbSpec.hs
@ -42,8 +42,7 @@ spec =
              Fixture.customOptions =
                Just $
                  Fixture.defaultOptions
-                    { Fixture.stringifyNumbers = True,
-                      Fixture.skipTests = Just "Cockroach disabled pending oid 114 fix https://github.com/hasura/graphql-engine-mono/issues/5984"
+                    { Fixture.stringifyNumbers = True
                    }
            }
        ]
--- a/server/tests-hspec/Test/Queries/AggregationSpec.hs
+++ b/server/tests-hspec/Test/Queries/AggregationSpec.hs
@ -59,7 +59,7 @@ spec = do
                Just $
                  Fixture.defaultOptions
                    { Fixture.stringifyNumbers = True,
-                      Fixture.skipTests = Just "Cockroach disabled pending oid 114 fix https://github.com/hasura/graphql-engine-mono/issues/5984"
+                      Fixture.skipTests = Just "Skipping whilst we fix numerical comparison of stringified results in Hspec tests"
                    }
            },
          (Fixture.fixture $ Fixture.Backend Fixture.SQLServer)
--- a/server/tests-hspec/Test/Queries/Simple/ObjectQueriesSpec.hs
+++ b/server/tests-hspec/Test/Queries/Simple/ObjectQueriesSpec.hs
@ -53,8 +53,7 @@ spec = do
              Fixture.customOptions =
                Just $
                  Fixture.defaultOptions
-                    { Fixture.stringifyNumbers = True,
-                      Fixture.skipTests = Just "Cockroach disabled pending oid 114 fix https://github.com/hasura/graphql-engine-mono/issues/5984"
+                    { Fixture.stringifyNumbers = True
                    }
            },
          (Fixture.fixture $ Fixture.Backend Fixture.SQLServer)
--- a/server/tests-hspec/Test/Queries/Simple/OperationNameSpec.hs
+++ b/server/tests-hspec/Test/Queries/Simple/OperationNameSpec.hs
@ -50,8 +50,7 @@ spec = do
              Fixture.customOptions =
                Just $
                  Fixture.defaultOptions
-                    { Fixture.stringifyNumbers = True,
-                      Fixture.skipTests = Just "Cockroach disabled pending oid 114 fix https://github.com/hasura/graphql-engine-mono/issues/5984"
+                    { Fixture.stringifyNumbers = True
                    }
            },
          (Fixture.fixture $ Fixture.Backend Fixture.SQLServer)
--- a/server/tests-hspec/Test/Queries/Simple/PrimaryKeySpec.hs
+++ b/server/tests-hspec/Test/Queries/Simple/PrimaryKeySpec.hs
@ -45,8 +45,7 @@ spec =
              Fixture.customOptions =
                Just $
                  Fixture.defaultOptions
-                    { Fixture.stringifyNumbers = True,
-                      Fixture.skipTests = Just "Cockroach disabled pending oid 114 fix https://github.com/hasura/graphql-engine-mono/issues/5984"
+                    { Fixture.stringifyNumbers = True
                    }
            },
          (Fixture.fixture $ Fixture.Backend Fixture.SQLServer)
--- a/server/tests-hspec/Test/Schema/CustomFieldNames/QuerySpec.hs
+++ b/server/tests-hspec/Test/Schema/CustomFieldNames/QuerySpec.hs
@ -56,8 +56,7 @@ spec = do
              Fixture.customOptions =
                Just $
                  Fixture.defaultOptions
-                    { Fixture.stringifyNumbers = True,
-                      Fixture.skipTests = Just "Cockroach disabled pending oid 114 fix https://github.com/hasura/graphql-engine-mono/issues/5984"
+                    { Fixture.stringifyNumbers = True
                    }
            },
          (Fixture.fixture $ Fixture.Backend Fixture.SQLServer)
--- a/server/tests-hspec/Test/Schema/TableRelationships/ArrayRelationshipsSpec.hs
+++ b/server/tests-hspec/Test/Schema/TableRelationships/ArrayRelationshipsSpec.hs
@ -43,8 +43,7 @@ spec = do
              Fixture.customOptions =
                Just $
                  Fixture.defaultOptions
-                    { Fixture.stringifyNumbers = True,
-                      Fixture.skipTests = Just "Cockroach disabled pending oid 114 fix https://github.com/hasura/graphql-engine-mono/issues/5984"
+                    { Fixture.stringifyNumbers = True
                    }
            },
          (Fixture.fixture $ Fixture.Backend Fixture.SQLServer)
--- a/server/tests-hspec/Test/Schema/TableRelationships/ObjectRelationshipsSpec.hs
+++ b/server/tests-hspec/Test/Schema/TableRelationships/ObjectRelationshipsSpec.hs
@ -65,8 +65,7 @@ spec = do
              Fixture.customOptions =
                Just $
                  Fixture.defaultOptions
-                    { Fixture.stringifyNumbers = True,
-                      Fixture.skipTests = Just "Cockroach disabled pending oid 114 fix https://github.com/hasura/graphql-engine-mono/issues/5984"
+                    { Fixture.stringifyNumbers = True
                    }
            }
        ]