Merge branch 'master' into issue-1182-cache-update

Resolve Conflicts:
	server/src-exec/Main.hs
	server/src-exec/Ops.hs
	server/src-lib/Hasura/Server/App.hs
	server/src-lib/Hasura/Server/Init.hs
	server/src-lib/Hasura/Server/Query.hs
	server/src-rsr/migrate_from_9_to_10.sql

.circleci/config.yml

@@ -336,6 +336,28 @@ jobs:
         paths:
           - _console_output
 
+  # test server upgrade from last version to current build
+  test_server_upgrade:
+    docker:
+    - image: hasura/graphql-engine-upgrade-tester:v0.4
+      environment:
+        HASURA_GRAPHQL_DATABASE_URL: postgres://gql_test:@localhost:5432/gql_test
+    - image: circleci/postgres:10-alpine
+      environment:
+        POSTGRES_USER: gql_test
+        POSTGRES_DB: gql_test
+    working_directory: ~/graphql-engine
+    steps:
+    - checkout
+    - attach_workspace:
+        at: /build
+    - run:
+        name: upgrade_test 
+        command: .circleci/server-upgrade/run.sh
+    - store_artifacts:
+        path: /build/_server_output
+        destination: server
+
   deploy:
     docker:
     - image: hasura/graphql-engine-deployer:v0.3
@@ -374,13 +396,18 @@ workflows:
         <<: *filter_only_vtags
         requires:
         - build_server
+    - test_server_upgrade:
+        <<: *filter_only_vtags
+        requires:
+        - build_server
     - all_server_tests_pass:
         <<: *filter_only_vtags
         requires:
         - pytest_server_pg_11.1
         - pytest_server_pg_10.6
         - pytest_server_pg_9.6
         - pytest_server_pg_9.5
+        - test_server_upgrade
     - test_cli_with_last_release:
         <<: *filter_only_vtags
     - test_and_build_cli:

.circleci/server-upgrade/.gitignore

@@ -0,0 +1,3 @@
+_output
+node_modules
+yarn.lock

.circleci/server-upgrade/Dockerfile

@@ -0,0 +1,6 @@
+FROM node:11-slim
+
+RUN apt-get update && apt-get install -y \
+    libpq5 \
+    netcat \
+    && curl -L https://github.com/hasura/graphql-engine/raw/master/cli/get.sh | INSTALL_PATH=/bin bash

.circleci/server-upgrade/api-server/.gitignore

@@ -0,0 +1 @@
+node_modules

.circleci/server-upgrade/api-server/echo.js

@@ -0,0 +1,13 @@
+const echo = (req, res) => {
+  try {
+    const { event: { op, data }, table: { name, schema } } = req.body;
+    const response = { message: 'received event', data: { op, data, name, schema } };
+    console.log('--->', response);
+    return res.json(response);
+  } catch (err) {
+    console.error('xxx>', err);
+    return res.status(500).json({ error: err.message || err });
+  }
+};
+
+export default echo;

.circleci/server-upgrade/api-server/graphql.js

@@ -0,0 +1,15 @@
+import { buildSchema } from 'graphql';
+
+const schema = buildSchema(`
+  type Query {
+    hello:  String
+  }
+`);
+
+const root = {
+  hello: () => {
+    return 'Hello world!';
+  }
+};
+
+export { schema, root };

.circleci/server-upgrade/api-server/index.js

@@ -0,0 +1,23 @@
+import express from 'express';
+import morgan from 'morgan';
+import graphqlHTTP from 'express-graphql';
+
+import echo from './echo';
+import { schema, root } from './graphql';
+
+const app = express();
+app.use(express.json());
+app.use(morgan('tiny'));
+
+app.get('/', (req, res) => res.send('api server listening for requests'));
+
+app.post('/trigger/echo', echo);
+
+app.use('/remote-schema/hello', graphqlHTTP({
+  schema: schema,
+  rootValue: root,
+  graphiql: process.env.ENABLE_GRAPHIQL === 'true' ? true : false,
+}));
+
+const port = process.env.PORT || 3000;
+app.listen(port, () => console.log(`event triggers listening on port ${port}!`));

