这是indexloc提供的服务，不要输入任何密码
Skip to content

run_sql modifies the schema cache if the query is an DDL one #4283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 22, 2020
Merged

run_sql modifies the schema cache if the query is an DDL one #4283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a65b6b5
run_sql modifies the schema cache if the query is an DDL one
codingkarthik Apr 3, 2020
d757a3b
make a common function to determine if a SC build is required
codingkarthik Apr 15, 2020
02aa5e4
Merge remote-tracking branch 'upstream/master' into modify-schema-cac…
codingkarthik Apr 15, 2020
1cd3f0d
Merge branch 'master' into modify-schema-cache-only-when-ddl
codingkarthik Apr 20, 2020
3e31b48
remove the unused RecordWildCards pragma from Hasura/Server/Query.hs
codingkarthik Apr 20, 2020
4851ae6
Merge branch 'master' into modify-schema-cache-only-when-ddl
tirumaraiselvan Apr 21, 2020
2d7bc60
style: push auxiliary function into where, remove redundant let
lexi-lambda Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions server/src-lib/Hasura/RQL/DDL/Schema.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ module Hasura.RQL.DDL.Schema

, RunSQL(..)
, runRunSQL
, isSchemaCacheBuildRequiredRunSQL
) where

import Hasura.Prelude
Expand Down Expand Up @@ -86,15 +87,30 @@ instance ToJSON RunSQL where
Q.ReadWrite -> False
]

-- | see Note [Checking metadata consistency in run_sql]
isSchemaCacheBuildRequiredRunSQL :: RunSQL -> Bool
isSchemaCacheBuildRequiredRunSQL RunSQL {..} =
case rTxAccessMode of
Q.ReadOnly -> False
Q.ReadWrite -> fromMaybe (containsDDLKeyword rSql) rCheckMetadataConsistency
where
containsDDLKeyword :: Text -> Bool
containsDDLKeyword = TDFA.match $$(quoteRegex
TDFA.defaultCompOpt
{ TDFA.caseSensitive = False
, TDFA.multiline = True
, TDFA.lastStarGreedy = True }
TDFA.defaultExecOpt
{ TDFA.captureGroups = False }
"\\balter\\b|\\bdrop\\b|\\breplace\\b|\\bcreate function\\b|\\bcomment on\\b")

runRunSQL :: (MonadTx m, CacheRWM m, HasSQLGenCtx m) => RunSQL -> m EncJSON
runRunSQL RunSQL {..} = do
runRunSQL q@RunSQL {..}
-- see Note [Checking metadata consistency in run_sql]
let metadataCheckNeeded = case rTxAccessMode of
Q.ReadOnly -> False
Q.ReadWrite -> fromMaybe (containsDDLKeyword rSql) rCheckMetadataConsistency
if metadataCheckNeeded
then withMetadataCheck rCascade $ execRawSQL rSql
else execRawSQL rSql
| isSchemaCacheBuildRequiredRunSQL q
= withMetadataCheck rCascade $ execRawSQL rSql
| otherwise
= execRawSQL rSql
where
execRawSQL :: (MonadTx m) => Text -> m EncJSON
execRawSQL =
Expand All @@ -103,17 +119,6 @@ runRunSQL RunSQL {..} = do
rawSqlErrHandler txe =
(err400 PostgresError "query execution failed") { qeInternal = Just $ toJSON txe }

-- see Note [Checking metadata consistency in run_sql]
containsDDLKeyword :: Text -> Bool
containsDDLKeyword = TDFA.match $$(quoteRegex
TDFA.defaultCompOpt
{ TDFA.caseSensitive = False
, TDFA.multiline = True
, TDFA.lastStarGreedy = True }
TDFA.defaultExecOpt
{ TDFA.captureGroups = False }
"\\balter\\b|\\bdrop\\b|\\breplace\\b|\\bcreate function\\b|\\bcomment on\\b")

{- Note [Checking metadata consistency in run_sql]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
SQL queries executed by run_sql may change the Postgres schema in arbitrary
Expand Down
6 changes: 1 addition & 5 deletions server/src-lib/Hasura/Server/Query.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{-# LANGUAGE NamedFieldPuns #-}

module Hasura.Server.Query where

import Control.Lens
Expand Down Expand Up @@ -259,10 +258,7 @@ queryModifiesSchemaCache (RQV1 qi) = case qi of
RQAddCollectionToAllowlist _ -> True
RQDropCollectionFromAllowlist _ -> True

RQRunSql RunSQL{rTxAccessMode, rCheckMetadataConsistency} ->
case rTxAccessMode of
Q.ReadOnly -> False
Q.ReadWrite -> fromMaybe True rCheckMetadataConsistency
RQRunSql q -> isSchemaCacheBuildRequiredRunSQL q

RQReplaceMetadata _ -> True
RQExportMetadata _ -> False
Expand Down