Rewrite GraphQL schema generation and query parsing (close #2801)

.circleci/test-server.sh

@@ -191,9 +191,7 @@ pip3 install -r requirements.txt
 # node js deps
 curl -sL https://deb.nodesource.com/setup_8.x | bash -
 apt-get install -y nodejs
-npm_config_loglevel=error npm install $PYTEST_ROOT/remote_schemas/nodejs/
-
-npm install apollo-server graphql
+(cd remote_schemas/nodejs && npm_config_loglevel=error npm ci)
 
 mkdir -p "$OUTPUT_FOLDER/hpc"
 

CHANGELOG.md

@@ -2,14 +2,25 @@
 
 ## Next release
 
+### Breaking change
+
+Headers from environment variables starting with `HASURA_GRAPHQL_` are not allowed  
+in event triggers, actions & remote schemas.
+
+If you do have such headers configured, then you must update the header configuration before upgrading.
+
 ### Bug fixes and improvements
 
 (Add entries here in the order of: server, console, cli, docs, others)
 
+- server: fix failing introspection query when an enum column is part of a primary key (fixes #5200)
+- server: disallow headers from env variables starting with `HASURA_GRAPHQL_` in actions, event triggers & remote schemas (#5519)
+**WARNING**: This might break certain deployments. See `Breaking change` section above.
 - server: bugfix to allow HASURA_GRAPHQL_QUERY_PLAN_CACHE_SIZE of 0 (#5363)
 - server: support only a bounded plan cache, with a default size of 4000 (closes #5363)
 - server: add logs for action handlers
-- server: add request/response sizes in event triggers (and scheduled trigger) logs
+- server: add request/response sizes in event triggers (and scheduled trigger) logs (#5463)
+- server: change startup log kind `db_migrate` to `catalog_migrate` (#5531)
 - console: handle nested fragments in allowed queries (close #5137) (#5252)
 - console: update sidebar icons for different action and trigger types (#5445)
 - console: make add column UX consistent with others (#5486)
@@ -38,7 +49,7 @@
 - server: have haskell runtime release blocks of memory back to the OS eagerly (related to #3388)
 - server: unlock locked scheduled events on graceful shutdown (#4928)
 - server: disable prepared statements for mutations as we end up with single-use objects which result in excessive memory consumption for mutation heavy workloads (#5255)
-- server: include scheduled event metadata (`created_at`,`scheduled_time`,`id`, etc) along with the configured payload in the request body to the webhook. 
+- server: include scheduled event metadata (`created_at`,`scheduled_time`,`id`, etc) along with the configured payload in the request body to the webhook.
 **WARNING:** This is breaking for beta versions as the payload is now inside a key called `payload`.
 - console: allow configuring statement timeout on console RawSQL page (close #4998) (#5045)
 - console: support tracking partitioned tables (close #5071) (#5258)

console/src/components/Services/Data/RawSQL/Actions.js

@@ -40,7 +40,7 @@ const executeSQL = (isMigration, migrationName, statementTimeout) => (
   dispatch({ type: MAKING_REQUEST });
   dispatch(showSuccessNotification('Executing the Query...'));
 
-  const { isTableTrackChecked, isCascadeChecked } = getState().rawSQL;
+  const { isTableTrackChecked, isCascadeChecked, sql } = getState().rawSQL;
   const { migrationMode, readOnlyMode } = getState().main;
 
   const migrateUrl = returnMigrateUrl(migrationMode);
@@ -49,13 +49,17 @@ const executeSQL = (isMigration, migrationName, statementTimeout) => (
 
   const schemaChangesUp = [];
 
-  const sql =
-    statementTimeout && !isMigration
-      ? `${getStatementTimeoutSql(statementTimeout)} ${getState().rawSQL.sql}`
-      : getState().rawSQL.sql;
+  if (statementTimeout && !isMigration) {
+    schemaChangesUp.push(
+      getRunSqlQuery(
+        getStatementTimeoutSql(statementTimeout),
+        false,
+        readOnlyMode
+      )
+    );
+  }
 
   schemaChangesUp.push(getRunSqlQuery(sql, isCascadeChecked, readOnlyMode));
-  // check if track view enabled
 
   if (isTableTrackChecked) {
     const objects = parseCreateSQL(sql);

server/.stylish-haskell.yaml

@@ -229,6 +229,7 @@ language_extensions:
 - BangPatterns
 - BlockArguments
 - ConstraintKinds
+- DataKinds
 - DefaultSignatures
 - DeriveDataTypeable
 - DeriveFoldable
@@ -238,9 +239,11 @@ language_extensions:
 - DeriveTraversable
 - DerivingVia
 - EmptyCase
+- ExistentialQuantification
 - FlexibleContexts
 - FlexibleInstances
 - FunctionalDependencies
+- GADTs
 - GeneralizedNewtypeDeriving
 - InstanceSigs
 - LambdaCase
@@ -249,12 +252,15 @@ language_extensions:
 - NamedFieldPuns
 - NoImplicitPrelude
 - OverloadedStrings
+- QuantifiedConstraints
 - QuasiQuotes
 - RankNTypes
+- RoleAnnotations
 - ScopedTypeVariables
 - StandaloneDeriving
 - TemplateHaskell
 - TupleSections
 - TypeApplications
 - TypeFamilies
+- TypeFamilyDependencies
 - TypeOperators

server/CONTRIBUTING.md

@@ -24,6 +24,11 @@ Additionally, you will need a way to run a Postgres database server. The `dev.sh
 - [PostgreSQL](https://www.postgresql.org) >= 9.5
 - [postgis](https://postgis.net)
 
+Additionally, you will need a way to run a Postgres database server. The `dev.sh` script (described below) can set up a Postgres instance for you via [Docker](https://www.docker.com), but if you want to run it yourself, you’ll need:
+
+- [PostgreSQL](https://www.postgresql.org) >= 9.5
+- [postgis](https://postgis.net)
+
 ### Upgrading npm
 
 If your npm is too old (>= 5.7 required):
@@ -116,16 +121,13 @@ cabal new-run -- test:graphql-engine-tests \
 
 ##### Running the Python test suite
 
-1. To run the Python tests, you’ll need to install the necessary Python dependencies first. It is
-   recommended that you do this in a self-contained Python venv, which is supported by Python 3.3+
-   out of the box. To create one, run:
+1. To run the Python tests, you’ll need to install the necessary Python dependencies first. It is recommended that you do this in a self-contained Python venv, which is supported by Python 3.3+ out of the box. To create one, run:
 
    ```
    python3 -m venv .python-venv
    ```
 
-   (The second argument names a directory where the venv sandbox will be created; it can be anything
-   you like, but `.python-venv` is `.gitignore`d.)
+   (The second argument names a directory where the venv sandbox will be created; it can be anything you like, but `.python-venv` is `.gitignore`d.)
 
    With the venv created, you can enter into it in your current shell session by running:
 
@@ -141,19 +143,26 @@ cabal new-run -- test:graphql-engine-tests \
    pip3 install -r tests-py/requirements.txt
    ```
 
-3. Start an instance of `graphql-engine` for the test suite to use:
+3. Install the dependencies for the Node server used by the remote schema tests:
+
+   ```
+   (cd tests-py/remote_schemas/nodejs && npm ci)
+   ```
+
+4. Start an instance of `graphql-engine` for the test suite to use:
 
    ```
    env EVENT_WEBHOOK_HEADER=MyEnvValue \
        WEBHOOK_FROM_ENV=http://localhost:5592/ \
+       SCHEDULED_TRIGGERS_WEBHOOK_DOMAIN=http://127.0.0.1:5594 \
      cabal new-run -- exe:graphql-engine \
        --database-url='postgres://<user>:<password>@<host>:<port>/<dbname>' \
        serve --stringify-numeric-types
    ```
 
    The environment variables are needed for a couple tests, and the `--stringify-numeric-types` option is used to avoid the need to do floating-point comparisons.
 
-4. With the server running, run the test suite:
+5. With the server running, run the test suite:
 
    ```
    cd tests-py

server/cabal.project

@@ -15,10 +15,17 @@
 packages: .
 
 constraints:
-  -- ensure we don’t end up with a freeze file that forces an incompatible
+  -- ensure we don't end up with a freeze file that forces an incompatible
   -- version in CI for Setup.hs scripts.
   setup.Cabal <3.4
 
+allow-newer:
+  -- dependent-map depends on constraints-extras, but its bounds have not yet
+  -- been relaxed for GHC 8.10.
+  constraints-extras-0.3.0.2:base,
+  constraints-extras-0.3.0.2:constraints,
+  constraints-extras-0.3.0.2:template-haskell
+
 package *
   optimization: 2
   -- For tooling, e.g. 'weeder', and IDE-like stuff:
@@ -40,8 +47,8 @@ source-repository-package
 
 source-repository-package
   type: git
-  location: https://github.com/hasura/graphql-parser-hs.git
-  tag: f4a093981ca5626982a17c2bfaad047cc0834a81
+  location: https://github.com/lexi-lambda/graphql-parser-hs.git
+  tag: 0b05bda06506496cb3be84c13c930c330fe10e39
 
 source-repository-package
   type: git

server/cabal.project.ci

@@ -3,6 +3,12 @@
 reject-unconstrained-dependencies: all
 
 package graphql-engine
-  ghc-options: -j3 -Werror
+  ghc-options:
+    -j3 -Werror
+    -- Limit heap size to 8GB, which is the amount of available memory on a
+    -- CircleCI `large` instance. (GHC interprets G as GB, i.e. 1,000^3 bytes,
+    -- but instances seem to have 8GiB, i.e. 1,024^3 bytes, so that leaves us
+    -- a little breathing room.)
+    +RTS -M8G -RTS
   tests: true
   benchmarks: true

server/cabal.project.dev

@@ -6,13 +6,15 @@
 -- Or, if you want to customize the configuration:
 --   $ cp cabal.project.dev cabal.project.local
 
+with-compiler: ghc-8.10.1
+
 package *
   documentation: true
 
 package graphql-engine
   -- NOTE: this seems to work so long as there is no 'ghc-options: -O2' in the cabal file,
-  -- but new-build will report 'Build profile: -O1' for some reason. 
-  -- See:https://github.com/haskell/cabal/issues/6221 
+  -- but new-build will report 'Build profile: -O1' for some reason.
+  -- See:https://github.com/haskell/cabal/issues/6221
   optimization: 0
   documentation: false
   flags: +developer

server/cabal.project.freeze

@@ -75,10 +75,11 @@ constraints: any.Cabal ==3.2.0.0,
              any.comonad ==5.0.6,
              comonad +containers +distributive +test-doctests,
              any.concise ==0.1.0.1,
-             any.concurrent-output ==1.10.11,
              any.conduit ==1.3.2,
              any.connection ==0.3.1,
              any.constraints ==0.12,
+             any.constraints-extras ==0.3.0.2,
+             constraints-extras +build-readme,
              any.containers ==0.6.2.1,
              any.contravariant ==1.5.2,
              contravariant +semigroups +statevar +tagged,
@@ -112,8 +113,8 @@ constraints: any.Cabal ==3.2.0.0,
              any.deepseq ==1.4.4.0,
              any.deferred-folds ==0.9.10.1,
              any.dense-linear-algebra ==0.1.0.0,
-             any.dependent-map ==0.2.4.0,
-             any.dependent-sum ==0.4,
+             any.dependent-map ==0.4.0.0,
+             any.dependent-sum ==0.7.1.0,
              any.directory ==1.3.6.1,
              any.distributive ==0.6.2,
              distributive +semigroups +tagged,
@@ -124,11 +125,8 @@ constraints: any.Cabal ==3.2.0.0,
              any.ekg-json ==0.1.0.6,
              any.entropy ==0.4.1.6,
              entropy -halvm,
-             any.erf ==2.0.0.0,
              any.errors ==2.3.0,
              any.exceptions ==0.10.4,
-             exceptions +transformers-0-4,
-             any.fail ==4.9.0.0,
              any.fast-logger ==3.0.1,
              any.file-embed ==0.0.11.2,
              any.filepath ==1.4.2.1,
@@ -141,17 +139,13 @@ constraints: any.Cabal ==3.2.0.0,
              any.ghc-heap-view ==0.6.2,
              ghc-heap-view -prim-supports-any,
              any.ghc-prim ==0.6.1,
-             any.happy ==1.19.12,
-             happy +small_base,
              any.hashable ==1.3.0.0,
              hashable -examples +integer-gmp +sse2 -sse41,
              any.hashtables ==1.2.3.4,
              hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks,
-             any.haskell-lexer ==1.1,
              any.hasql ==1.4.2,
              any.hasql-pool ==0.5.1,
              any.hasql-transaction ==1.0.0.1,
-             any.hedgehog ==1.0.2,
              any.hourglass ==0.2.12,
              any.hsc2hs ==0.68.7,
              hsc2hs -in-ghc-tree,
@@ -234,16 +228,13 @@ constraints: any.Cabal ==3.2.0.0,
              any.postgresql-libpq ==0.9.4.2,
              postgresql-libpq -use-pkg-config,
              any.pretty ==1.1.3.6,
-             any.pretty-show ==1.10,
              any.prettyprinter ==1.6.1,
              prettyprinter -buildreadme,
              any.primitive ==0.7.0.1,
              any.primitive-extras ==0.8,
              any.primitive-unlifted ==0.1.3.0,
              any.process ==1.6.8.2,
              any.profunctors ==5.5.2,
-             any.protolude ==0.3.0,
-             protolude -dev,
              any.psqueues ==0.2.7.2,
              any.quickcheck-instances ==0.3.22,
              quickcheck-instances -bytestring-builder,
@@ -277,6 +268,8 @@ constraints: any.Cabal ==3.2.0.0,
              any.simple-sendfile ==0.2.30,
              simple-sendfile +allow-bsd,
              any.socks ==0.6.1,
+             any.some ==1.0.1,
+             some +newtype-unsafe,
              any.split ==0.2.3.4,
              any.splitmix ==0.0.4,
              splitmix -optimised-mixer +random,
@@ -291,7 +284,6 @@ constraints: any.Cabal ==3.2.0.0,
              tagged +deepseq +transformers,
              any.template-haskell ==2.16.0.0,
              any.template-haskell-compat-v0208 ==0.1.2.1,
-             any.terminal-size ==0.3.2.1,
              any.text ==1.2.3.2,
              any.text-builder ==0.6.6.1,
              any.text-conversions ==0.3.0,
@@ -357,7 +349,6 @@ constraints: any.Cabal ==3.2.0.0,
              any.websockets ==0.12.7.0,
              websockets -example,
              any.witherable ==0.3.1,
-             any.wl-pprint-annotated ==0.1.0.1,
              any.word8 ==0.1.3,
              any.wreq ==0.5.3.2,
              wreq -aws -developer +doctest -httpbin,

server/commit_diff.txt

@@ -0,0 +1 @@
+**** Latest commit compared against master - 6ef70f963b20c15564d7ba6fa96d42ffef10f552