server/mssql: subscription test cleanup post-fix

GitOrigin-RevId: b67e577b15be3c54f869bb3497b30fb0bb53ddf0
This commit is contained in:
Abby Sassel 2021-05-26 10:06:02 +01:00 committed by hasura-bot
parent 8e3e7501c7
commit 06bfe650f0
3 changed files with 12 additions and 31 deletions

View File

@ -3,18 +3,14 @@ url: /v1/graphql/explain
status: 200
response:
- field: user
sql: |-
SELECT ISNULL((SELECT [t_user1].[id] AS [id],
[t_user1].[name] AS [name],
[t_user1].[age] AS [age]
FROM [dbo].[user] AS [t_user1]
OUTER APPLY (SELECT *
FROM OPENJSON((N''+NCHAR(123)+''+NCHAR(34)+'positionalArguments'+NCHAR(34)+''+NCHAR(58)+''+NCHAR(91)+''+NCHAR(93)+','+NCHAR(34)+'namedArguments'+NCHAR(34)+''+NCHAR(58)+''+NCHAR(123)+''+NCHAR(125)+','+NCHAR(34)+'session'+NCHAR(34)+''+NCHAR(58)+''+NCHAR(123)+''+NCHAR(125)+''+NCHAR(125)+''))
WITH ([session] NVARCHAR(MAX) AS JSON,
[namedArguments] NVARCHAR(MAX) AS JSON,
[positionalArguments] NVARCHAR(MAX) AS JSON) AS [row])
AS [row]
FOR JSON PATH), '[]')
sql:
"SELECT ISNULL((SELECT [t_user1].[id] AS [id],\n [t_user1].[name] AS\
\ [name],\n [t_user1].[age] AS [age]\nFROM [dbo].[user] AS [t_user1]\nOUTER\
\ APPLY (SELECT *\n FROM OPENJSON((N''+NCHAR(123)+''+NCHAR(34)+'positionalArguments'+NCHAR(34)+''+NCHAR(58)+''+NCHAR(91)+''+NCHAR(93)+','+NCHAR(34)+'namedArguments'+NCHAR(34)+''+NCHAR(58)+''+NCHAR(123)+''+NCHAR(125)+','+NCHAR(34)+'session'+NCHAR(34)+''+NCHAR(58)+''+NCHAR(123)+''+NCHAR(125)+''+NCHAR(125)+''))\n\
\ WITH ([session] NVARCHAR(MAX) AS JSON,\n \
\ [namedArguments] NVARCHAR(MAX) AS JSON,\n [positionalArguments]\
\ NVARCHAR(MAX) AS JSON) AS [row]\n WHERE (1=1)) \nAS [row]\nWHERE\
\ ((1=1))\nFOR JSON PATH), '[]')"
query:
query:
query: |

View File

@ -388,10 +388,7 @@ class TestGraphQLQueryOffsets:
def dir(cls):
return 'queries/graphql_query/offset'
# FIXME: MSSQL subscriptions multiplexing regression
# https://github.com/hasura/graphql-engine-mono/issues/1434
# @pytest.mark.parametrize("transport", ['http', 'websocket', 'subscription'])
@pytest.mark.parametrize("transport", ['http', 'websocket'])
@pytest.mark.parametrize("transport", ['http', 'websocket', 'subscription'])
@pytest.mark.parametrize("backend", ['mssql', 'postgres'])
@usefixtures('per_class_tests_db_state')
class TestGraphQLQueryBoolExpBasicCommon:
@ -588,10 +585,7 @@ class TestGraphQLInheritedRoles:
check_query_f(hge_ctx, self.dir() + '/inherited_role_with_some_roles_having_no_permissions.yaml')
# FIXME: MSSQL subscriptions multiplexing regression
# https://github.com/hasura/graphql-engine-mono/issues/1434
# @pytest.mark.parametrize("transport", ['http', 'websocket', 'subscription'])
@pytest.mark.parametrize("transport", ['http', 'websocket'])
@pytest.mark.parametrize("transport", ['http', 'websocket', 'subscription'])
@pytest.mark.parametrize("backend", ['postgres', 'mssql'])
@usefixtures('per_class_tests_db_state')
class TestGraphQLQueryBoolExpSearchCommon:
@ -949,10 +943,7 @@ class TestUnauthorizedRolePermission:
def test_unauth_role(self, hge_ctx, transport):
check_query_f(hge_ctx, self.dir() + '/unauthorized_role.yaml', transport, False)
# FIXME: MSSQL subscriptions multiplexing regression
# https://github.com/hasura/graphql-engine-mono/issues/1434
# @pytest.mark.parametrize("backend", ['postgres', 'mssql'])
@pytest.mark.parametrize("backend", ['postgres'])
@pytest.mark.parametrize("backend", ['postgres', 'mssql'])
@usefixtures('per_class_tests_db_state')
class TestGraphQLExplain:
@classmethod

View File

@ -251,10 +251,7 @@ class TestSubscriptionLiveQueries:
with pytest.raises(queue.Empty):
ev = ws_client.get_ws_event(3)
# FIXME: MSSQL subscriptions multiplexing regression
# https://github.com/hasura/graphql-engine-mono/issues/1434
# @pytest.mark.parametrize("backend", ['mssql', 'postgres'])
@pytest.mark.parametrize("backend", ['postgres'])
@pytest.mark.parametrize("backend", ['mssql', 'postgres'])
@usefixtures('per_class_tests_db_state')
class TestSubscriptionMultiplexing:
@ -298,9 +295,6 @@ class TestSubscriptionMultiplexing:
return response
# FIXME: MSSQL subscriptions multiplexing regression
# https://github.com/hasura/graphql-engine-mono/issues/1434
# @pytest.mark.parametrize("backend", ['mssql', 'postgres'])
@pytest.mark.parametrize("backend", ['postgres'])
@usefixtures('per_class_tests_db_state', 'ws_conn_init')
class TestSubscriptionUDFWithSessionArg: