hasura/graphql-engine
1
0
Fork 0
mirror of https://github.com/hasura/graphql-engine.git synced 2024-09-11 02:35:32 +03:00
Code Issues Projects Releases Wiki Activity

feature(server): add Logical Models support for CockroachDB

Browse Source 
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/8500
GitOrigin-RevId: 0205bd207843f50ad4fa12ad6e6c07d1f2740912
This commit is contained in:
Daniel Harvey 2023-03-27 14:57:36 +01:00 committed by hasura-bot
parent 26bb2b4030
commit 305eebb3ab
9 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose/databases.yaml
View File

@ -81,7 +81,7 @@ services:
healthcheck:
test:
- CMD-SHELL
- cockroach sql --insecure < /dev/null
- cockroach sql --insecure --execute "select 1;"
start_period: 5s
interval: 5s
timeout: 10s

2
server/lib/api-tests/docker-compose.yaml
View File

@ -38,7 +38,7 @@ services:
ports:
- "65008:26257"
environment:
COCKROACH_USER: "root"
COCKROACH_USER: "hasura"
COCKROACH_DATABASE: "hasura"
volumes:
- cockroach-data:/cockroach/cockroach-data

6
server/lib/api-tests/src/Test/API/Metadata/LogicalModels/ValidationSpec.hs
View File

@ -2,6 +2,7 @@ module Test.API.Metadata.LogicalModels.ValidationSpec where
import Data.List.NonEmpty qualified as NE
import Harness.Backend.Citus qualified as Citus
import Harness.Backend.Cockroach qualified as Cockroach
import Harness.Backend.Postgres qualified as Postgres
import Harness.GraphqlEngine qualified as GraphqlEngine
import Harness.Quoter.Yaml (yaml)
@ -30,6 +31,11 @@ spec = do
{ Fixture.setupTeardown = \(testEnv, _) ->
[ Citus.setupTablesAction schema testEnv
]
},
(Fixture.fixture $ Fixture.Backend Cockroach.backendTypeMetadata)
{ Fixture.setupTeardown = \(testEnv, _) ->
[ Cockroach.setupTablesAction schema testEnv
]
}
]
)

6
server/lib/api-tests/src/Test/API/Metadata/LogicalModelsSpec.hs
View File

@ -6,6 +6,7 @@ module Test.API.Metadata.LogicalModelsSpec (spec) where
import Data.List.NonEmpty qualified as NE
import Harness.Backend.BigQuery qualified as BigQuery
import Harness.Backend.Citus qualified as Citus
import Harness.Backend.Cockroach qualified as Cockroach
import Harness.Backend.Postgres qualified as Postgres
import Harness.Backend.Sqlserver qualified as Sqlserver
import Harness.GraphqlEngine qualified as GraphqlEngine
@ -46,6 +47,11 @@ spec = do
[ Citus.setupTablesAction schema testEnv
]
},
(Fixture.fixture $ Fixture.Backend Cockroach.backendTypeMetadata)
{ Fixture.setupTeardown = \(testEnv, _) ->
[ Cockroach.setupTablesAction schema testEnv
]
},
(Fixture.fixture $ Fixture.Backend Sqlserver.backendTypeMetadata)
{ Fixture.setupTeardown = \(testEnv, _) ->
[ Sqlserver.setupTablesAction schema testEnv

6
server/lib/api-tests/src/Test/Databases/Postgres/LogicalModelsSpec.hs
View File

@ -9,6 +9,7 @@ import Data.Time.Calendar.OrdinalDate
import Data.Time.Clock
import Database.PG.Query qualified as PG
import Harness.Backend.Citus qualified as Citus
import Harness.Backend.Cockroach qualified as Cockroach
import Harness.Backend.Postgres qualified as Postgres
import Harness.GraphqlEngine qualified as GraphqlEngine
import Harness.Quoter.Graphql
@ -37,6 +38,11 @@ spec =
[ Postgres.setupTablesAction schema testEnvironment
]
},
(Fixture.fixture $ Fixture.Backend Cockroach.backendTypeMetadata)
{ Fixture.setupTeardown = \(testEnvironment, _) ->
[ Cockroach.setupTablesAction schema testEnvironment
]
},
(Fixture.fixture $ Fixture.Backend Citus.backendTypeMetadata)
{ Fixture.setupTeardown = \(testEnvironment, _) ->
[ Citus.setupTablesAction schema testEnvironment

6
server/lib/api-tests/src/Test/Queries/LogicalModels/LogicalModelsQueriesSpec.hs
View File

@ -6,6 +6,7 @@ module Test.Queries.LogicalModels.LogicalModelsQueriesSpec (spec) where
import Data.Aeson (Value)
import Data.List.NonEmpty qualified as NE
import Harness.Backend.Citus qualified as Citus
import Harness.Backend.Cockroach qualified as Cockroach
import Harness.Backend.Postgres qualified as Postgres
import Harness.GraphqlEngine qualified as GraphqlEngine
import Harness.Quoter.Graphql
@ -34,6 +35,11 @@ spec =
[ Postgres.setupTablesAction schema testEnvironment
]
},
(Fixture.fixture $ Fixture.Backend Cockroach.backendTypeMetadata)
{ Fixture.setupTeardown = \(testEnvironment, _) ->
[ Cockroach.setupTablesAction schema testEnvironment
]
},
(Fixture.fixture $ Fixture.Backend Citus.backendTypeMetadata)
{ Fixture.setupTeardown = \(testEnvironment, _) ->
[ Citus.setupTablesAction schema testEnvironment

6
server/lib/api-tests/src/Test/Queries/LogicalModels/SubscriptionsSpec.hs
View File

@ -9,6 +9,7 @@ import Data.Time.Calendar.OrdinalDate
import Data.Time.Clock
import Database.PG.Query qualified as PG
import Harness.Backend.Citus qualified as Citus
import Harness.Backend.Cockroach qualified as Cockroach
import Harness.Backend.Postgres qualified as Postgres
import Harness.GraphqlEngine qualified as GraphqlEngine
import Harness.Quoter.Graphql
@ -38,6 +39,11 @@ spec =
[ Postgres.setupTablesAction schema testEnvironment
]
},
(Fixture.fixture $ Fixture.Backend Cockroach.backendTypeMetadata)
{ Fixture.setupTeardown = \(testEnvironment, _) ->
[ Cockroach.setupTablesAction schema testEnvironment
]
},
(Fixture.fixture $ Fixture.Backend Citus.backendTypeMetadata)
{ Fixture.setupTeardown = \(testEnvironment, _) ->
[ Citus.setupTablesAction schema testEnvironment

2
server/lib/test-harness/src/Harness/Constants.hs
View File

@ -169,7 +169,7 @@ defaultCitusConnectionString =
-- * Cockroach
cockroachUser :: Text
cockroachUser = "root"
cockroachUser = "hasura"
cockroachDb :: Text
cockroachDb = "hasura"

3
server/src-lib/Hasura/Backends/Postgres/Instances/API.hs
View File

@ -61,5 +61,6 @@ instance BackendAPI ('Postgres 'Cockroach) where
. mkAnyBackend @('Postgres 'Cockroach)
)
],
connectionTemplateCommands @('Postgres 'Cockroach)
connectionTemplateCommands @('Postgres 'Cockroach),
logicalModelsCommands @('Postgres 'Cockroach)
]