.circleci/server-upgrade/api-server/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "api-server",
+  "version": "1.0.0",
+  "description": "api server for event triggers and remote schemas",
+  "main": "index.js",
+  "author": "shahidhk",
+  "license": "MIT",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "nodemon -r esm index.js",
+    "start-prod": "node -r esm index.js"
+  },
+  "devDependencies": {
+    "nodemon": "^1.18.10"
+  },
+  "dependencies": {
+    "esm": "^3.2.6",
+    "express": "^4.16.4",
+    "express-graphql": "^0.7.1",
+    "graphql": "^14.1.1",
+    "morgan": "^1.9.1"
+  }
+}

.circleci/server-upgrade/hasura/config.yaml

@@ -0,0 +1 @@
+endpoint: http://localhost:8080

.circleci/server-upgrade/hasura/migrations/1551151778747_create_table_public_author.down.yaml

@@ -0,0 +1,3 @@
+- args:
+    sql: DROP TABLE "public"."author"
+  type: run_sql

.circleci/server-upgrade/hasura/migrations/1551151778747_create_table_public_author.up.yaml

@@ -0,0 +1,8 @@
+- args:
+    sql: CREATE TABLE "public"."author"("id" serial NOT NULL, "name" text NOT NULL,
+      PRIMARY KEY ("id") );
+  type: run_sql
+- args:
+    name: author
+    schema: public
+  type: add_existing_table_or_view

.circleci/server-upgrade/hasura/migrations/1551151797817_create_table_public_article.down.yaml

@@ -0,0 +1,3 @@
+- args:
+    sql: DROP TABLE "public"."article"
+  type: run_sql

.circleci/server-upgrade/hasura/migrations/1551151797817_create_table_public_article.up.yaml

@@ -0,0 +1,8 @@
+- args:
+    sql: CREATE TABLE "public"."article"("id" serial NOT NULL, "title" text NOT NULL,
+      "author_id" integer NOT NULL, PRIMARY KEY ("id") );
+  type: run_sql
+- args:
+    name: article
+    schema: public
+  type: add_existing_table_or_view

.circleci/server-upgrade/hasura/migrations/1551151805486_alter_table_public_article_add_foreign_key.down.yaml

@@ -0,0 +1,3 @@
+- args:
+    sql: ALTER TABLE "public"."article" DROP CONSTRAINT "article_author_id_fkey"
+  type: run_sql

.circleci/server-upgrade/hasura/migrations/1551151805486_alter_table_public_article_add_foreign_key.up.yaml

@@ -0,0 +1,4 @@
+- args:
+    sql: ALTER TABLE "public"."article" ADD FOREIGN KEY ("author_id") REFERENCES "public"."author"
+      ("id")
+  type: run_sql

.circleci/server-upgrade/hasura/migrations/1551151812056_add_relationship_authorByauthorId_table_public_article.down.yaml

@@ -0,0 +1,6 @@
+- args:
+    relationship: authorByauthorId
+    table:
+      name: article
+      schema: public
+  type: drop_relationship

.circleci/server-upgrade/hasura/migrations/1551151812056_add_relationship_authorByauthorId_table_public_article.up.yaml

@@ -0,0 +1,8 @@
+- args:
+    name: authorByauthorId
+    table:
+      name: article
+      schema: public
+    using:
+      foreign_key_constraint_on: author_id
+  type: create_object_relationship

.circleci/server-upgrade/hasura/migrations/1551151820765_add_relationship_articlesByauthorId_table_public_author.down.yaml

@@ -0,0 +1,6 @@
+- args:
+    relationship: articlesByauthorId
+    table:
+      name: author
+      schema: public
+  type: drop_relationship

.circleci/server-upgrade/hasura/migrations/1551151820765_add_relationship_articlesByauthorId_table_public_author.up.yaml

@@ -0,0 +1,12 @@
+- args:
+    name: articlesByauthorId
+    table:
+      name: author
+      schema: public
+    using:
+      foreign_key_constraint_on:
+        column: author_id
+        table:
+          name: article
+          schema: public
+  type: create_array_relationship

.circleci/server-upgrade/hasura/migrations/1551271368044_update_permission_user_public_table_author.down.yaml

@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: author
+      schema: public
+  type: drop_insert_permission

.circleci/server-upgrade/hasura/migrations/1551271368044_update_permission_user_public_table_author.up.yaml

@@ -0,0 +1,15 @@
+- args:
+    permission:
+      allow_upsert: true
+      check:
+        id:
+          _eq: X-Hasura-User-Id
+      columns:
+      - name
+      set:
+        id: x-hasura-user-id
+    role: user
+    table:
+      name: author
+      schema: public
+  type: create_insert_permission

.circleci/server-upgrade/hasura/migrations/1551271380134_update_permission_user_public_table_author.down.yaml

@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: author
+      schema: public
+  type: drop_select_permission

.circleci/server-upgrade/hasura/migrations/1551271380134_update_permission_user_public_table_author.up.yaml

@@ -0,0 +1,15 @@
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - id
+      - name
+      filter:
+        id:
+          _eq: X-Hasura-User-Id
+      limit: null
+    role: user
+    table:
+      name: author
+      schema: public
+  type: create_select_permission

.circleci/server-upgrade/hasura/migrations/1551271390609_update_permission_user_public_table_author.down.yaml

@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: author
+      schema: public
+  type: drop_update_permission

.circleci/server-upgrade/hasura/migrations/1551271390609_update_permission_user_public_table_author.up.yaml

@@ -0,0 +1,13 @@
+- args:
+    permission:
+      columns:
+      - name
+      filter:
+        id:
+          _eq: X-Hasura-User-Id
+      set: {}
+    role: user
+    table:
+      name: author
+      schema: public
+  type: create_update_permission

.circleci/server-upgrade/hasura/migrations/1551271394593_update_permission_user_public_table_author.down.yaml

@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: author
+      schema: public
+  type: drop_delete_permission

.circleci/server-upgrade/hasura/migrations/1551271394593_update_permission_user_public_table_author.up.yaml

@@ -0,0 +1,10 @@
+- args:
+    permission:
+      filter:
+        id:
+          _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: author
+      schema: public
+  type: create_delete_permission

.circleci/server-upgrade/hasura/migrations/1551271434010_update_permission_user_public_table_article.down.yaml

@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: article
+      schema: public
+  type: drop_insert_permission

.circleci/server-upgrade/hasura/migrations/1551271434010_update_permission_user_public_table_article.up.yaml

@@ -0,0 +1,16 @@
+- args:
+    permission:
+      allow_upsert: true
+      check:
+        author_id:
+          _eq: X-Hasura-User-Id
+      columns:
+      - id
+      - title
+      set:
+        author_id: x-hasura-user-id
+    role: user
+    table:
+      name: article
+      schema: public
+  type: create_insert_permission

.circleci/server-upgrade/hasura/migrations/1551271446402_update_permission_user_public_table_article.down.yaml

@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: article
+      schema: public
+  type: drop_select_permission

.circleci/server-upgrade/hasura/migrations/1551271446402_update_permission_user_public_table_article.up.yaml

@@ -0,0 +1,16 @@
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - author_id
+      - id
+      - title
+      filter:
+        author_id:
+          _eq: X-Hasura-User-Id
+      limit: null
+    role: user
+    table:
+      name: article
+      schema: public
+  type: create_select_permission

.circleci/server-upgrade/hasura/migrations/1551271457684_update_permission_user_public_table_article.down.yaml

@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: article
+      schema: public
+  type: drop_update_permission

.circleci/server-upgrade/hasura/migrations/1551271457684_update_permission_user_public_table_article.up.yaml

@@ -0,0 +1,13 @@
+- args:
+    permission:
+      columns:
+      - title
+      filter:
+        author_id:
+          _eq: X-Hasura-User-Id
+      set: {}
+    role: user
+    table:
+      name: article
+      schema: public
+  type: create_update_permission

.circleci/server-upgrade/hasura/migrations/1551271461819_update_permission_user_public_table_article.down.yaml

@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: article
+      schema: public
+  type: drop_delete_permission

.circleci/server-upgrade/hasura/migrations/1551271461819_update_permission_user_public_table_article.up.yaml

@@ -0,0 +1,10 @@
+- args:
+    permission:
+      filter:
+        author_id:
+          _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: article
+      schema: public
+  type: create_delete_permission

.circleci/server-upgrade/hasura/migrations/1551271959908_create_trigger_author_echo.down.yaml

@@ -0,0 +1,3 @@
+- args:
+    name: author_echo
+  type: delete_event_trigger