Add support for websearch_to_tsquery in PG 11

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,8 +2,8 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: bug
-assignees: ''
+labels: ''
+assignees: dosco
 
 ---
 

.github/ISSUE_TEMPLATE/documentation.md

@@ -2,8 +2,8 @@
 name: Documentation
 about: Suggest how we can improve documentation
 title: ''
-labels: bug, docs
-assignees: ''
+labels: ''
+assignees: dosco
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,13 +2,19 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: enhancement
-assignees: ''
+labels: ''
+assignees: dosco
 
 ---
 
-<!-- Please only use this template for submitting feature requests -->
+## Experience Report
 
-**What would you like to be added**:
+Note: Feature requests are judged based on user experience this is similar to the [Go Experience Reports](https://github.com/golang/go/wiki/ExperienceReports). These reports should focus on the problems: they should not focus on and need not propose solutions.
 
-**Why is this needed**:
+### What you wanted to do
+
+### What you actually did
+
+### Why that wasn't great, with examples
+
+### Any external references to support your case

.gitignore

@@ -24,15 +24,14 @@
 /demo/tmp
 
 .vscode
+main
 .DS_Store
 .swp
 .release
 main
 super-graph
+supergraph
 *-fuzz.zip
 crashers
 suppressions
-release
-.gofuzz
-*-fuzz.zip
-
+release

CHANGELOG.md

@@ -1,44 +1,6 @@
 <a name="unreleased"></a>
 ## [Unreleased]
 
-### Add
-- Add config driven custom table relationships
-- Add support for `websearch_to_tsquery` in PG 11
-
-### Create
-- Create CODE_OF_CONDUCT.md
-
-### Fix
-- Fix bug with remote join example
-- Fix grammer / syntax
-
-### Update
-- Update issue templates
-- Update CONTRIBUTING.md
-- Update issue templates
-- Update feature_request.md
-
-
-<a name="v0.12.6"></a>
-## [v0.12.6] - 2019-12-02
-### Add
-- Add support for `websearch_to_tsquery` in PG 11
-
-
-<a name="v0.12.5"></a>
-## [v0.12.5] - 2019-11-30
-### Add
-- Add a guide to the internals of the codebase
-- Add a CONTRIBUTING.md guide for contributors
-- Add a CHANGLOG.md
-- Add issue templates
-
-### Fix
-- Fix for missing filters on nested selectors
-
-### Refactor
-- Refactor rename 'Select.Table` to `Select.Name`
-
 
 <a name="v0.12.4"></a>
 ## [v0.12.4] - 2019-11-28
@@ -395,9 +357,7 @@
 - Fix license to MIT
 
 
-[Unreleased]: https://github.com/dosco/super-graph/compare/v0.12.6...HEAD
-[v0.12.6]: https://github.com/dosco/super-graph/compare/v0.12.5...v0.12.6
-[v0.12.5]: https://github.com/dosco/super-graph/compare/v0.12.4...v0.12.5
+[Unreleased]: https://github.com/dosco/super-graph/compare/v0.12.4...HEAD
 [v0.12.4]: https://github.com/dosco/super-graph/compare/v0.12.3...v0.12.4
 [v0.12.3]: https://github.com/dosco/super-graph/compare/v0.12.2...v0.12.3
 [v0.12.2]: https://github.com/dosco/super-graph/compare/v0.12.1...v0.12.2

CODE_OF_CONDUCT.md

@@ -1,3 +0,0 @@
-# Code of Conduct
-
-Be excellent to each other. Treat others the way you'd like to be treated. We are all here to learn, build great software and make new friends.

CONTRIBUTING.md

@@ -8,21 +8,21 @@ Even the GraphQL to SQL compiler that is at the heart of Super Graph is essentia
 
 Finally we do have a lot of test for critical parts of the codebase which makes it easy for you to modify with confidence. I'm always available for questions or any sort of guidance so feel fee to reach out over twitter or discord.
 
-* [Getting Started](#getting-started)
-* [Setting Up the Development Environment](#setup-development-environment)
+* [Getting Started](#get-started)
+* [Setting Up the Development Environment](#get-setup)
    * [Prerequisites](#prerequisites)
-   * [Get the Super Graph source](#get-source-code)
-   * [Start the development envoirnment ](#start-the-development-envoirnment)
-   * [Testing](#testing-and-linting)
+   * [Get the Super Graph source](#get-source)
+   * [Start the development envoirnment ](#start-dev)
+   * [Testing](#testing)
 * [Contributing](#contributing)
    * [Guidelines](#guidelines)
    * [Code style](#code-style)
 
-## Getting Started
+## Getting Started {#get-started}
 
 - Read the [Getting Started Guide](https://supergraph.dev/guide.html#get-started)
 
-## Setup Development Environment
+## Setting Up the Development Environment {#get-setup}
 
 ### Prerequisites
 
@@ -30,7 +30,7 @@ Finally we do have a lot of test for critical parts of the codebase which makes
 - Install [Go 1.13 or above](https://golang.org/doc/install)
 - Install [Docker](https://docs.docker.com/v17.09/engine/installation/)
 
-### Get source code
+### Get the Super Graph source {#get-source}
 
 The entire build flow uses `Makefile` there is a whole list of sub-commands you
 can use to build, test, install, lint, etc.
@@ -41,7 +41,7 @@ cd ./super-graph
 make help
 ```
 
-### Start the development envoirnment
+### Start the development envoirnment {#start-dev}
 
 The entire development flow is packaged into a `docker-compose` work flow. The below `up` command will launch A Postgres database, a example e-commerce app in Rails and Super Graph in development mode. The `db:seed` Rails task will insert sample data into Postgres.
 
@@ -54,7 +54,7 @@ docker-compose up
 
 [Super Graph codebase explained](https://supergraph.dev/internals.html)
 
-### Testing and Linting
+### Testing and Linting {#testing}
 
 ```
 make lint test
@@ -62,8 +62,6 @@ make lint test
 
 ## Contributing
 
-### Guidelines
-
 - **Pull requests are welcome**, as long as you're willing to put in the effort to meet the guidelines.
 - Aim for clear, well written, maintainable code.
 - Simple and minimal approach to features, like Go.
@@ -74,9 +72,8 @@ make lint test
 - Leave the code cleaner than when you began.
 
 ### Code style
-
 - We're following [Go Code Review](https://github.com/golang/go/wiki/CodeReviewComments).
 - Use `go fmt` to format your code before committing.
 - If you see *any code* which clearly violates the style guide, please fix it and send a pull request. No need to ask for permission.
 - Avoid unnecessary vertical spaces. Use your judgment or follow the code review comments.
-- Wrap your code and comments to 100 characters, unless doing so makes the code less legible.
+- Wrap your code and comments to 100 characters, unless doing so makes the code less legible.

Dockerfile

@@ -1,31 +1,24 @@
 # stage: 1
 FROM node:10 as react-build
 WORKDIR /web
-COPY /internal/serv/web/ ./
+COPY web/ ./
 RUN yarn
 RUN yarn build
 
-
-
 # stage: 2
-FROM golang:1.14-alpine as go-build
+FROM golang:1.13.4-alpine as go-build
 RUN apk update && \
     apk add --no-cache make && \
     apk add --no-cache git && \
-    apk add --no-cache jq && \
     apk add --no-cache upx=3.95-r2
 
 RUN GO111MODULE=off go get -u github.com/rafaelsq/wtc
 
-ARG SOPS_VERSION=3.5.0
-ADD https://github.com/mozilla/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux /usr/local/bin/sops
-RUN chmod 755 /usr/local/bin/sops
-
 WORKDIR /app
 COPY . /app
 
-RUN mkdir -p /app/internal/serv/web/build
-COPY --from=react-build /web/build/ ./internal/serv/web/build
+RUN mkdir -p /app/web/build
+COPY --from=react-build /web/build/ ./web/build/
 
 RUN go mod vendor
 RUN make build
@@ -33,8 +26,6 @@ RUN echo "Compressing binary, will take a bit of time..." && \
   upx --ultra-brute -qq super-graph && \
   upx -t super-graph
 
-
-
 # stage: 3
 FROM alpine:latest
 WORKDIR /
@@ -45,15 +36,10 @@ RUN mkdir -p /config
 COPY --from=go-build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=go-build /app/config/* /config/
 COPY --from=go-build /app/super-graph .
-COPY --from=go-build /app/internal/scripts/start.sh .
-COPY --from=go-build /usr/local/bin/sops .
 
 RUN chmod +x /super-graph
-RUN chmod +x /start.sh
-
 USER nobody
 
-ENV GO_ENV production
+EXPOSE 8080
 
-ENTRYPOINT ["./start.sh"]
-CMD ["./super-graph", "serv"]
+CMD ./super-graph serv

Makefile

@@ -12,10 +12,10 @@ endif
 export GO111MODULE := on
 
 # Build-time Go variables
-version        = github.com/dosco/super-graph/internal/serv.version
-gitBranch      = github.com/dosco/super-graph/internal/serv.gitBranch
-lastCommitSHA  = github.com/dosco/super-graph/internal/serv.lastCommitSHA
-lastCommitTime = github.com/dosco/super-graph/internal/serv.lastCommitTime
+version        = github.com/dosco/super-graph/serv.version
+gitBranch      = github.com/dosco/super-graph/serv.gitBranch
+lastCommitSHA  = github.com/dosco/super-graph/serv.lastCommitSHA
+lastCommitTime = github.com/dosco/super-graph/serv.lastCommitTime
 
 BUILD_FLAGS ?= -ldflags '-s -w -X ${lastCommitSHA}=${BUILD} -X "${lastCommitTime}=${BUILD_DATE}" -X "${version}=${BUILD_VERSION}" -X ${gitBranch}=${BUILD_BRANCH}'
 
@@ -25,21 +25,15 @@ test:
 	@go test -v ./...
 
 BIN_DIR := $(GOPATH)/bin
-GORICE := $(BIN_DIR)/rice
+GORICE := $(BIN_DIR)/github.com/GeertJohan/go.rice
 GOLANGCILINT := $(BIN_DIR)/golangci-lint
 GITCHGLOG := $(BIN_DIR)/git-chglog
-WEB_BUILD_DIR := ./internal/serv/web/build/manifest.json
 
 $(GORICE):
 	@GO111MODULE=off go get -u github.com/GeertJohan/go.rice/rice
 
-$(WEB_BUILD_DIR):
-	@echo "First install Yarn and create a build of the web UI then re-run make install"
-	@echo "Run this command: yarn --cwd internal/serv/web/ build"
-	@exit 1
-
 $(GITCHGLOG):
-	@GO111MODULE=off go get -u github.com/git-chglog/git-chglog/git-chglog
+	@GO111MODULE=off go get -u github.com/git-chglog/git-chglog/cmd/git-chglog
 
 changelog: $(GITCHGLOG)
 	@git-chglog $(ARGS)
@@ -47,7 +41,7 @@ changelog: $(GITCHGLOG)
 $(GOLANGCILINT):
 	@GO111MODULE=off curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOPATH)/bin v1.21.0
 
-lint: $(GOLANGCILINT)
+lint: $(GOMETALINTER)
 	@golangci-lint run ./... --skip-dirs-use-default
 
 BINARY := super-graph
@@ -55,9 +49,9 @@ LDFLAGS := -s -w
 PLATFORMS := windows linux darwin
 os = $(word 1, $@)
 
-$(PLATFORMS): lint test 
+$(PLATFORMS): lint test gen 
 	@mkdir -p release
-	@GOOS=$(os) GOARCH=amd64 go build $(BUILD_FLAGS) -o release/$(BINARY)-$(BUILD_VERSION)-$(os)-amd64 main.go
+	@GOOS=$(os) GOARCH=amd64 go build $(BUILD_FLAGS) -o release/$(BINARY)-$(BUILD_VERSION)-$(os)-amd64
 
 release: windows linux darwin
 
@@ -65,11 +59,11 @@ all: lint test $(BINARY)
 
 build: $(BINARY)
 
-gen: $(GORICE) $(WEB_BUILD_DIR)
+gen: $(GORICE)
 	@go generate ./...
 
-$(BINARY): clean
-	@go build $(BUILD_FLAGS) -o $(BINARY) main.go 
+$(BINARY): clean gen
+	@go build $(BUILD_FLAGS) -o $(BINARY)
 
 clean:
 	@rm -f $(BINARY)
@@ -77,10 +71,11 @@ clean:
 run: clean
 	@go run $(BUILD_FLAGS) main.go $(ARGS)
 
-install: clean build
+install: gen
+	@echo $(GOPATH)
 	@echo "Commit Hash: `git rev-parse HEAD`"
 	@echo "Old Hash: `shasum $(GOPATH)/bin/$(BINARY) 2>/dev/null | cut -c -32`"
-	@mv $(BINARY) $(GOPATH)/bin/$(BINARY)
+	@go install $(BUILD_FLAGS)
 	@echo "New Hash:" `shasum $(GOPATH)/bin/$(BINARY) 2>/dev/null | cut -c -32`
 
 uninstall: clean

README.md

@@ -1,71 +1,25 @@
-<img src="docs/guide/.vuepress/public/super-graph.png" width="250" />
+<!-- <a href="https://supergraph.dev"><img src="https://supergraph.dev/hologram.svg" width="100" height="100" align="right" /></a> -->
+
+<img src="docs/.vuepress/public/super-graph.png" width="250" />
 
 ### Build web products faster. Secure high performance GraphQL
 
-[![GoDoc](https://img.shields.io/badge/godoc-reference-5272B4.svg)](https://pkg.go.dev/github.com/dosco/super-graph/core?tab=doc)
-![Apache 2.0](https://img.shields.io/github/license/dosco/super-graph.svg?style=flat-square)
-![Docker build](https://img.shields.io/docker/cloud/build/dosco/super-graph.svg?style=flat-square)
-![Cloud native](https://img.shields.io/badge/cloud--native-enabled-blue.svg?style=flat-squareg)
+![Apache Public License 2.0](https://img.shields.io/github/license/dosco/super-graph.svg)
+![Docker build](https://img.shields.io/docker/cloud/build/dosco/super-graph.svg)
+![Cloud native](https://img.shields.io/badge/cloud--native-enabled-blue.svg)
 [![Discord Chat](https://img.shields.io/discord/628796009539043348.svg)](https://discord.gg/6pSWCTZ)  
 
-## What's Super Graph?
 
-Designed to 100x your developer productivity. Super Graph will instantly and without you writing code provide you a high performance GraphQL API for Postgres DB. GraphQL queries are compiled into a single fast SQL query. Super Graph is a GO library and a service, use it in your own code or run it as a seperate service.
+## What is Super Graph
 
-## Using it as a service
+Super Graph is a micro-service that instantly and without code gives you a high performance and secure GraphQL API. Your GraphQL queries are auto translated into a single fast SQL query. No more writing API code as you develop your web frontend just make the query you need and Super Graph will do the rest.
 
-```console
-get get https://github.com/dosco/super-graph 
-super-graph new <app_name>
-```
+Super Graph has a rich feature set like integrating with your existing Ruby on Rails apps, joining your DB with data from remote APIs, Role and Attribute based access control, Supoport for JWT tokens, Built-in DB mutations and seeding and a lot more.
 
-## Using it in your own code
+![GraphQL](docs/.vuepress/public/graphql.png?raw=true "")
 
-```golang
-package main
 
-import (
-  "database/sql"
-  "fmt"
-  "time"
-  "github.com/dosco/super-graph/core"
-  _ "github.com/jackc/pgx/v4/stdlib"
-)
-
-func main() {
-  db, err := sql.Open("pgx", "postgres://postgrs:@localhost:5432/example_db")
-  if err != nil {
-    log.Fatalf(err)
-  }
-
-  conf, err := core.ReadInConfig("./config/dev.yml")
-  if err != nil {
-    log.Fatalf(err)
-  }
-
-  sg, err = core.NewSuperGraph(conf, db)
-  if err != nil {
-    log.Fatalf(err)
-  }
-
-  query := `
-    query {
-      posts {
-      id
-      title
-    }
-  }`
-
-  res, err := sg.GraphQL(context.Background(), query, nil)
-  if err != nil {
-    log.Fatalf(err)
-  }
-
-  fmt.Println(string(res.Data))
-}
-```
-
-## About Super Graph
+## The story of Super Graph?
 
 After working on several products through my career I find that we spend way too much time on building API backends. Most APIs also require constant updating, this costs real time and money.
             
@@ -79,23 +33,31 @@ This compiler is what sits at the heart of Super Graph with layers of useful fun
 
 ## Features
 
-- Complex nested queries and mutations
-- Auto learns database tables and relationships
 - Role and Attribute based access control
-- Opaque cursor based efficient pagination
+- Works with existing Ruby-On-Rails apps
+- Automatically learns database schemas and relationships
 - Full text search and aggregations
-- JWT tokens supported (Auth0, etc)
-- Join database queries with remote REST APIs
-- Also works with existing Ruby-On-Rails apps
 - Rails authentication supported (Redis, Memcache, Cookie)
+- JWT tokens supported (Auth0, etc)
+- Join database with remote REST APIs
+- Highly optimized and fast Postgres SQL queries
+- GraphQL queries and mutations
 - A simple config file
 - High performance GO codebase
 - Tiny docker image and low memory requirements
 - Fuzz tested for security
 - Database migrations tool
 - Database seeding tool
-- Works with Postgres and YugabyteDB
 
+## Get started
+
+```
+git clone https://github.com/dosco/super-graph 
+cd ./super-graph
+make install
+
+super-graph new <app_name>
+```
 
 ## Documentation
 

config/allow.list

@@ -182,574 +182,4 @@ query beerSearch {
   }
 }
 
-query {
-  user {
-    id
-    full_name
-  }
-}
-
-variables {
-	"data": {
-		"email": "goo1@rug.com",
-		"full_name": "The Dude",
-		"created_at": "now",
-		"updated_at": "now",
-		"product": {
-			"name": "Apple",
-			"price": 1.25,
-			"created_at": "now",
-			"updated_at": "now"
-		}
-	}
-}
-
-mutation {
-  user(insert: $data) {
-    id
-    full_name
-    email
-    product {
-      id
-      name
-      price
-    }
-  }
-}
-
-variables {
-	"data": {
-		"email": "goo12@rug.com",
-		"full_name": "The Dude",
-		"created_at": "now",
-		"updated_at": "now",
-		"product": [
-			{
-				"name": "Banana 1",
-				"price": 1.1,
-				"created_at": "now",
-				"updated_at": "now"
-			},
-			{
-				"name": "Banana 2",
-				"price": 2.2,
-				"created_at": "now",
-				"updated_at": "now"
-			}
-		]
-	}
-}
-
-mutation {
-  user(insert: $data) {
-    id
-    full_name
-    email
-    products {
-      id
-      name
-      price
-    }
-  }
-}
-
-variables {
-	"data": {
-		"name": "Banana 3",
-		"price": 1.1,
-		"created_at": "now",
-		"updated_at": "now",
-		"user": {
-			"email": "a2@a.com",
-			"full_name": "The Dude",
-			"created_at": "now",
-			"updated_at": "now"
-		}
-	}
-}
-
-mutation {
-  products(insert: $data) {
-    id
-    name
-    price
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-
-variables {
-	"update": {
-		"name": "my_name",
-		"description": "my_desc"
-	}
-}
-
-mutation {
-  product(id: 15, update: $update, where: {id: {eq: 1}}) {
-    id
-    name
-  }
-}
-
-variables {
-	"update": {
-		"name": "my_name",
-		"description": "my_desc"
-	}
-}
-
-mutation {
-  product(update: $update, where: {id: {eq: 1}}) {
-    id
-    name
-  }
-}
-
-variables {
-	"update": {
-		"name": "my_name 2",
-		"description": "my_desc 2"
-	}
-}
-
-mutation {
-  product(update: $update, where: {id: {eq: 1}}) {
-    id
-    name
-    description
-  }
-}
-
-variables {
-	"data": {
-		"sale_type": "tuutuu",
-		"quantity": 5,
-		"due_date": "now",
-		"customer": {
-			"email": "thedude1@rug.com",
-			"full_name": "The Dude"
-		},
-		"product": {
-			"name": "Apple",
-			"price": 1.25
-		}
-	}
-}
-
-mutation {
-  purchase(update: $data, id: 5) {
-    sale_type
-    quantity
-    due_date
-    customer {
-      id
-      full_name
-      email
-    }
-    product {
-      id
-      name
-      price
-    }
-  }
-}
-
-variables {
-	"data": {
-		"email": "thedude@rug.com",
-		"full_name": "The Dude",
-		"created_at": "now",
-		"updated_at": "now",
-		"product": {
-			"where": {
-				"id": 2
-			},
-			"name": "Apple",
-			"price": 1.25,
-			"created_at": "now",
-			"updated_at": "now"
-		}
-	}
-}
-
-mutation {
-  user(update: $data, where: {id: {eq: 8}}) {
-    id
-    full_name
-    email
-    product {
-      id
-      name
-      price
-    }
-  }
-}
-
-variables {
-	"data": {
-		"email": "thedude@rug.com",
-		"full_name": "The Dude",
-		"created_at": "now",
-		"updated_at": "now",
-		"product": {
-			"where": {
-				"id": 2
-			},
-			"name": "Apple",
-			"price": 1.25,
-			"created_at": "now",
-			"updated_at": "now"
-		}
-	}
-}
-
-query {
-  user(where: {id: {eq: 8}}) {
-    id
-    product {
-      id
-      name
-      price
-    }
-  }
-}
-
-variables {
-	"data": {
-		"name": "Apple",
-		"price": 1.25,
-		"created_at": "now",
-		"updated_at": "now",
-		"user": {
-			"email": "thedude@rug.com"
-		}
-	}
-}
-
-query {
-  user {
-    email
-  }
-}
-
-variables {
-	"data": {
-		"name": "Apple",
-		"price": 1.25,
-		"created_at": "now",
-		"updated_at": "now",
-		"user": {
-			"email": "booboo@demo.com"
-		}
-	}
-}
-
-mutation {
-  product(update: $data, id: 6) {
-    id
-    name
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-
-variables {
-	"data": {
-		"name": "Apple",
-		"price": 1.25,
-		"created_at": "now",
-		"updated_at": "now",
-		"user": {
-			"email": "booboo@demo.com"
-		}
-	}
-}
-
-query {
-  product(id: 6) {
-    id
-    name
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-
-variables {
-	"data": {
-		"email": "thedude123@rug.com",
-		"full_name": "The Dude",
-		"created_at": "now",
-		"updated_at": "now",
-		"product": {
-			"connect": {
-				"id": 7
-			},
-			"disconnect": {
-				"id": 8
-			}
-		}
-	}
-}
-
-mutation {
-  user(update: $data, id: 6) {
-    id
-    full_name
-    email
-    product {
-      id
-      name
-      price
-    }
-  }
-}
-
-variables {
-	"data": {
-		"name": "Apple",
-		"price": 1.25,
-		"created_at": "now",
-		"updated_at": "now",
-		"user": {
-			"connect": {
-				"id": 5,
-				"email": "test@test.com"
-			}
-		}
-	}
-}
-
-mutation {
-  product(update: $data, id: 9) {
-    id
-    name
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-
-variables {
-	"data": {
-		"email": "thed44ude@rug.com",
-		"full_name": "The Dude",
-		"created_at": "now",
-		"updated_at": "now",
-		"product": {
-			"connect": {
-				"id": 5
-			}
-		}
-	}
-}
-
-mutation {
-  user(insert: $data) {
-    id
-    full_name
-    email
-    product {
-      id
-      name
-      price
-    }
-  }
-}
-
-variables {
-	"data": {
-		"name": "Apple",
-		"price": 1.25,
-		"created_at": "now",
-		"updated_at": "now",
-		"user": {
-			"connect": {
-				"id": 5
-			}
-		}
-	}
-}
-
-mutation {
-  product(insert: $data) {
-    id
-    name
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-
-variables {
-	"data": [
-		{
-			"name": "Apple",
-			"price": 1.25,
-			"created_at": "now",
-			"updated_at": "now",
-			"user": {
-				"connect": {
-					"id": 6
-				}
-			}
-		},
-		{
-			"name": "Coconut",
-			"price": 2.25,
-			"created_at": "now",
-			"updated_at": "now",
-			"user": {
-				"connect": {
-					"id": 3
-				}
-			}
-		}
-	]
-}
-
-mutation {
-  products(insert: $data) {
-    id
-    name
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-
-variables {
-	"data": [
-		{
-			"name": "Apple",
-			"price": 1.25,
-			"created_at": "now",
-			"updated_at": "now"
-		},
-		{
-			"name": "Coconut",
-			"price": 2.25,
-			"created_at": "now",
-			"updated_at": "now"
-		}
-	]
-}
-
-mutation {
-  products(insert: $data) {
-    id
-    name
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-
-variables {
-	"data": {
-		"name": "Apple",
-		"price": 1.25,
-		"user": {
-			"connect": {
-				"id": 5,
-				"email": "test@test.com"
-			}
-		}
-	}
-}
-
-mutation {
-  product(update: $data, id: 9) {
-    id
-    name
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-
-variables {
-	"data": {
-		"name": "Apple",
-		"price": 1.25,
-		"user": {
-			"connect": {
-				"id": 5
-			}
-		}
-	}
-}
-
-mutation {
-  product(update: $data, id: 9) {
-    id
-    name
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-
-variables {
-	"data": {
-		"name": "Apple",
-		"price": 1.25,
-		"user": {
-			"disconnect": {
-				"id": 5
-			}
-		}
-	}
-}
-
-mutation {
-  product(update: $data, id: 9) {
-    id
-    name
-    user_id
-  }
-}
-
-
-variables {
-	"data": {
-		"name": "Apple",
-		"price": 1.25,
-		"user": {
-			"disconnect": {
-				"id": 5
-			}
-		}
-	}
-}
-
-mutation {
-  product(update: $data, id: 2) {
-    id
-    name
-    user_id
-  }
-}
-
 

config/dev.yml

@@ -2,12 +2,9 @@ app_name: "Super Graph Development"
 host_port: 0.0.0.0:8080
 web_ui: true
 
-# debug, error, warn, info, none
+# debug, info, warn, error, fatal, panic
 log_level: "debug"
 
-# enable or disable http compression (uses gzip)
-http_compress: true
-
 # When production mode is 'true' only queries 
 # from the allow list are permitted.
 # When it's 'false' all queries are saved to the
@@ -30,20 +27,7 @@ reload_on_config_change: true
 # seed_file: seed.js
 
 # Path pointing to where the migrations can be found
-migrations_path: ./migrations
-
-# Secret key for general encryption operations like 
-# encrypting the cursor data
-secret_key: supercalifajalistics
-
-# CORS: A list of origins a cross-domain request can be executed from. 
-# If the special * value is present in the list, all origins will be allowed. 
-# An origin may contain a wildcard (*) to replace 0 or more 
-# characters (i.e.: http://*.domain.com).
-cors_allowed_origins: ["*"]
-
-# Debug Cross Origin Resource Sharing requests
-cors_debug: true
+migrations_path: ./config/migrations
 
 # Postgres related environment Variables
 # SG_DATABASE_HOST
@@ -102,7 +86,7 @@ database:
   port: 5432
   dbname: app_development
   user: postgres
-  password: postgres
+  password: ''
 
   #schema: "public"
   #pool_size: 10
@@ -113,21 +97,18 @@ database:
   # Enable this if you need the user id in triggers, etc
   set_user_id: false
 
-  # database ping timeout is used for db health checking
-  ping_timeout: 1m
+  # Define additional variables here to be used with filters
+  variables:
+    admin_account_id: "5"
 
-# Define additional variables here to be used with filters
-variables:
-  admin_account_id: "5"
-
-# Field and table names that you wish to block
-blocklist:
-  - ar_internal_metadata
-  - schema_migrations
-  - secret
-  - password
-  - encrypted
-  - token
+  # Field and table names that you wish to block
+  blocklist:
+    - ar_internal_metadata
+    - schema_migrations
+    - secret
+    - password
+    - encrypted
+    - token
 
 tables:
   - name: customers
@@ -153,12 +134,6 @@ tables:
   - name: deals
     table: products
 
-  - name: users
-    columns:
-      - name: email
-        related_to: products.name
-
-
 roles_query: "SELECT * FROM users WHERE id = $user_id"
 
 roles:
@@ -180,13 +155,10 @@ roles:
           block: false
 
       - name: deals
-        query:
-          limit: 3
-          aggregation: false
 
-      - name: purchases
         query:
           limit: 3
+          columns: ["name", "description" ]
           aggregation: false
 
   - name: user
@@ -199,10 +171,12 @@ roles:
         query:
           limit: 50
           filters: ["{ user_id: { eq: $user_id } }"]
+          columns: ["id", "name", "description", "search_rank", "search_headline_description" ]
           disable_functions: false
 
         insert:
           filters: ["{ user_id: { eq: $user_id } }"]
+          columns: ["id", "name", "description" ]
           presets:
             - user_id: "$user_id"
             - created_at: "now"

config/prod.yml

@@ -6,12 +6,9 @@ app_name: "Super Graph Production"
 host_port: 0.0.0.0:8080
 web_ui: false
 
-# debug, error, warn, info, none
+# debug, info, warn, error, fatal, panic, disable
 log_level: "info"
 
-# enable or disable http compression (uses gzip)
-http_compress: true
-
 # When production mode is 'true' only queries 
 # from the allow list are permitted.
 # When it's 'false' all queries are saved to the
@@ -30,11 +27,7 @@ enable_tracing: true
 # seed_file: seed.js
 
 # Path pointing to where the migrations can be found
-# migrations_path: ./migrations
-
-# Secret key for general encryption operations like 
-# encrypting the cursor data
-# secret_key: supercalifajalistics
+# migrations_path: migrations
 
 # Postgres related environment Variables
 # SG_DATABASE_HOST
@@ -54,14 +47,11 @@ database:
   port: 5432
   dbname: app_production
   user: postgres
-  password: postgres
+  password: ''
   #pool_size: 10
   #max_retries: 0
   #log_level: "debug" 
 
   # Set session variable "user.id" to the user id
   # Enable this if you need the user id in triggers, etc
-  set_user_id: false
-
-  # database ping timeout is used for db health checking
-  ping_timeout: 5m
+  set_user_id: false

config/seed.js

@@ -11,7 +11,7 @@ for (i = 0; i < user_count; i++) {
   var pwd = fake.password()
   var data = {
     full_name: fake.name(),
-    avatar: fake.avatar_url(200),
+    avatar: fake.image_url(),
     phone: fake.phone(),
     email: fake.email(),
     password: pwd,

core/api.go

@@ -1,180 +0,0 @@
-// Package core provides the primary API to include and use Super Graph with your own code.
-// For detailed documentation visit https://supergraph.dev
-//
-// Example usage:
-/*
-	package main
-
-	import (
-		"database/sql"
-		"fmt"
-		"time"
-		"github.com/dosco/super-graph/core"
-		_ "github.com/jackc/pgx/v4/stdlib"
-	)
-
-	func main() {
-		db, err := sql.Open("pgx", "postgres://postgrs:@localhost:5432/example_db")
-		if err != nil {
-			log.Fatalf(err)
-		}
-
-		conf, err := core.ReadInConfig("./config/dev.yml")
-		if err != nil {
-			log.Fatalf(err)
-		}
-
-		sg, err = core.NewSuperGraph(conf, db)
-		if err != nil {
-			log.Fatalf(err)
-		}
-
-		query := `
-			query {
-				posts {
-				id
-				title
-			}
-		}`
-
-		res, err := sg.GraphQL(context.Background(), query, nil)
-		if err != nil {
-			log.Fatalf(err)
-		}
-
-		fmt.Println(string(res.Data))
-	}
-*/
-package core
-
-import (
-	"context"
-	"crypto/sha256"
-	"database/sql"
-	"encoding/json"
-	_log "log"
-	"os"
-
-	"github.com/dosco/super-graph/core/internal/allow"
-	"github.com/dosco/super-graph/core/internal/crypto"
-	"github.com/dosco/super-graph/core/internal/psql"
-	"github.com/dosco/super-graph/core/internal/qcode"
-)
-
-type contextkey int
-
-// Constants to set values on the context passed to the NewSuperGraph function
-const (
-	// Name of the authentication provider. Eg. google, github, etc
-	UserIDProviderKey contextkey = iota
-
-	// User ID value for authenticated users
-	UserIDKey
-
-	// User role if pre-defined
-	UserRoleKey
-)
-
-// SuperGraph struct is an instance of the Super Graph engine it holds all the required information like
-// datase schemas, relationships, etc that the GraphQL to SQL compiler would need to do it's job.
-type SuperGraph struct {
-	conf        *Config
-	db          *sql.DB
-	log         *_log.Logger
-	schema      *psql.DBSchema
-	allowList   *allow.List
-	encKey      [32]byte
-	prepared    map[string]*preparedItem
-	roles       map[string]*Role
-	getRole     *sql.Stmt
-	rmap        map[uint64]*resolvFn
-	abacEnabled bool
-	anonExists  bool
-	qc          *qcode.Compiler
-	pc          *psql.Compiler
-}
-
-// NewSuperGraph creates the SuperGraph struct, this involves querying the database to learn its
-// schemas and relationships
-func NewSuperGraph(conf *Config, db *sql.DB) (*SuperGraph, error) {
-	sg := &SuperGraph{
-		conf: conf,
-		db:   db,
-		log:  _log.New(os.Stdout, "", 0),
-	}
-
-	if err := sg.initConfig(); err != nil {
-		return nil, err
-	}
-
-	if err := sg.initCompilers(); err != nil {
-		return nil, err
-	}
-
-	if err := sg.initAllowList(); err != nil {
-		return nil, err
-	}
-
-	if err := sg.initPrepared(); err != nil {
-		return nil, err
-	}
-
-	if err := sg.initResolvers(); err != nil {
-		return nil, err
-	}
-
-	if len(conf.SecretKey) != 0 {
-		sk := sha256.Sum256([]byte(conf.SecretKey))
-		conf.SecretKey = ""
-		sg.encKey = sk
-	} else {
-		sg.encKey = crypto.NewEncryptionKey()
-	}
-
-	return sg, nil
-}
-
-// Result struct contains the output of the GraphQL function this includes resulting json from the
-// database query and any error information
-type Result struct {
-	op   qcode.QType
-	name string
-	sql  string
-	role string
-
-	Error      string          `json:"message,omitempty"`
-	Data       json.RawMessage `json:"data,omitempty"`
-	Extensions *extensions     `json:"extensions,omitempty"`
-}
-
-// GraphQL function is called on the SuperGraph struct to convert the provided GraphQL query into an
-// SQL query and execute it on the database. In production mode prepared statements are directly used
-// and no query compiling takes places.
-//
-// In developer mode all names queries are saved into a file `allow.list` and in production mode only
-// queries from this file can be run.
-func (sg *SuperGraph) GraphQL(c context.Context, query string, vars json.RawMessage) (*Result, error) {
-	ct := scontext{Context: c, sg: sg, query: query, vars: vars}
-
-	if len(vars) <= 2 {
-		ct.vars = nil
-	}
-
-	if keyExists(c, UserIDKey) {
-		ct.role = "user"
-	} else {
-		ct.role = "anon"
-	}
-
-	ct.res.op = qcode.GetQType(query)
-	ct.res.name = allow.QueryName(query)
-
-	data, err := ct.execQuery()
-	if err != nil {
-		return &ct.res, err
-	}
-
-	ct.res.Data = json.RawMessage(data)
-
-	return &ct.res, nil
-}

core/args.go

@@ -1,165 +0,0 @@
-package core
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-
-	"github.com/dosco/super-graph/jsn"
-)
-
-func (c *scontext) argMap() func(w io.Writer, tag string) (int, error) {
-	return func(w io.Writer, tag string) (int, error) {
-		switch tag {
-		case "user_id_provider":
-			if v := c.Value(UserIDProviderKey); v != nil {
-				return io.WriteString(w, v.(string))
-			}
-			return 0, argErr("user_id_provider")
-
-		case "user_id":
-			if v := c.Value(UserIDKey); v != nil {
-				return io.WriteString(w, v.(string))
-			}
-			return 0, argErr("user_id")
-
-		case "user_role":
-			if v := c.Value(UserRoleKey); v != nil {
-				return io.WriteString(w, v.(string))
-			}
-			return 0, argErr("user_role")
-		}
-
-		fields := jsn.Get(c.vars, [][]byte{[]byte(tag)})
-
-		if len(fields) == 0 {
-			return 0, argErr(tag)
-
-		}
-		v := fields[0].Value
-
-		// Open and close quotes
-		if len(v) >= 2 && v[0] == '"' && v[len(v)-1] == '"' {
-			fields[0].Value = v[1 : len(v)-1]
-		}
-
-		if tag == "cursor" {
-			if bytes.EqualFold(v, []byte("null")) {
-				return io.WriteString(w, ``)
-			}
-			v1, err := c.sg.decrypt(string(fields[0].Value))
-			if err != nil {
-				return 0, err
-			}
-
-			return w.Write(v1)
-		}
-
-		return w.Write(escQuote(fields[0].Value))
-	}
-}
-
-func (c *scontext) argList(args [][]byte) ([]interface{}, error) {
-	vars := make([]interface{}, len(args))
-
-	var fields map[string]json.RawMessage
-	var err error
-
-	if len(c.vars) != 0 {
-		fields, _, err = jsn.Tree(c.vars)
-
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	for i := range args {
-		av := args[i]
-		switch {
-		case bytes.Equal(av, []byte("user_id")):
-			if v := c.Value(UserIDKey); v != nil {
-				vars[i] = v.(string)
-			} else {
-				return nil, argErr("user_id")
-			}
-
-		case bytes.Equal(av, []byte("user_id_provider")):
-			if v := c.Value(UserIDProviderKey); v != nil {
-				vars[i] = v.(string)
-			} else {
-				return nil, argErr("user_id_provider")
-			}
-
-		case bytes.Equal(av, []byte("user_role")):
-			if v := c.Value(UserRoleKey); v != nil {
-				vars[i] = v.(string)
-			} else {
-				return nil, argErr("user_role")
-			}
-
-		case bytes.Equal(av, []byte("cursor")):
-			if v, ok := fields["cursor"]; ok && v[0] == '"' {
-				v1, err := c.sg.decrypt(string(v[1 : len(v)-1]))
-				if err != nil {
-					return nil, err
-				}
-				vars[i] = v1
-			} else {
-				return nil, argErr("cursor")
-			}
-
-		default:
-			if v, ok := fields[string(av)]; ok {
-				switch v[0] {
-				case '[', '{':
-					vars[i] = escQuote(v)
-				default:
-					var val interface{}
-					if err := json.Unmarshal(v, &val); err != nil {
-						return nil, err
-					}
-
-					vars[i] = val
-				}
-
-			} else {
-				return nil, argErr(string(av))
-			}
-		}
-	}
-
-	return vars, nil
-}
-
-func escQuote(b []byte) []byte {
-	f := false
-	for i := range b {
-		if b[i] == '\'' {
-			f = true
-			break
-		}
-	}
-	if !f {
-		return b
-	}
-
-	buf := &bytes.Buffer{}
-	s := 0
-	for i := range b {
-		if b[i] == '\'' {
-			buf.Write(b[s:i])
-			buf.WriteString(`''`)
-			s = i + 1
-		}
-	}
-	l := len(b)
-	if s < (l - 1) {
-		buf.Write(b[s:l])
-	}
-	return buf.Bytes()
-}
-
-func argErr(name string) error {
-	return fmt.Errorf("query requires variable '%s' to be set", name)
-}

core/config.go

@@ -1,163 +0,0 @@
-package core
-
-import (
-	"fmt"
-	"path"
-	"strings"
-
-	"github.com/spf13/viper"
-)
-
-// Core struct contains core specific config value
-type Config struct {
-	SecretKey     string            `mapstructure:"secret_key"`
-	UseAllowList  bool              `mapstructure:"use_allow_list"`
-	AllowListFile string            `mapstructure:"allow_list_file"`
-	SetUserID     bool              `mapstructure:"set_user_id"`
-	Vars          map[string]string `mapstructure:"variables"`
-	Blocklist     []string
-	Tables        []Table
-	RolesQuery    string `mapstructure:"roles_query"`
-	Roles         []Role
-	Inflections   map[string]string
-}
-
-// Table struct defines a database table
-type Table struct {
-	Name      string
-	Table     string
-	Blocklist []string
-	Remotes   []Remote
-	Columns   []Column
-}
-
-// Column struct defines a database column
-type Column struct {
-	Name       string
-	Type       string
-	ForeignKey string `mapstructure:"related_to"`
-}
-
-// Remote struct defines a remote API endpoint
-type Remote struct {
-	Name        string
-	ID          string
-	Path        string
-	URL         string
-	Debug       bool
-	PassHeaders []string `mapstructure:"pass_headers"`
-	SetHeaders  []struct {
-		Name  string
-		Value string
-	} `mapstructure:"set_headers"`
-}
-
-// Role struct contains role specific access control values for for all database tables
-type Role struct {
-	Name   string
-	Match  string
-	Tables []RoleTable
-	tm     map[string]*RoleTable
-}
-
-// RoleTable struct contains role specific access control values for a database table
-type RoleTable struct {
-	Name string
-
-	Query  Query
-	Insert Insert
-	Update Update
-	Delete Delete
-}
-
-// Query struct contains access control values for query operations
-type Query struct {
-	Limit            int
-	Filters          []string
-	Columns          []string
-	DisableFunctions bool `mapstructure:"disable_functions"`
-	Block            bool
-}
-
-// Insert struct contains access control values for insert operations
-type Insert struct {
-	Filters []string
-	Columns []string
-	Presets map[string]string
-	Block   bool
-}
-
-// Insert struct contains access control values for update operations
-type Update struct {
-	Filters []string
-	Columns []string
-	Presets map[string]string
-	Block   bool
-}
-
-// Delete struct contains access control values for delete operations
-type Delete struct {
-	Filters []string
-	Columns []string
-	Block   bool
-}
-
-// ReadInConfig function reads in the config file for the environment specified in the GO_ENV
-// environment variable. This is the best way to create a new Super Graph config.
-func ReadInConfig(configFile string) (*Config, error) {
-	cpath := path.Dir(configFile)
-	cfile := path.Base(configFile)
-	vi := newViper(cpath, cfile)
-
-	if err := vi.ReadInConfig(); err != nil {
-		return nil, err
-	}
-
-	inherits := vi.GetString("inherits")
-
-	if len(inherits) != 0 {
-		vi = newViper(cpath, inherits)
-
-		if err := vi.ReadInConfig(); err != nil {
-			return nil, err
-		}
-
-		if vi.IsSet("inherits") {
-			return nil, fmt.Errorf("inherited config (%s) cannot itself inherit (%s)",
-				inherits,
-				vi.GetString("inherits"))
-		}
-
-		vi.SetConfigName(cfile)
-
-		if err := vi.MergeInConfig(); err != nil {
-			return nil, err
-		}
-	}
-
-	c := &Config{}
-
-	if err := vi.Unmarshal(&c); err != nil {
-		return nil, fmt.Errorf("failed to decode config, %v", err)
-	}
-
-	if len(c.AllowListFile) == 0 {
-		c.AllowListFile = path.Join(cpath, "allow.list")
-	}
-
-	return c, nil
-}
-
-func newViper(configPath, configFile string) *viper.Viper {
-	vi := viper.New()
-
-	vi.SetEnvPrefix("SG")
-	vi.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
-	vi.AutomaticEnv()
-
-	vi.SetConfigName(configFile)
-	vi.AddConfigPath(configPath)
-	vi.AddConfigPath("./config")
-
-	return vi
-}

core/consts.go

@@ -1,19 +0,0 @@
-package core
-
-import (
-	"context"
-	"errors"
-)
-
-const (
-	openVar  = "{{"
-	closeVar = "}}"
-)
-
-var (
-	errNotFound = errors.New("not found in prepared statements")
-)
-
-func keyExists(ct context.Context, key contextkey) bool {
-	return ct.Value(key) != nil
-}

core/core.go

@@ -1,392 +0,0 @@
-package core
-
-import (
-	"bytes"
-	"context"
-	"database/sql"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/dosco/super-graph/core/internal/psql"
-	"github.com/dosco/super-graph/core/internal/qcode"
-
-	"github.com/valyala/fasttemplate"
-)
-
-type extensions struct {
-	Tracing *trace `json:"tracing,omitempty"`
-}
-
-type trace struct {
-	Version   int           `json:"version"`
-	StartTime time.Time     `json:"startTime"`
-	EndTime   time.Time     `json:"endTime"`
-	Duration  time.Duration `json:"duration"`
-	Execution execution     `json:"execution"`
-}
-
-type execution struct {
-	Resolvers []resolver `json:"resolvers"`
-}
-
-type resolver struct {
-	Path        []string      `json:"path"`
-	ParentType  string        `json:"parentType"`
-	FieldName   string        `json:"fieldName"`
-	ReturnType  string        `json:"returnType"`
-	StartOffset int           `json:"startOffset"`
-	Duration    time.Duration `json:"duration"`
-}
-
-type scontext struct {
-	context.Context
-
-	sg    *SuperGraph
-	query string
-	vars  json.RawMessage
-	role  string
-	res   Result
-}
-
-func (sg *SuperGraph) initCompilers() error {
-	di, err := psql.GetDBInfo(sg.db)
-	if err != nil {
-		return err
-	}
-
-	if err = addTables(sg.conf, di); err != nil {
-		return err
-	}
-
-	if err = addForeignKeys(sg.conf, di); err != nil {
-		return err
-	}
-
-	sg.schema, err = psql.NewDBSchema(di, getDBTableAliases(sg.conf))
-	if err != nil {
-		return err
-	}
-
-	sg.qc, err = qcode.NewCompiler(qcode.Config{
-		Blocklist: sg.conf.Blocklist,
-	})
-	if err != nil {
-		return err
-	}
-
-	if err := addRoles(sg.conf, sg.qc); err != nil {
-		return err
-	}
-
-	sg.pc = psql.NewCompiler(psql.Config{
-		Schema: sg.schema,
-		Vars:   sg.conf.Vars,
-	})
-
-	return nil
-}
-
-func (c *scontext) execQuery() ([]byte, error) {
-	var data []byte
-	var st *stmt
-	var err error
-
-	if c.sg.conf.UseAllowList {
-		data, st, err = c.resolvePreparedSQL()
-	} else {
-		data, st, err = c.resolveSQL()
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	if len(data) == 0 || st.skipped == 0 {
-		return data, nil
-	}
-
-	// return c.sg.execRemoteJoin(st, data, c.req.hdr)
-	return c.sg.execRemoteJoin(st, data, nil)
-}
-
-func (c *scontext) resolvePreparedSQL() ([]byte, *stmt, error) {
-	var tx *sql.Tx
-	var err error
-
-	mutation := (c.res.op == qcode.QTMutation)
-	useRoleQuery := c.sg.abacEnabled && mutation
-	useTx := useRoleQuery || c.sg.conf.SetUserID
-
-	if useTx {
-		if tx, err = c.sg.db.BeginTx(c, nil); err != nil {
-			return nil, nil, err
-		}
-		defer tx.Rollback() //nolint: errcheck
-	}
-
-	if c.sg.conf.SetUserID {
-		if err := setLocalUserID(c, tx); err != nil {
-			return nil, nil, err
-		}
-	}
-
-	var role string
-
-	if useRoleQuery {
-		if role, err = c.executeRoleQuery(tx); err != nil {
-			return nil, nil, err
-		}
-
-	} else if v := c.Value(UserRoleKey); v != nil {
-		role = v.(string)
-
-	} else {
-		role = c.role
-
-	}
-
-	c.res.role = role
-
-	ps, ok := c.sg.prepared[stmtHash(c.res.name, role)]
-	if !ok {
-		return nil, nil, errNotFound
-	}
-	c.res.sql = ps.st.sql
-
-	var root []byte
-	var row *sql.Row
-
-	varsList, err := c.argList(ps.args)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if useTx {
-		row = tx.Stmt(ps.sd).QueryRow(varsList...)
-	} else {
-		row = ps.sd.QueryRow(varsList...)
-	}
-
-	if ps.roleArg {
-		err = row.Scan(&role, &root)
-	} else {
-		err = row.Scan(&root)
-	}
-
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c.role = role
-
-	if useTx {
-		if err := tx.Commit(); err != nil {
-			return nil, nil, err
-		}
-	}
-
-	if root, err = c.sg.encryptCursor(ps.st.qc, root); err != nil {
-		return nil, nil, err
-	}
-
-	return root, &ps.st, nil
-}
-
-func (c *scontext) resolveSQL() ([]byte, *stmt, error) {
-	var tx *sql.Tx
-	var err error
-
-	mutation := (c.res.op == qcode.QTMutation)
-	useRoleQuery := c.sg.abacEnabled && mutation
-	useTx := useRoleQuery || c.sg.conf.SetUserID
-
-	if useTx {
-		if tx, err = c.sg.db.BeginTx(c, nil); err != nil {
-			return nil, nil, err
-		}
-		defer tx.Rollback() //nolint: errcheck
-	}
-
-	if c.sg.conf.SetUserID {
-		if err := setLocalUserID(c, tx); err != nil {
-			return nil, nil, err
-		}
-	}
-
-	if useRoleQuery {
-		if c.role, err = c.executeRoleQuery(tx); err != nil {
-			return nil, nil, err
-		}
-
-	} else if v := c.Value(UserRoleKey); v != nil {
-		c.role = v.(string)
-	}
-
-	stmts, err := c.sg.buildStmt(c.res.op, []byte(c.query), c.vars, c.role)
-	if err != nil {
-		return nil, nil, err
-	}
-	st := &stmts[0]
-
-	t := fasttemplate.New(st.sql, openVar, closeVar)
-	buf := &bytes.Buffer{}
-
-	_, err = t.ExecuteFunc(buf, c.argMap())
-	if err != nil {
-		return nil, nil, err
-	}
-	finalSQL := buf.String()
-
-	// var stime time.Time
-
-	// if c.sg.conf.EnableTracing {
-	// 	stime = time.Now()
-	// }
-
-	var root []byte
-	var role string
-	var row *sql.Row
-
-	// defaultRole := c.role
-
-	if useTx {
-		row = tx.QueryRow(finalSQL)
-	} else {
-		row = c.sg.db.QueryRow(finalSQL)
-	}
-
-	if len(stmts) > 1 {
-		err = row.Scan(&role, &root)
-	} else {
-		err = row.Scan(&root)
-	}
-
-	c.res.sql = finalSQL
-
-	if len(role) == 0 {
-		c.res.role = c.role
-	} else {
-		c.res.role = role
-	}
-
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if useTx {
-		if err := tx.Commit(); err != nil {
-			return nil, nil, err
-		}
-	}
-
-	if root, err = c.sg.encryptCursor(st.qc, root); err != nil {
-		return nil, nil, err
-	}
-
-	if c.sg.allowList.IsPersist() {
-		if err := c.sg.allowList.Set(c.vars, c.query, ""); err != nil {
-			return nil, nil, err
-		}
-	}
-
-	if len(stmts) > 1 {
-		if st = findStmt(role, stmts); st == nil {
-			return nil, nil, fmt.Errorf("invalid role '%s' returned", role)
-		}
-	}
-
-	// if c.sg.conf.EnableTracing {
-	// 	for _, id := range st.qc.Roots {
-	// 		c.addTrace(st.qc.Selects, id, stime)
-	// 	}
-	// }
-
-	return root, st, nil
-}
-
-func (c *scontext) executeRoleQuery(tx *sql.Tx) (string, error) {
-	userID := c.Value(UserIDKey)
-
-	if userID == nil {
-		return "anon", nil
-	}
-
-	var role string
-	row := c.sg.getRole.QueryRow(userID, c.role)
-
-	if err := row.Scan(&role); err != nil {
-		return "", err
-	}
-
-	return role, nil
-}
-
-func (r *Result) Operation() string {
-	return r.op.String()
-}
-
-func (r *Result) QueryName() string {
-	return r.name
-}
-
-func (r *Result) Role() string {
-	return r.role
-}
-
-func (r *Result) SQL() string {
-	return r.sql
-}
-
-// func (c *scontext) addTrace(sel []qcode.Select, id int32, st time.Time) {
-// 	et := time.Now()
-// 	du := et.Sub(st)
-
-// 	if c.res.Extensions == nil {
-// 		c.res.Extensions = &extensions{&trace{
-// 			Version:   1,
-// 			StartTime: st,
-// 			Execution: execution{},
-// 		}}
-// 	}
-
-// 	c.res.Extensions.Tracing.EndTime = et
-// 	c.res.Extensions.Tracing.Duration = du
-
-// 	n := 1
-// 	for i := id; i != -1; i = sel[i].ParentID {
-// 		n++
-// 	}
-// 	path := make([]string, n)
-
-// 	n--
-// 	for i := id; ; i = sel[i].ParentID {
-// 		path[n] = sel[i].Name
-// 		if sel[i].ParentID == -1 {
-// 			break
-// 		}
-// 		n--
-// 	}
-
-// 	tr := resolver{
-// 		Path:        path,
-// 		ParentType:  "Query",
-// 		FieldName:   sel[id].Name,
-// 		ReturnType:  "object",
-// 		StartOffset: 1,
-// 		Duration:    du,
-// 	}
-
-// 	c.res.Extensions.Tracing.Execution.Resolvers =
-// 		append(c.res.Extensions.Tracing.Execution.Resolvers, tr)
-// }
-
-func findStmt(role string, stmts []stmt) *stmt {
-	for i := range stmts {
-		if stmts[i].role.Name != role {
-			continue
-		}
-		return &stmts[i]
-	}
-	return nil
-}

core/cursor.go

@@ -1,72 +0,0 @@
-package core
-
-import (
-	"bytes"
-	"encoding/base64"
-
-	"github.com/dosco/super-graph/core/internal/crypto"
-	"github.com/dosco/super-graph/core/internal/qcode"
-	"github.com/dosco/super-graph/jsn"
-)
-
-func (sg *SuperGraph) encryptCursor(qc *qcode.QCode, data []byte) ([]byte, error) {
-	var keys [][]byte
-
-	for _, s := range qc.Selects {
-		if s.Paging.Type != qcode.PtOffset {
-			var buf bytes.Buffer
-
-			buf.WriteString(s.FieldName)
-			buf.WriteString("_cursor")
-			keys = append(keys, buf.Bytes())
-		}
-	}
-
-	if len(keys) == 0 {
-		return data, nil
-	}
-
-	from := jsn.Get(data, keys)
-	to := make([]jsn.Field, len(from))
-
-	for i, f := range from {
-		to[i].Key = f.Key
-
-		if f.Value[0] != '"' || f.Value[len(f.Value)-1] != '"' {
-			continue
-		}
-
-		var buf bytes.Buffer
-
-		if len(f.Value) > 2 {
-			v, err := crypto.Encrypt(f.Value[1:len(f.Value)-1], &sg.encKey)
-			if err != nil {
-				return nil, err
-			}
-
-			buf.WriteByte('"')
-			buf.WriteString(base64.StdEncoding.EncodeToString(v))
-			buf.WriteByte('"')
-		} else {
-			buf.WriteString(`null`)
-		}
-
-		to[i].Value = buf.Bytes()
-	}
-
-	var buf bytes.Buffer
-
-	if err := jsn.Replace(&buf, data, from, to); err != nil {
-		return nil, err
-	}
-
-	return buf.Bytes(), nil
-}
-
-func (sg *SuperGraph) decrypt(data string) ([]byte, error) {
-	v, err := base64.StdEncoding.DecodeString(data)
-	if err != nil {
-		return nil, err
-	}
-	return crypto.Decrypt(v, &sg.encKey)
-}

core/db.go

@@ -1,15 +0,0 @@
-package core
-
-import (
-	"context"
-	"database/sql"
-)
-
-func setLocalUserID(c context.Context, tx *sql.Tx) error {
-	var err error
-	if v := c.Value(UserIDKey); v != nil {
-		_, err = tx.Exec(`SET LOCAL "user.id" = ?`, v)
-	}
-
-	return err
-}

core/init.go

@@ -1,285 +0,0 @@
-package core
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-	"unicode"
-
-	"github.com/dosco/super-graph/core/internal/psql"
-	"github.com/dosco/super-graph/core/internal/qcode"
-	"github.com/gobuffalo/flect"
-)
-
-func (sg *SuperGraph) initConfig() error {
-	c := sg.conf
-
-	for k, v := range c.Inflections {
-		flect.AddPlural(k, v)
-	}
-
-	// Variables: Validate and sanitize
-	for k, v := range c.Vars {
-		c.Vars[k] = sanitizeVars(v)
-	}
-
-	// Tables: Validate and sanitize
-	tm := make(map[string]struct{})
-
-	for i := 0; i < len(c.Tables); i++ {
-		t := &c.Tables[i]
-		t.Name = flect.Pluralize(strings.ToLower(t.Name))
-
-		if _, ok := tm[t.Name]; ok {
-			sg.conf.Tables = append(c.Tables[:i], c.Tables[i+1:]...)
-			sg.log.Printf("WRN duplicate table found: %s", t.Name)
-		}
-		tm[t.Name] = struct{}{}
-
-		t.Table = flect.Pluralize(strings.ToLower(t.Table))
-	}
-
-	sg.roles = make(map[string]*Role)
-
-	for i := 0; i < len(c.Roles); i++ {
-		role := &c.Roles[i]
-		role.Name = sanitize(role.Name)
-
-		if _, ok := sg.roles[role.Name]; ok {
-			c.Roles = append(c.Roles[:i], c.Roles[i+1:]...)
-			sg.log.Printf("WRN duplicate role found: %s", role.Name)
-		}
-
-		role.Match = sanitize(role.Match)
-		role.tm = make(map[string]*RoleTable)
-
-		for n, table := range role.Tables {
-			role.tm[table.Name] = &role.Tables[n]
-		}
-
-		sg.roles[role.Name] = role
-	}
-
-	// If user role not defined then create it
-	if _, ok := sg.roles["user"]; !ok {
-		ur := Role{
-			Name: "user",
-			tm:   make(map[string]*RoleTable),
-		}
-		c.Roles = append(c.Roles, ur)
-		sg.roles["user"] = &ur
-	}
-
-	// Roles: validate and sanitize
-	c.RolesQuery = sanitizeVars(c.RolesQuery)
-
-	if len(c.RolesQuery) == 0 {
-		sg.log.Printf("WRN roles_query not defined: attribute based access control disabled")
-	}
-
-	_, userExists := sg.roles["user"]
-	_, sg.anonExists = sg.roles["anon"]
-
-	sg.abacEnabled = userExists && len(c.RolesQuery) != 0
-
-	return nil
-}
-
-func getDBTableAliases(c *Config) map[string][]string {
-	m := make(map[string][]string, len(c.Tables))
-
-	for i := range c.Tables {
-		t := c.Tables[i]
-
-		if len(t.Table) == 0 || len(t.Columns) != 0 {
-			continue
-		}
-
-		m[t.Table] = append(m[t.Table], t.Name)
-	}
-	return m
-}
-
-func addTables(c *Config, di *psql.DBInfo) error {
-	for _, t := range c.Tables {
-		if len(t.Table) == 0 || len(t.Columns) == 0 {
-			continue
-		}
-		if err := addTable(di, t.Columns, t); err != nil {
-			return err
-		}
-
-	}
-	return nil
-}
-
-func addTable(di *psql.DBInfo, cols []Column, t Table) error {
-	bc, ok := di.GetColumn(t.Table, t.Name)
-	if !ok {
-		return fmt.Errorf(
-			"Column '%s' not found on table '%s'",
-			t.Name, t.Table)
-	}
-
-	if bc.Type != "json" && bc.Type != "jsonb" {
-		return fmt.Errorf(
-			"Column '%s' in table '%s' is of type '%s'. Only JSON or JSONB is valid",
-			t.Name, t.Table, bc.Type)
-	}
-
-	table := psql.DBTable{
-		Name: t.Name,
-		Key:  strings.ToLower(t.Name),
-		Type: bc.Type,
-	}
-
-	columns := make([]psql.DBColumn, 0, len(cols))
-
-	for i := range cols {
-		c := cols[i]
-		columns = append(columns, psql.DBColumn{
-			Name: c.Name,
-			Key:  strings.ToLower(c.Name),
-			Type: c.Type,
-		})
-	}
-
-	di.AddTable(table, columns)
-	bc.FKeyTable = t.Name
-
-	return nil
-}
-
-func addForeignKeys(c *Config, di *psql.DBInfo) error {
-	for _, t := range c.Tables {
-		for _, c := range t.Columns {
-			if len(c.ForeignKey) == 0 {
-				continue
-			}
-			if err := addForeignKey(di, c, t); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func addForeignKey(di *psql.DBInfo, c Column, t Table) error {
-	c1, ok := di.GetColumn(t.Name, c.Name)
-	if !ok {
-		return fmt.Errorf(
-			"Invalid table '%s' or column '%s' in Config",
-			t.Name, c.Name)
-	}
-
-	v := strings.SplitN(c.ForeignKey, ".", 2)
-	if len(v) != 2 {
-		return fmt.Errorf(
-			"Invalid foreign_key in Config for table '%s' and column '%s",
-			t.Name, c.Name)
-	}
-
-	fkt, fkc := v[0], v[1]
-	c2, ok := di.GetColumn(fkt, fkc)
-	if !ok {
-		return fmt.Errorf(
-			"Invalid foreign_key in Config for table '%s' and column '%s",
-			t.Name, c.Name)
-	}
-
-	c1.FKeyTable = fkt
-	c1.FKeyColID = []int16{c2.ID}
-
-	return nil
-}
-
-func addRoles(c *Config, qc *qcode.Compiler) error {
-	for _, r := range c.Roles {
-		for _, t := range r.Tables {
-			if err := addRole(qc, r, t); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func addRole(qc *qcode.Compiler, r Role, t RoleTable) error {
-	blockFilter := []string{"false"}
-
-	query := qcode.QueryConfig{
-		Limit:            t.Query.Limit,
-		Filters:          t.Query.Filters,
-		Columns:          t.Query.Columns,
-		DisableFunctions: t.Query.DisableFunctions,
-	}
-
-	if t.Query.Block {
-		query.Filters = blockFilter
-	}
-
-	insert := qcode.InsertConfig{
-		Filters: t.Insert.Filters,
-		Columns: t.Insert.Columns,
-		Presets: t.Insert.Presets,
-	}
-
-	if t.Insert.Block {
-		insert.Filters = blockFilter
-	}
-
-	update := qcode.UpdateConfig{
-		Filters: t.Update.Filters,
-		Columns: t.Update.Columns,
-		Presets: t.Update.Presets,
-	}
-
-	if t.Update.Block {
-		update.Filters = blockFilter
-	}
-
-	delete := qcode.DeleteConfig{
-		Filters: t.Delete.Filters,
-		Columns: t.Delete.Columns,
-	}
-
-	if t.Delete.Block {
-		delete.Filters = blockFilter
-	}
-
-	return qc.AddRole(r.Name, t.Name, qcode.TRConfig{
-		Query:  query,
-		Insert: insert,
-		Update: update,
-		Delete: delete,
-	})
-}
-
-func (r *Role) GetTable(name string) *RoleTable {
-	return r.tm[name]
-}
-
-func sanitize(value string) string {
-	return strings.ToLower(strings.TrimSpace(value))
-}
-
-var (
-	varRe1 = regexp.MustCompile(`(?mi)\$([a-zA-Z0-9_.]+)`)
-	varRe2 = regexp.MustCompile(`\{\{([a-zA-Z0-9_.]+)\}\}`)
-)
-
-func sanitizeVars(s string) string {
-	s0 := varRe1.ReplaceAllString(s, `{{$1}}`)
-
-	s1 := strings.Map(func(r rune) rune {
-		if unicode.IsSpace(r) {
-			return ' '
-		}
-		return r
-	}, s0)
-
-	return varRe2.ReplaceAllStringFunc(s1, func(m string) string {
-		return strings.ToLower(m)
-	})
-}

core/internal/allow/allow.go

@@ -1,360 +0,0 @@
-package allow
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"sort"
-	"strings"
-)
-
-const (
-	AL_QUERY int = iota + 1
-	AL_VARS
-)
-
-type Item struct {
-	Name    string
-	key     string
-	Query   string
-	Vars    json.RawMessage
-	Comment string
-}
-
-type List struct {
-	filepath string
-	saveChan chan Item
-}
-
-type Config struct {
-	CreateIfNotExists bool
-	Persist           bool
-}
-
-func New(filename string, conf Config) (*List, error) {
-	al := List{}
-
-	if len(filename) != 0 {
-		fp := filename
-
-		if _, err := os.Stat(fp); err == nil {
-			al.filepath = fp
-		} else if !os.IsNotExist(err) {
-			return nil, err
-		}
-	}
-
-	if len(al.filepath) == 0 {
-		fp := "./allow.list"
-
-		if _, err := os.Stat(fp); err == nil {
-			al.filepath = fp
-		} else if !os.IsNotExist(err) {
-			return nil, err
-		}
-	}
-
-	if len(al.filepath) == 0 {
-		fp := "./config/allow.list"
-
-		if _, err := os.Stat(fp); err == nil {
-			al.filepath = fp
-		} else if !os.IsNotExist(err) {
-			return nil, err
-		}
-	}
-
-	if len(al.filepath) == 0 {
-		if !conf.CreateIfNotExists {
-			return nil, errors.New("allow.list not found")
-		}
-
-		if len(filename) == 0 {
-			al.filepath = "./config/allow.list"
-		} else {
-			al.filepath = filename
-		}
-	}
-
-	var err error
-
-	if conf.Persist {
-		al.saveChan = make(chan Item)
-
-		go func() {
-			for v := range al.saveChan {
-				if err = al.save(v); err != nil {
-					break
-				}
-			}
-		}()
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return &al, nil
-}
-
-func (al *List) IsPersist() bool {
-	return al.saveChan != nil
-}
-
-func (al *List) Set(vars []byte, query, comment string) error {
-	if al.saveChan == nil {
-		return errors.New("allow.list is read-only")
-	}
-
-	if len(query) == 0 {
-		return errors.New("empty query")
-	}
-
-	var q string
-
-	for i := 0; i < len(query); i++ {
-		c := query[i]
-		if c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' {
-			q = query
-			break
-
-		} else if c == '{' {
-			q = "query " + query
-			break
-		}
-	}
-
-	al.saveChan <- Item{
-		Comment: comment,
-		Query:   q,
-		Vars:    vars,
-	}
-
-	return nil
-}
-
-func (al *List) Load() ([]Item, error) {
-	var list []Item
-
-	b, err := ioutil.ReadFile(al.filepath)
-	if err != nil {
-		return list, err
-	}
-
-	if len(b) == 0 {
-		return list, nil
-	}
-
-	var comment bytes.Buffer
-	var varBytes []byte
-
-	itemMap := make(map[string]struct{})
-
-	s, e, c := 0, 0, 0
-	ty := 0
-
-	for {
-		fq := false
-
-		if c == 0 && b[e] == '#' {
-			s = e
-			for e < len(b) && b[e] != '\n' {
-				e++
-			}
-			if (e - s) > 2 {
-				comment.Write(b[(s + 1):(e + 1)])
-			}
-		}
-
-		if e >= len(b) {
-			break
-		}
-
-		if matchPrefix(b, e, "query") || matchPrefix(b, e, "mutation") {
-			if c == 0 {
-				s = e
-			}
-			ty = AL_QUERY
-		} else if matchPrefix(b, e, "variables") {
-			if c == 0 {
-				s = e + len("variables") + 1
-			}
-			ty = AL_VARS
-		} else if b[e] == '{' {
-			c++
-
-		} else if b[e] == '}' {
-			c--
-
-			if c == 0 {
-				if ty == AL_QUERY {
-					fq = true
-				} else if ty == AL_VARS {
-					varBytes = b[s:(e + 1)]
-				}
-				ty = 0
-			}
-		}
-
-		if fq {
-			query := string(b[s:(e + 1)])
-			name := QueryName(query)
-			key := strings.ToLower(name)
-
-			if _, ok := itemMap[key]; !ok {
-				v := Item{
-					Name:    name,
-					key:     key,
-					Query:   query,
-					Vars:    varBytes,
-					Comment: comment.String(),
-				}
-				list = append(list, v)
-				comment.Reset()
-			}
-
-			varBytes = nil
-
-		}
-
-		e++
-		if e >= len(b) {
-			break
-		}
-	}
-
-	return list, nil
-}
-
-func (al *List) save(item Item) error {
-	item.Name = QueryName(item.Query)
-	item.key = strings.ToLower(item.Name)
-
-	if len(item.Name) == 0 {
-		return nil
-	}
-
-	list, err := al.Load()
-	if err != nil {
-		return err
-	}
-
-	index := -1
-
-	for i, v := range list {
-		if strings.EqualFold(v.Name, item.Name) {
-			index = i
-			break
-		}
-	}
-
-	if index != -1 {
-		if len(list[index].Comment) != 0 {
-			item.Comment = list[index].Comment
-		}
-		list[index] = item
-	} else {
-		list = append(list, item)
-	}
-
-	f, err := os.Create(al.filepath)
-	if err != nil {
-		return err
-	}
-
-	defer f.Close()
-
-	sort.Slice(list, func(i, j int) bool {
-		return strings.Compare(list[i].key, list[j].key) == -1
-	})
-
-	for _, v := range list {
-		cmtLines := strings.Split(v.Comment, "\n")
-
-		i := 0
-		for _, c := range cmtLines {
-			if c = strings.TrimSpace(c); len(c) == 0 {
-				continue
-			}
-
-			_, err := f.WriteString(fmt.Sprintf("# %s\n", c))
-			if err != nil {
-				return err
-			}
-			i++
-		}
-
-		if i != 0 {
-			if _, err := f.WriteString("\n"); err != nil {
-				return err
-			}
-		} else {
-			if _, err := f.WriteString(fmt.Sprintf("# Query named %s\n\n", v.Name)); err != nil {
-				return err
-			}
-		}
-
-		if len(v.Vars) != 0 && !bytes.Equal(v.Vars, []byte("{}")) {
-			vj, err := json.MarshalIndent(v.Vars, "", "  ")
-			if err != nil {
-				return fmt.Errorf("failed to marshal vars: %v", err)
-			}
-
-			_, err = f.WriteString(fmt.Sprintf("variables %s\n\n", vj))
-			if err != nil {
-				return err
-			}
-		}
-
-		if v.Query[0] == '{' {
-			_, err = f.WriteString(fmt.Sprintf("query %s\n\n", v.Query))
-		} else {
-			_, err = f.WriteString(fmt.Sprintf("%s\n\n", v.Query))
-		}
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func matchPrefix(b []byte, i int, s string) bool {
-	if (len(b) - i) < len(s) {
-		return false
-	}
-	for n := 0; n < len(s); n++ {
-		if b[(i+n)] != s[n] {
-			return false
-		}
-	}
-	return true
-}
-
-func QueryName(b string) string {
-	state, s := 0, 0
-
-	for i := 0; i < len(b); i++ {
-		switch {
-		case state == 2 && !isValidNameChar(b[i]):
-			return b[s:i]
-		case state == 1 && b[i] == '{':
-			return ""
-		case state == 1 && isValidNameChar(b[i]):
-			s = i
-			state = 2
-		case i != 0 && b[i] == ' ' && (b[i-1] == 'n' || b[i-1] == 'y'):
-			state = 1
-		}
-	}
-
-	return ""
-}
-
-func isValidNameChar(c byte) bool {
-	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_'
-}

core/internal/allow/allow_test.go

@@ -1,84 +0,0 @@
-package allow
-
-import (
-	"testing"
-)
-
-func TestGQLName1(t *testing.T) {
-	var q = `
-	query {
-		products(
-			distinct: [price]
-			where: { id: { and: { greater_or_equals: 20, lt: 28 } } }
-		) { id name } }`
-
-	name := QueryName(q)
-
-	if len(name) != 0 {
-		t.Fatal("Name should be empty, not ", name)
-	}
-}
-
-func TestGQLName2(t *testing.T) {
-	var q = `
-	query hakuna_matata
-	
-	{
-		products(
-			distinct: [price]
-			where: { id: { and: { greater_or_equals: 20, lt: 28 } } }
-		) {
-			id
-			name
-		}
-	}`
-
-	name := QueryName(q)
-
-	if name != "hakuna_matata" {
-		t.Fatal("Name should be 'hakuna_matata', not ", name)
-	}
-}
-
-func TestGQLName3(t *testing.T) {
-	var q = `
-	mutation means{ users { id } }`
-
-	// var v2 = `   { products( limit: 30, order_by: { price: desc }, distinct: [ price ] where: { id: { and: { greater_or_equals: 20, lt: 28 } } }) { id name price user { id email } } } `
-
-	name := QueryName(q)
-
-	if name != "means" {
-		t.Fatal("Name should be 'means', not ", name)
-	}
-}
-
-func TestGQLName4(t *testing.T) {
-	var q = `
-	query no_worries 
-		users {
-			id
-		}
-	}`
-
-	name := QueryName(q)
-
-	if name != "no_worries" {
-		t.Fatal("Name should be 'no_worries', not ", name)
-	}
-}
-
-func TestGQLName5(t *testing.T) {
-	var q = `
-	    {
-		users {
-			id
-		}
-	}`
-
-	name := QueryName(q)
-
-	if len(name) != 0 {
-		t.Fatal("Name should be empty, not ", name)
-	}
-}

core/internal/allow/fuzz_test.go

@@ -1,15 +0,0 @@
-package allow
-
-import "testing"
-
-func TestFuzzCrashers(t *testing.T) {
-	var crashers = []string{
-		"query",
-		"q",
-		"que",
-	}
-
-	for _, f := range crashers {
-		_ = QueryName(f)
-	}
-}

core/internal/crypto/encrypt.go

@@ -1,80 +0,0 @@
-// cryptopasta - basic cryptography examples
-//
-// Written in 2015 by George Tankersley <george.tankersley@gmail.com>
-//
-// To the extent possible under law, the author(s) have dedicated all copyright
-// and related and neighboring rights to this software to the public domain
-// worldwide. This software is distributed without any warranty.
-//
-// You should have received a copy of the CC0 Public Domain Dedication along
-// with this software. If not, see // <http://creativecommons.org/publicdomain/zero/1.0/>.
-
-// Provides symmetric authenticated encryption using 256-bit AES-GCM with a random nonce.
-package crypto
-
-import (
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/rand"
-	"errors"
-	"io"
-)
-
-// NewEncryptionKey generates a random 256-bit key for Encrypt() and
-// Decrypt(). It panics if the source of randomness fails.
-func NewEncryptionKey() [32]byte {
-	key := [32]byte{}
-	_, err := io.ReadFull(rand.Reader, key[:])
-	if err != nil {
-		panic(err)
-	}
-	return key
-}
-
-// Encrypt encrypts data using 256-bit AES-GCM.  This both hides the content of
-// the data and provides a check that it hasn't been altered. Output takes the
-// form nonce|ciphertext|tag where '|' indicates concatenation.
-func Encrypt(plaintext []byte, key *[32]byte) (ciphertext []byte, err error) {
-	block, err := aes.NewCipher(key[:])
-	if err != nil {
-		return nil, err
-	}
-
-	gcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return nil, err
-	}
-
-	nonce := make([]byte, gcm.NonceSize())
-	_, err = io.ReadFull(rand.Reader, nonce)
-	if err != nil {
-		return nil, err
-	}
-
-	return gcm.Seal(nonce, nonce, plaintext, nil), nil
-}
-
-// Decrypt decrypts data using 256-bit AES-GCM.  This both hides the content of
-// the data and provides a check that it hasn't been altered. Expects input
-// form nonce|ciphertext|tag where '|' indicates concatenation.
-func Decrypt(ciphertext []byte, key *[32]byte) (plaintext []byte, err error) {
-	block, err := aes.NewCipher(key[:])
-	if err != nil {
-		return nil, err
-	}
-
-	gcm, err := cipher.NewGCM(block)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(ciphertext) < gcm.NonceSize() {
-		return nil, errors.New("malformed ciphertext")
-	}
-
-	return gcm.Open(nil,
-		ciphertext[:gcm.NonceSize()],
-		ciphertext[gcm.NonceSize():],
-		nil,
-	)
-}

core/internal/integration_tests/cockroachdb/cockroachdb_test.go

@@ -1,84 +0,0 @@
-package cockraochdb_test
-
-import (
-	"database/sql"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"regexp"
-	"sync/atomic"
-	"testing"
-
-	integration_tests "github.com/dosco/super-graph/core/internal/integration_tests"
-	_ "github.com/jackc/pgx/v4/stdlib"
-	"github.com/stretchr/testify/require"
-)
-
-func TestCockroachDB(t *testing.T) {
-
-	dir, err := ioutil.TempDir("", "temp-cockraochdb-")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	cmd := exec.Command("cockroach", "start", "--insecure", "--listen-addr", ":0", "--http-addr", ":0", "--store=path="+dir)
-	finder := &urlFinder{
-		c: make(chan bool),
-	}
-	cmd.Stdout = finder
-	cmd.Stderr = ioutil.Discard
-
-	err = cmd.Start()
-	if err != nil {
-		t.Skip("is CockroachDB installed?: " + err.Error())
-	}
-	fmt.Println("started temporary cockroach db")
-
-	stopped := int32(0)
-	stopDatabase := func() {
-		fmt.Println("stopping temporary cockroach db")
-		if atomic.CompareAndSwapInt32(&stopped, 0, 1) {
-			cmd.Process.Kill()
-			cmd.Process.Wait()
-			os.RemoveAll(dir)
-		}
-	}
-	defer stopDatabase()
-
-	// Wait till we figure out the URL we should connect to...
-	<-finder.c
-	db, err := sql.Open("pgx", finder.URL)
-	if err != nil {
-		stopDatabase()
-		require.NoError(t, err)
-	}
-	integration_tests.SetupSchema(t, db)
-
-	integration_tests.TestSuperGraph(t, db, func(t *testing.T) {
-		if t.Name() == "TestCockroachDB/nested_insert" {
-			t.Skip("nested inserts currently not working yet on cockroach db")
-		}
-	})
-}
-
-type urlFinder struct {
-	c    chan bool
-	done bool
-	URL  string
-}
-
-func (finder *urlFinder) Write(p []byte) (n int, err error) {
-	s := string(p)
-	urlRegex := regexp.MustCompile(`\nsql:\s+(postgresql:[^\s]+)\n`)
-	if !finder.done {
-		submatch := urlRegex.FindAllStringSubmatch(s, -1)
-		if submatch != nil {
-			finder.URL = submatch[0][1]
-			finder.done = true
-			close(finder.c)
-		}
-	}
-	return len(p), nil
-}

core/internal/integration_tests/integration_tests.go

@@ -1,143 +0,0 @@
-package integration_tests
-
-import (
-	"context"
-	"database/sql"
-	"encoding/json"
-	"testing"
-
-	"github.com/dosco/super-graph/core"
-	"github.com/stretchr/testify/require"
-)
-
-func SetupSchema(t *testing.T, db *sql.DB) {
-
-	_, err := db.Exec(`
-CREATE TABLE users (
-  id 		 integer PRIMARY KEY,
-  full_name  text
-)`)
-	require.NoError(t, err)
-
-	_, err = db.Exec(`CREATE TABLE product (
-  id            integer PRIMARY KEY,
-  name          text,
-  weight        float
-)`)
-	require.NoError(t, err)
-
-	_, err = db.Exec(`CREATE TABLE line_item (
-  id            integer PRIMARY KEY,
-  product       integer REFERENCES product(id),
-  quantity      integer,
-  price      	float
-)`)
-	require.NoError(t, err)
-}
-
-func DropSchema(t *testing.T, db *sql.DB) {
-
-	_, err := db.Exec(`DROP TABLE IF EXISTS line_item`)
-	require.NoError(t, err)
-
-	_, err = db.Exec(`DROP TABLE IF EXISTS product`)
-	require.NoError(t, err)
-
-	_, err = db.Exec(`DROP TABLE IF EXISTS users`)
-	require.NoError(t, err)
-}
-
-func TestSuperGraph(t *testing.T, db *sql.DB, before func(t *testing.T)) {
-	config := core.Config{}
-	config.UseAllowList = false
-	config.AllowListFile = "./allow.list"
-	config.RolesQuery = `SELECT * FROM users WHERE id = $user_id`
-
-	config.Roles = []core.Role{
-		core.Role{
-			Name: "anon",
-			Tables: []core.RoleTable{
-				core.RoleTable{Name: "users", Query: core.Query{Limit: 100}},
-				core.RoleTable{Name: "product", Query: core.Query{Limit: 100}},
-				core.RoleTable{Name: "line_item", Query: core.Query{Limit: 100}},
-			},
-		},
-	}
-
-	sg, err := core.NewSuperGraph(&config, db)
-	require.NoError(t, err)
-	ctx := context.Background()
-
-	t.Run("seed fixtures", func(t *testing.T) {
-		before(t)
-		res, err := sg.GraphQL(ctx,
-			`mutation { products (insert: $products) { id } }`,
-			json.RawMessage(`{"products":[
-{"id":1, "name":"Charmin Ultra Soft", "weight": 0.5},
-{"id":2, "name":"Hand Sanitizer", "weight": 0.2},
-{"id":3, "name":"Case of Corona", "weight": 1.2}
-]}`))
-		require.NoError(t, err, res.SQL())
-		require.Equal(t, `{"products": [{"id": 1}, {"id": 2}, {"id": 3}]}`, string(res.Data))
-
-		res, err = sg.GraphQL(ctx,
-			`mutation { line_items (insert: $line_items) { id } }`,
-			json.RawMessage(`{"line_items":[
-{"id":5001, "product":1, "price":6.95, "quantity":10},
-{"id":5002, "product":2, "price":10.99, "quantity":2}
-]}`))
-		require.NoError(t, err, res.SQL())
-		require.Equal(t, `{"line_items": [{"id": 5001}, {"id": 5002}]}`, string(res.Data))
-	})
-
-	t.Run("get line items", func(t *testing.T) {
-		before(t)
-		res, err := sg.GraphQL(ctx,
-			`query { line_items { id, price, quantity } }`,
-			json.RawMessage(`{}`))
-		require.NoError(t, err, res.SQL())
-		require.Equal(t, `{"line_items": [{"id": 5001, "price": 6.95, "quantity": 10}, {"id": 5002, "price": 10.99, "quantity": 2}]}`, string(res.Data))
-	})
-
-	t.Run("update line item", func(t *testing.T) {
-		before(t)
-		res, err := sg.GraphQL(ctx,
-			`mutation { line_item(update:$update, id:$id) { id } }`,
-			json.RawMessage(`{"id":5001, "update":{"quantity":20}}`))
-		require.NoError(t, err, res.SQL())
-		require.Equal(t, `{"line_item": {"id": 5001}}`, string(res.Data))
-
-		res, err = sg.GraphQL(ctx,
-			`query { line_item(id:$id) { id, price, quantity } }`,
-			json.RawMessage(`{"id":5001}`))
-		require.NoError(t, err, res.SQL())
-		require.Equal(t, `{"line_item": {"id": 5001, "price": 6.95, "quantity": 20}}`, string(res.Data))
-	})
-
-	t.Run("delete line item", func(t *testing.T) {
-		before(t)
-		res, err := sg.GraphQL(ctx,
-			`mutation { line_item(delete:true, id:$id) { id } }`,
-			json.RawMessage(`{"id":5002}`))
-		require.NoError(t, err, res.SQL())
-		require.Equal(t, `{"line_item": {"id": 5002}}`, string(res.Data))
-
-		res, err = sg.GraphQL(ctx,
-			`query { line_items { id, price, quantity } }`,
-			json.RawMessage(`{}`))
-		require.NoError(t, err, res.SQL())
-		require.Equal(t, `{"line_items": [{"id": 5001, "price": 6.95, "quantity": 20}]}`, string(res.Data))
-	})
-
-	t.Run("nested insert", func(t *testing.T) {
-		before(t)
-		res, err := sg.GraphQL(ctx,
-			`mutation { line_items (insert: $line_item) { id, product { name } } }`,
-			json.RawMessage(`{"line_item":
-{"id":5003, "product": { "connect": { "id": 1} }, "price":10.95, "quantity":15}
-}`))
-		require.NoError(t, err, res.SQL())
-		require.Equal(t, `{"line_items": [{"id": 5003, "product": {"name": "Charmin Ultra Soft"}}]}`, string(res.Data))
-	})
-
-}

core/internal/integration_tests/postgresql/postgresql_test.go

@@ -1,27 +0,0 @@
-package cockraochdb_test
-
-import (
-	"database/sql"
-	"os"
-	"testing"
-
-	integration_tests "github.com/dosco/super-graph/core/internal/integration_tests"
-	_ "github.com/jackc/pgx/v4/stdlib"
-	"github.com/stretchr/testify/require"
-)
-
-func TestCockroachDB(t *testing.T) {
-
-	url, found := os.LookupEnv("SG_POSTGRESQL_TEST_URL")
-	if !found {
-		t.Skip("set the SG_POSTGRESQL_TEST_URL env variable if you want to run integration tests against a PostgreSQL database")
-	}
-
-	db, err := sql.Open("pgx", url)
-	require.NoError(t, err)
-
-	integration_tests.DropSchema(t, db)
-	integration_tests.SetupSchema(t, db)
-	integration_tests.TestSuperGraph(t, db, func(t *testing.T) {
-	})
-}

core/internal/psql/columns.go

@@ -1,216 +0,0 @@
-//nolint:errcheck
-package psql
-
-import (
-	"errors"
-	"io"
-	"strings"
-
-	"github.com/dosco/super-graph/core/internal/qcode"
-)
-
-func (c *compilerContext) renderBaseColumns(
-	sel *qcode.Select,
-	ti *DBTableInfo,
-	childCols []*qcode.Column,
-	skipped uint32) ([]int, bool, error) {
-
-	var realColsRendered []int
-
-	colcount := (len(sel.Cols) + len(sel.OrderBy) + 1)
-	colmap := make(map[string]struct{}, colcount)
-
-	isSearch := sel.Args["search"] != nil
-	isCursorPaged := sel.Paging.Type != qcode.PtOffset
-	isAgg := false
-
-	i := 0
-	for n, col := range sel.Cols {
-		cn := col.Name
-		colmap[cn] = struct{}{}
-
-		_, isRealCol := ti.ColMap[cn]
-
-		if isRealCol {
-			c.renderComma(i)
-			realColsRendered = append(realColsRendered, n)
-			colWithTable(c.w, ti.Name, cn)
-
-		} else {
-			switch {
-			case isSearch && cn == "search_rank":
-				if err := c.renderColumnSearchRank(sel, ti, col, i); err != nil {
-					return nil, false, err
-				}
-
-			case isSearch && strings.HasPrefix(cn, "search_headline_"):
-				if err := c.renderColumnSearchHeadline(sel, ti, col, i); err != nil {
-					return nil, false, err
-				}
-
-			case cn == "__typename":
-				if err := c.renderColumnTypename(sel, ti, col, i); err != nil {
-					return nil, false, err
-				}
-
-			case strings.HasSuffix(cn, "_cursor"):
-				continue
-
-			default:
-				if err := c.renderColumnFunction(sel, ti, col, i); err != nil {
-					return nil, false, err
-				}
-
-				isAgg = true
-			}
-		}
-		i++
-
-	}
-
-	if isCursorPaged {
-		if _, ok := colmap[ti.PrimaryCol.Key]; !ok {
-			colmap[ti.PrimaryCol.Key] = struct{}{}
-			c.renderComma(i)
-			colWithTable(c.w, ti.Name, ti.PrimaryCol.Name)
-		}
-		i++
-	}
-
-	for _, ob := range sel.OrderBy {
-		if _, ok := colmap[ob.Col]; ok {
-			continue
-		}
-		colmap[ob.Col] = struct{}{}
-		c.renderComma(i)
-		colWithTable(c.w, ti.Name, ob.Col)
-		i++
-	}
-
-	for _, col := range childCols {
-		if _, ok := colmap[col.Name]; ok {
-			continue
-		}
-		c.renderComma(i)
-		colWithTable(c.w, col.Table, col.Name)
-		i++
-	}
-
-	return realColsRendered, isAgg, nil
-}
-
-func (c *compilerContext) renderColumnSearchRank(sel *qcode.Select, ti *DBTableInfo, col qcode.Column, columnsRendered int) error {
-	if isColumnBlocked(sel, col.Name) {
-		return nil
-	}
-
-	if ti.TSVCol == nil {
-		return errors.New("no ts_vector column found")
-	}
-	cn := ti.TSVCol.Name
-	arg := sel.Args["search"]
-
-	c.renderComma(columnsRendered)
-	//fmt.Fprintf(w, `ts_rank("%s"."%s", websearch_to_tsquery('%s')) AS %s`,
-	//c.sel.Name, cn, arg.Val, col.Name)
-	io.WriteString(c.w, `ts_rank(`)
-	colWithTable(c.w, ti.Name, cn)
-	if c.schema.ver >= 110000 {
-		io.WriteString(c.w, `, websearch_to_tsquery('{{`)
-	} else {
-		io.WriteString(c.w, `, to_tsquery('{{`)
-	}
-	io.WriteString(c.w, arg.Val)
-	io.WriteString(c.w, `}}'))`)
-	alias(c.w, col.Name)
-
-	return nil
-}
-
-func (c *compilerContext) renderColumnSearchHeadline(sel *qcode.Select, ti *DBTableInfo, col qcode.Column, columnsRendered int) error {
-	cn := col.Name[16:]
-
-	if isColumnBlocked(sel, cn) {
-		return nil
-	}
-	arg := sel.Args["search"]
-
-	c.renderComma(columnsRendered)
-	//fmt.Fprintf(w, `ts_headline("%s"."%s", websearch_to_tsquery('%s')) AS %s`,
-	//c.sel.Name, cn, arg.Val, col.Name)
-	io.WriteString(c.w, `ts_headline(`)
-	colWithTable(c.w, ti.Name, cn)
-	if c.schema.ver >= 110000 {
-		io.WriteString(c.w, `, websearch_to_tsquery('{{`)
-	} else {
-		io.WriteString(c.w, `, to_tsquery('{{`)
-	}
-	io.WriteString(c.w, arg.Val)
-	io.WriteString(c.w, `}}'))`)
-	alias(c.w, col.Name)
-
-	return nil
-}
-
-func (c *compilerContext) renderColumnTypename(sel *qcode.Select, ti *DBTableInfo, col qcode.Column, columnsRendered int) error {
-	if isColumnBlocked(sel, col.Name) {
-		return nil
-	}
-
-	c.renderComma(columnsRendered)
-	io.WriteString(c.w, `(`)
-	squoted(c.w, ti.Name)
-	io.WriteString(c.w, ` :: text)`)
-	alias(c.w, col.Name)
-
-	return nil
-}
-
-func (c *compilerContext) renderColumnFunction(sel *qcode.Select, ti *DBTableInfo, col qcode.Column, columnsRendered int) error {
-	pl := funcPrefixLen(col.Name)
-	// if pl == 0 {
-	// 	//fmt.Fprintf(w, `'%s not defined' AS %s`, cn, col.Name)
-	// 	io.WriteString(c.w, `'`)
-	// 	io.WriteString(c.w, col.Name)
-	// 	io.WriteString(c.w, ` not defined'`)
-	// 	alias(c.w, col.Name)
-	// }
-
-	if pl == 0 || !sel.Functions {
-		return nil
-	}
-
-	cn := col.Name[pl:]
-
-	if isColumnBlocked(sel, cn) {
-		return nil
-	}
-
-	fn := col.Name[:pl-1]
-
-	c.renderComma(columnsRendered)
-
-	//fmt.Fprintf(w, `%s("%s"."%s") AS %s`, fn, c.sel.Name, cn, col.Name)
-	io.WriteString(c.w, fn)
-	io.WriteString(c.w, `(`)
-	colWithTable(c.w, ti.Name, cn)
-	io.WriteString(c.w, `)`)
-	alias(c.w, col.Name)
-
-	return nil
-}
-
-func (c *compilerContext) renderComma(columnsRendered int) {
-	if columnsRendered != 0 {
-		io.WriteString(c.w, `, `)
-	}
-}
-
-func isColumnBlocked(sel *qcode.Select, name string) bool {
-	if len(sel.Allowed) != 0 {
-		if _, ok := sel.Allowed[name]; !ok {
-			return true
-		}
-	}
-	return false
-}

core/internal/psql/fuzz.go

@@ -1,54 +0,0 @@
-// +build gofuzz
-
-package psql
-
-import (
-	"encoding/json"
-	"github.com/dosco/super-graph/core/internal/qcode"
-)
-
-var (
-	qcompileTest, _ = qcode.NewCompiler(qcode.Config{})
-
-	schema = getTestSchema()
-
-	vars = NewVariables(map[string]string{
-		"admin_account_id": "5",
-	})
-
-	pcompileTest = NewCompiler(Config{
-		Schema: schema,
-		Vars:   vars,
-	})
-)
-
-// FuzzerEntrypoint for Fuzzbuzz
-func Fuzz(data []byte) int {
-	gql := `mutation {
-		product(insert: $data) {
-			id
-			name
-			user {
-				id
-				full_name
-				email
-			}
-		}
-	}`
-
-	qc, err := qcompileTest.Compile([]byte(gql), "user")
-	if err != nil {
-		panic("qcompile can't fail")
-	}
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(data),
-	}
-
-	_, _, err = pcompileTest.CompileEx(qc, vars)
-	if err != nil {
-		return 0
-	}
-
-	return 1
-}

core/internal/psql/insert.go

@@ -1,187 +0,0 @@
-//nolint:errcheck
-package psql
-
-import (
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/dosco/super-graph/core/internal/qcode"
-	"github.com/dosco/super-graph/core/internal/util"
-)
-
-func (c *compilerContext) renderInsert(qc *qcode.QCode, w io.Writer,
-	vars Variables, ti *DBTableInfo) (uint32, error) {
-
-	insert, ok := vars[qc.ActionVar]
-	if !ok {
-		return 0, fmt.Errorf("variable '%s' not defined", qc.ActionVar)
-	}
-	if len(insert) == 0 {
-		return 0, fmt.Errorf("variable '%s' is empty", qc.ActionVar)
-	}
-
-	io.WriteString(c.w, `WITH "_sg_input" AS (SELECT `)
-	if insert[0] == '[' {
-		io.WriteString(c.w, `json_array_elements(`)
-	}
-	io.WriteString(c.w, `'{{`)
-	io.WriteString(c.w, qc.ActionVar)
-	io.WriteString(c.w, `}}' :: json`)
-	if insert[0] == '[' {
-		io.WriteString(c.w, `)`)
-	}
-	io.WriteString(c.w, ` AS j)`)
-
-	st := util.NewStack()
-	st.Push(kvitem{_type: itemInsert, key: ti.Name, val: insert, ti: ti})
-
-	for {
-		if st.Len() == 0 {
-			break
-		}
-		if insert[0] == '[' && st.Len() > 1 {
-			return 0, errors.New("Nested bulk insert not supported")
-		}
-		intf := st.Pop()
-
-		switch item := intf.(type) {
-		case kvitem:
-			if err := c.handleKVItem(st, item); err != nil {
-				return 0, err
-			}
-
-		case renitem:
-			var err error
-
-			// if w := qc.Selects[0].Where; w != nil && w.Op == qcode.OpFalse {
-			// 	io.WriteString(c.w, ` WHERE false`)
-			// }
-
-			switch item._type {
-			case itemInsert:
-				err = c.renderInsertStmt(qc, w, item)
-			case itemConnect:
-				err = c.renderConnectStmt(qc, w, item)
-			case itemUnion:
-				err = c.renderUnionStmt(w, item)
-			}
-
-			if err != nil {
-				return 0, err
-			}
-		}
-	}
-	io.WriteString(c.w, ` `)
-
-	return 0, nil
-}
-
-func (c *compilerContext) renderInsertStmt(qc *qcode.QCode, w io.Writer, item renitem) error {
-
-	ti := item.ti
-	jt := item.data
-	sk := nestedInsertRelColumnsMap(item.kvitem)
-
-	io.WriteString(c.w, `, `)
-	renderCteName(w, item.kvitem)
-	io.WriteString(w, ` AS (`)
-
-	io.WriteString(w, `INSERT INTO `)
-	quoted(w, ti.Name)
-	io.WriteString(w, ` (`)
-	renderInsertUpdateColumns(w, qc, jt, ti, sk, false)
-	renderNestedInsertRelColumns(w, item.kvitem, false)
-	io.WriteString(w, `)`)
-
-	io.WriteString(w, ` SELECT `)
-	renderInsertUpdateColumns(w, qc, jt, ti, sk, true)
-	renderNestedInsertRelColumns(w, item.kvitem, true)
-
-	io.WriteString(w, ` FROM "_sg_input" i`)
-	renderNestedInsertRelTables(w, item.kvitem)
-	io.WriteString(w, ` RETURNING *)`)
-	return nil
-}
-
-func nestedInsertRelColumnsMap(item kvitem) map[string]struct{} {
-	sk := make(map[string]struct{}, len(item.items))
-
-	if len(item.items) == 0 {
-		if item.relPC != nil && item.relPC.Type == RelOneToMany {
-			sk[item.relPC.Right.Col] = struct{}{}
-		}
-	} else {
-		for _, v := range item.items {
-			if v.relCP.Type == RelOneToMany {
-				sk[v.relCP.Right.Col] = struct{}{}
-			}
-		}
-	}
-
-	return sk
-}
-
-func renderNestedInsertRelColumns(w io.Writer, item kvitem, values bool) error {
-	if len(item.items) == 0 {
-		if item.relPC != nil && item.relPC.Type == RelOneToMany {
-			if values {
-				colWithTable(w, item.relPC.Left.Table, item.relPC.Left.Col)
-			} else {
-				quoted(w, item.relPC.Right.Col)
-			}
-		}
-	} else {
-		// Render child foreign key columns if child-to-parent
-		// relationship is one-to-many
-		i := 0
-		for _, v := range item.items {
-			if v.relCP.Type == RelOneToMany {
-				if i != 0 {
-					io.WriteString(w, `, `)
-				}
-				if values {
-					if v._ctype > 0 {
-						io.WriteString(w, `"_x_`)
-						io.WriteString(w, v.relCP.Left.Table)
-						io.WriteString(w, `".`)
-						quoted(w, v.relCP.Left.Col)
-					} else {
-						colWithTable(w, v.relCP.Left.Table, v.relCP.Left.Col)
-					}
-				} else {
-					quoted(w, v.relCP.Right.Col)
-				}
-				i++
-			}
-		}
-	}
-
-	return nil
-}
-
-func renderNestedInsertRelTables(w io.Writer, item kvitem) error {
-	if len(item.items) == 0 {
-		if item.relPC != nil && item.relPC.Type == RelOneToMany {
-			io.WriteString(w, `, `)
-			quoted(w, item.relPC.Left.Table)
-		}
-	} else {
-		// Render tables needed to set values if child-to-parent
-		// relationship is one-to-many
-		for _, v := range item.items {
-			if v.relCP.Type == RelOneToMany {
-				io.WriteString(w, `, `)
-				if v._ctype > 0 {
-					io.WriteString(w, `"_x_`)
-					io.WriteString(w, v.relCP.Left.Table)
-					io.WriteString(w, `"`)
-				} else {
-					quoted(w, v.relCP.Left.Table)
-				}
-			}
-		}
-	}
-
-	return nil
-}

core/internal/psql/insert_test.go

@@ -1,271 +0,0 @@
-package psql
-
-import (
-	"encoding/json"
-	"testing"
-)
-
-func simpleInsert(t *testing.T) {
-	gql := `mutation {
-		user(insert: $data) {
-			id
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{"email": "reannagreenholt@orn.com", "full_name": "Flo Barton"}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "user")
-}
-
-func singleInsert(t *testing.T) {
-	gql := `mutation {
-		product(id: $id, insert: $insert) {
-			id
-			name
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"insert": json.RawMessage(` { "name": "my_name", "price": 6.95, "description": "my_desc", "user_id": 5 }`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "anon")
-}
-
-func bulkInsert(t *testing.T) {
-	gql := `mutation {
-		product(name: "test", id: $id, insert: $insert) {
-			id
-			name
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"insert": json.RawMessage(` [{ "name": "my_name", "description": "my_desc"  }]`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "anon")
-}
-
-func simpleInsertWithPresets(t *testing.T) {
-	gql := `mutation {
-		product(insert: $data) {
-			id
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{"name": "Tomato", "price": 5.76}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "user")
-}
-
-func nestedInsertManyToMany(t *testing.T) {
-	gql := `mutation {
-		purchase(insert: $data) {
-			sale_type
-			quantity
-			due_date
-			customer {
-				id
-				full_name
-				email
-			}
-			product {
-				id
-				name
-				price
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(` {
-			"sale_type": "bought",
-			"quantity": 5,
-			"due_date": "now",
-			"customer": {
-				"email": "thedude@rug.com",
-				"full_name": "The Dude"
-			},
-			"product": {
-				"name": "Apple",
-				"price": 1.25
-			}
-		}
-	`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func nestedInsertOneToMany(t *testing.T) {
-	gql := `mutation {
-		user(insert: $data) {
-			id
-			full_name
-			email
-			product {
-				id
-				name
-				price
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{
-			"email": "thedude@rug.com",
-			"full_name": "The Dude",
-			"created_at": "now",
-			"updated_at": "now",
-			"product": {
-				"name": "Apple",
-				"price": 1.25,
-				"created_at": "now",
-				"updated_at": "now"
-			}
-		}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func nestedInsertOneToOne(t *testing.T) {
-	gql := `mutation {
-		product(insert: $data) {
-			id
-			name
-			user {
-				id
-				full_name
-				email
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{
-			"name": "Apple",
-			"price": 1.25,
-			"created_at": "now",
-			"updated_at": "now",
-			"user": {
-				"hey": {
-					"now": "what's the matter"
-				},
-				"email": "thedude@rug.com",
-				"full_name": "The Dude",
-				"created_at": "now",
-				"updated_at": "now"
-			}
-		}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func nestedInsertOneToManyWithConnect(t *testing.T) {
-	gql := `mutation {
-		user(insert: $data) {
-			id
-			full_name
-			email
-			product {
-				id
-				name
-				price
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{
-			"email": "thedude@rug.com",
-			"full_name": "The Dude",
-			"created_at": "now",
-			"updated_at": "now",
-			"product": {
-				"connect": { "id": 5 }
-			}
-		}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func nestedInsertOneToOneWithConnect(t *testing.T) {
-	gql := `mutation {
-		product(insert: $data) {
-			id
-			name
-			tags {
-				id
-				name
-			}
-			user {
-				id
-				full_name
-				email
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{
-			"name": "Apple",
-			"price": 1.25,
-			"created_at": "now",
-			"updated_at": "now",
-			"user": {
-				"connect": { "id": 5 }
-			}
-		}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func nestedInsertOneToOneWithConnectArray(t *testing.T) {
-	gql := `mutation {
-		product(insert: $data) {
-			id
-			name
-			user {
-				id
-				full_name
-				email
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{
-			"name": "Apple",
-			"price": 1.25,
-			"created_at": "now",
-			"updated_at": "now",
-			"user": {
-				"connect": { "id": [1,2] }
-			}
-		}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func TestCompileInsert(t *testing.T) {
-	t.Run("simpleInsert", simpleInsert)
-	t.Run("singleInsert", singleInsert)
-	t.Run("bulkInsert", bulkInsert)
-	t.Run("simpleInsertWithPresets", simpleInsertWithPresets)
-	t.Run("nestedInsertManyToMany", nestedInsertManyToMany)
-	t.Run("nestedInsertOneToMany", nestedInsertOneToMany)
-	t.Run("nestedInsertOneToOne", nestedInsertOneToOne)
-	t.Run("nestedInsertOneToManyWithConnect", nestedInsertOneToManyWithConnect)
-	t.Run("nestedInsertOneToOneWithConnect", nestedInsertOneToOneWithConnect)
-	t.Run("nestedInsertOneToOneWithConnectArray", nestedInsertOneToOneWithConnectArray)
-}

core/internal/psql/mutate.go

@@ -1,699 +0,0 @@
-//nolint:errcheck
-package psql
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/dosco/super-graph/core/internal/qcode"
-	"github.com/dosco/super-graph/core/internal/util"
-	"github.com/dosco/super-graph/jsn"
-)
-
-type itemType int
-
-const (
-	itemInsert itemType = iota + 1
-	itemUpdate
-	itemConnect
-	itemDisconnect
-	itemUnion
-)
-
-var insertTypes = map[string]itemType{
-	"connect": itemConnect,
-}
-
-var updateTypes = map[string]itemType{
-	"connect":    itemConnect,
-	"disconnect": itemDisconnect,
-}
-
-var noLimit = qcode.Paging{NoLimit: true}
-
-func (co *Compiler) compileMutation(qc *qcode.QCode, w io.Writer, vars Variables) (uint32, error) {
-	if len(qc.Selects) == 0 {
-		return 0, errors.New("empty query")
-	}
-
-	c := &compilerContext{w, qc.Selects, co}
-	root := &qc.Selects[0]
-
-	ti, err := c.schema.GetTable(root.Name)
-	if err != nil {
-		return 0, err
-	}
-
-	switch qc.Type {
-	case qcode.QTInsert:
-		if _, err := c.renderInsert(qc, w, vars, ti); err != nil {
-			return 0, err
-		}
-
-	case qcode.QTUpdate:
-		if _, err := c.renderUpdate(qc, w, vars, ti); err != nil {
-			return 0, err
-		}
-
-	case qcode.QTUpsert:
-		if _, err := c.renderUpsert(qc, w, vars, ti); err != nil {
-			return 0, err
-		}
-
-	case qcode.QTDelete:
-		if _, err := c.renderDelete(qc, w, vars, ti); err != nil {
-			return 0, err
-		}
-
-	default:
-		return 0, errors.New("valid mutations are 'insert', 'update', 'upsert' and 'delete'")
-	}
-
-	root.Paging = noLimit
-	root.DistinctOn = root.DistinctOn[:]
-	root.OrderBy = root.OrderBy[:]
-	root.Where = nil
-	root.Args = nil
-
-	return c.compileQuery(qc, w, vars)
-}
-
-type kvitem struct {
-	id     int32
-	_type  itemType
-	_ctype int
-	key    string
-	path   []string
-	val    json.RawMessage
-	data   map[string]json.RawMessage
-	array  bool
-	ti     *DBTableInfo
-	relCP  *DBRel
-	relPC  *DBRel
-	items  []kvitem
-}
-
-type renitem struct {
-	kvitem
-	array bool
-	data  map[string]json.RawMessage
-}
-
-// TODO: Handle cases where a column name matches the child table name
-// the child path needs to be exluded in the json sent to insert or update
-
-func (c *compilerContext) handleKVItem(st *util.Stack, item kvitem) error {
-	var data map[string]json.RawMessage
-	var array bool
-	var err error
-
-	if item.data == nil {
-		data, array, err = jsn.Tree(item.val)
-		if err != nil {
-			return err
-		}
-	} else {
-		data, array = item.data, item.array
-	}
-
-	var unionize bool
-	id := item.id + 1
-
-	item.items = make([]kvitem, 0, len(data))
-
-	for k, v := range data {
-		if v[0] != '{' && v[0] != '[' {
-			continue
-		}
-
-		// Get child-to-parent relationship
-		relCP, err := c.schema.GetRel(k, item.key)
-		if err != nil {
-			var ty itemType
-			var ok bool
-
-			switch item._type {
-			case itemInsert:
-				ty, ok = insertTypes[k]
-			case itemUpdate:
-				ty, ok = updateTypes[k]
-			}
-
-			if ok {
-				unionize = true
-				item1 := item
-				item1._type = ty
-				item1.id = id
-				item1.val = v
-
-				item.items = append(item.items, item1)
-				id++
-			}
-
-			// Get parent-to-child relationship
-		} else if relPC, err := c.schema.GetRel(item.key, k); err == nil {
-			ti, err := c.schema.GetTable(k)
-			if err != nil {
-				return err
-			}
-
-			item1 := kvitem{
-				id:    id,
-				_type: item._type,
-				key:   k,
-				val:   v,
-				path:  append(item.path, k),
-				ti:    ti,
-				relCP: relCP,
-				relPC: relPC,
-			}
-
-			if v[0] == '{' {
-				item1.data, item1.array, err = jsn.Tree(v)
-				if err != nil {
-					return err
-				}
-				if v1, ok := item1.data["connect"]; ok && (v1[0] == '{' || v1[0] == '[') {
-					item1._ctype |= (1 << itemConnect)
-				}
-				if v1, ok := item1.data["disconnect"]; ok && (v1[0] == '{' || v1[0] == '[') {
-					item1._ctype |= (1 << itemDisconnect)
-				}
-			}
-
-			item.items = append(item.items, item1)
-			id++
-		}
-	}
-
-	if unionize {
-		item._type = itemUnion
-	}
-
-	// For inserts order the children according to
-	// the creation order required by the parent-to-child
-	// relationships. For example users need to be created
-	// before the products they own.
-
-	// For updates the order defined in the query must be
-	// the order used.
-	switch item._type {
-	case itemInsert:
-		for _, v := range item.items {
-			if v.relPC.Type == RelOneToMany {
-				st.Push(v)
-			}
-		}
-		st.Push(renitem{kvitem: item, array: array, data: data})
-		for _, v := range item.items {
-			if v.relPC.Type == RelOneToOne {
-				st.Push(v)
-			}
-		}
-
-	case itemUpdate:
-		for _, v := range item.items {
-			if !(v._ctype > 0 && v.relPC.Type == RelOneToOne) {
-				st.Push(v)
-			}
-		}
-		st.Push(renitem{kvitem: item, array: array, data: data})
-		for _, v := range item.items {
-			if v._ctype > 0 && v.relPC.Type == RelOneToOne {
-				st.Push(v)
-			}
-		}
-
-	case itemUnion:
-		st.Push(renitem{kvitem: item, array: array, data: data})
-		for _, v := range item.items {
-			st.Push(v)
-		}
-
-	default:
-		for _, v := range item.items {
-			st.Push(v)
-		}
-		st.Push(renitem{kvitem: item, array: array, data: data})
-	}
-
-	return nil
-}
-
-func (c *compilerContext) renderUnionStmt(w io.Writer, item renitem) error {
-	var connect, disconnect bool
-
-	// Render only for parent-to-child relationship of one-to-many
-	if item.relPC.Type != RelOneToMany {
-		return nil
-	}
-
-	for _, v := range item.items {
-		if v._type == itemConnect {
-			connect = true
-		} else if v._type == itemDisconnect {
-			disconnect = true
-		}
-		if connect && disconnect {
-			break
-		}
-	}
-
-	if connect {
-		io.WriteString(w, `, `)
-		if connect && disconnect {
-			renderCteNameWithSuffix(w, item.kvitem, "c")
-		} else {
-			quoted(w, item.ti.Name)
-		}
-		io.WriteString(w, ` AS ( UPDATE `)
-		quoted(w, item.ti.Name)
-		io.WriteString(w, ` SET `)
-		quoted(w, item.relPC.Right.Col)
-		io.WriteString(w, ` = `)
-
-		// When setting the id of the connected table in a one-to-many setting
-		// we always overwrite the value including for array columns
-		colWithTable(w, item.relPC.Left.Table, item.relPC.Left.Col)
-
-		io.WriteString(w, ` FROM `)
-		quoted(w, item.relPC.Left.Table)
-		io.WriteString(w, ` WHERE`)
-
-		i := 0
-		for _, v := range item.items {
-			if v._type == itemConnect {
-				if i != 0 {
-					io.WriteString(w, ` OR (`)
-				} else {
-					io.WriteString(w, ` (`)
-				}
-				if err := renderWhereFromJSON(w, v, "connect", v.val); err != nil {
-					return err
-				}
-				io.WriteString(w, `)`)
-				i++
-			}
-		}
-		io.WriteString(w, ` RETURNING `)
-		quoted(w, item.ti.Name)
-		io.WriteString(w, `.*)`)
-	}
-
-	if disconnect {
-		io.WriteString(w, `, `)
-		if connect && disconnect {
-			renderCteNameWithSuffix(w, item.kvitem, "d")
-		} else {
-			quoted(w, item.ti.Name)
-		}
-		io.WriteString(w, ` AS ( UPDATE `)
-		quoted(w, item.ti.Name)
-		io.WriteString(w, ` SET `)
-		quoted(w, item.relPC.Right.Col)
-		io.WriteString(w, ` = `)
-
-		if item.relPC.Right.Array {
-			io.WriteString(w, ` array_remove(`)
-			quoted(w, item.relPC.Right.Col)
-			io.WriteString(w, `, `)
-			colWithTable(w, item.relPC.Left.Table, item.relPC.Left.Col)
-			io.WriteString(w, `)`)
-
-		} else {
-			io.WriteString(w, ` NULL`)
-		}
-
-		io.WriteString(w, ` FROM `)
-		quoted(w, item.relPC.Left.Table)
-		io.WriteString(w, ` WHERE`)
-
-		i := 0
-		for _, v := range item.items {
-			if v._type == itemDisconnect {
-				if i != 0 {
-					io.WriteString(w, ` OR (`)
-				} else {
-					io.WriteString(w, ` (`)
-				}
-				if err := renderWhereFromJSON(w, v, "disconnect", v.val); err != nil {
-					return err
-				}
-				io.WriteString(w, `)`)
-				i++
-			}
-		}
-		io.WriteString(w, ` RETURNING `)
-		quoted(w, item.ti.Name)
-		io.WriteString(w, `.*)`)
-	}
-
-	if connect && disconnect {
-		io.WriteString(w, `, `)
-		quoted(w, item.ti.Name)
-		io.WriteString(w, ` AS (`)
-		io.WriteString(w, `SELECT * FROM `)
-		renderCteNameWithSuffix(w, item.kvitem, "c")
-		io.WriteString(w, ` UNION ALL `)
-		io.WriteString(w, `SELECT * FROM `)
-		renderCteNameWithSuffix(w, item.kvitem, "d")
-		io.WriteString(w, `)`)
-	}
-
-	return nil
-}
-
-func renderInsertUpdateColumns(w io.Writer,
-	qc *qcode.QCode,
-	jt map[string]json.RawMessage,
-	ti *DBTableInfo,
-	skipcols map[string]struct{},
-	values bool) (uint32, error) {
-
-	root := &qc.Selects[0]
-	renderedCol := false
-
-	n := 0
-	for _, cn := range ti.Columns {
-		if _, ok := skipcols[cn.Name]; ok {
-			continue
-		}
-		if _, ok := jt[cn.Key]; !ok {
-			continue
-		}
-		if _, ok := root.PresetMap[cn.Key]; ok {
-			continue
-		}
-		if len(root.Allowed) != 0 {
-			if _, ok := root.Allowed[cn.Key]; !ok {
-				continue
-			}
-		}
-		if n != 0 {
-			io.WriteString(w, `, `)
-		}
-
-		if values {
-			io.WriteString(w, `CAST( i.j ->>`)
-			io.WriteString(w, `'`)
-			io.WriteString(w, cn.Name)
-			io.WriteString(w, `' AS `)
-			io.WriteString(w, cn.Type)
-			io.WriteString(w, `)`)
-		} else {
-			quoted(w, cn.Name)
-		}
-
-		if !renderedCol {
-			renderedCol = true
-		}
-		n++
-	}
-
-	for i := range root.PresetList {
-		cn := root.PresetList[i]
-		col, ok := ti.ColMap[cn]
-		if !ok {
-			continue
-		}
-		if _, ok := skipcols[col.Name]; ok {
-			continue
-		}
-		if i != 0 || n != 0 {
-			io.WriteString(w, `, `)
-		}
-
-		if values {
-			io.WriteString(w, `'`)
-			io.WriteString(w, root.PresetMap[cn])
-			io.WriteString(w, `' :: `)
-			io.WriteString(w, col.Type)
-		} else {
-			quoted(w, cn)
-		}
-
-		if !renderedCol {
-			renderedCol = true
-		}
-	}
-
-	if len(skipcols) != 0 && renderedCol {
-		io.WriteString(w, `, `)
-	}
-	return 0, nil
-}
-
-func (c *compilerContext) renderUpsert(qc *qcode.QCode, w io.Writer,
-	vars Variables, ti *DBTableInfo) (uint32, error) {
-	root := &qc.Selects[0]
-
-	upsert, ok := vars[qc.ActionVar]
-	if !ok {
-		return 0, fmt.Errorf("variable '%s' not defined", qc.ActionVar)
-	}
-	if len(upsert) == 0 {
-		return 0, fmt.Errorf("variable '%s' is empty", qc.ActionVar)
-	}
-
-	if ti.PrimaryCol == nil {
-		return 0, fmt.Errorf("no primary key column found")
-	}
-
-	jt, _, err := jsn.Tree(upsert)
-	if err != nil {
-		return 0, err
-	}
-
-	if _, err := c.renderInsert(qc, w, vars, ti); err != nil {
-		return 0, err
-	}
-
-	io.WriteString(c.w, ` ON CONFLICT (`)
-	i := 0
-
-	for _, cn := range ti.Columns {
-		if _, ok := jt[cn.Key]; !ok {
-			continue
-		}
-
-		if col, ok := ti.ColMap[cn.Key]; !ok || !(col.UniqueKey || col.PrimaryKey) {
-			continue
-		}
-
-		if i != 0 {
-			io.WriteString(c.w, `, `)
-		}
-		io.WriteString(c.w, cn.Name)
-		i++
-	}
-	if i == 0 {
-		io.WriteString(c.w, ti.PrimaryCol.Name)
-	}
-	io.WriteString(c.w, `)`)
-
-	if root.Where != nil {
-		io.WriteString(c.w, ` WHERE `)
-
-		if err := c.renderWhere(root, ti); err != nil {
-			return 0, err
-		}
-	}
-
-	io.WriteString(c.w, ` DO UPDATE SET `)
-
-	i = 0
-	for _, cn := range ti.Columns {
-		if _, ok := jt[cn.Key]; !ok {
-			continue
-		}
-		if i != 0 {
-			io.WriteString(c.w, `, `)
-		}
-		io.WriteString(c.w, cn.Name)
-		io.WriteString(c.w, ` = EXCLUDED.`)
-		io.WriteString(c.w, cn.Name)
-		i++
-	}
-
-	io.WriteString(c.w, ` RETURNING *) `)
-
-	return 0, nil
-}
-
-func (c *compilerContext) renderConnectStmt(qc *qcode.QCode, w io.Writer,
-	item renitem) error {
-
-	rel := item.relPC
-
-	// Render only for parent-to-child relationship of one-to-one
-	// For this to work the child needs to found first so it's primary key
-	// can be set in the related column on the parent object.
-	// Eg. Create product and connect a user to it.
-	if rel.Type != RelOneToOne {
-		return nil
-	}
-
-	io.WriteString(w, `, "_x_`)
-	io.WriteString(c.w, item.ti.Name)
-	io.WriteString(c.w, `" AS (SELECT `)
-
-	if rel.Left.Array {
-		io.WriteString(w, `array_agg(DISTINCT `)
-		quoted(w, rel.Right.Col)
-		io.WriteString(w, `) AS `)
-		quoted(w, rel.Right.Col)
-
-	} else {
-		quoted(w, rel.Right.Col)
-
-	}
-
-	io.WriteString(c.w, ` FROM "_sg_input" i,`)
-	quoted(c.w, item.ti.Name)
-
-	io.WriteString(c.w, ` WHERE `)
-	if err := renderWhereFromJSON(c.w, item.kvitem, "connect", item.kvitem.val); err != nil {
-		return err
-	}
-	io.WriteString(c.w, ` LIMIT 1)`)
-
-	return nil
-}
-
-func (c *compilerContext) renderDisconnectStmt(qc *qcode.QCode, w io.Writer,
-	item renitem) error {
-
-	rel := item.relPC
-
-	// Render only for parent-to-child relationship of one-to-one
-	// For this to work the child needs to found first so it's
-	// null value can beset in the related column on the parent object.
-	// Eg. Update product and diconnect the user from it.
-	if rel.Type != RelOneToOne {
-		return nil
-	}
-	io.WriteString(w, `, "_x_`)
-	io.WriteString(c.w, item.ti.Name)
-	io.WriteString(c.w, `" AS (`)
-
-	if rel.Right.Array {
-		io.WriteString(c.w, `SELECT `)
-		quoted(w, rel.Right.Col)
-		io.WriteString(c.w, ` FROM "_sg_input" i,`)
-		quoted(c.w, item.ti.Name)
-		io.WriteString(c.w, ` WHERE `)
-		if err := renderWhereFromJSON(c.w, item.kvitem, "connect", item.kvitem.val); err != nil {
-			return err
-		}
-		io.WriteString(c.w, ` LIMIT 1))`)
-
-	} else {
-		io.WriteString(c.w, `SELECT * FROM (VALUES(NULL::`)
-		io.WriteString(w, rel.Right.col.Type)
-		io.WriteString(c.w, `)) AS LOOKUP(`)
-		quoted(w, rel.Right.Col)
-		io.WriteString(c.w, `))`)
-	}
-
-	return nil
-}
-
-func renderWhereFromJSON(w io.Writer, item kvitem, key string, val []byte) error {
-	var kv map[string]json.RawMessage
-	ti := item.ti
-
-	if err := json.Unmarshal(val, &kv); err != nil {
-		return err
-	}
-	i := 0
-	for k, v := range kv {
-		col, ok := ti.ColMap[k]
-		if !ok {
-			continue
-		}
-		if i != 0 {
-			io.WriteString(w, ` AND `)
-		}
-
-		if v[0] == '[' {
-			colWithTable(w, ti.Name, k)
-
-			if col.Array {
-				io.WriteString(w, ` && `)
-			} else {
-				io.WriteString(w, ` = `)
-			}
-
-			io.WriteString(w, `ANY((select a::`)
-			io.WriteString(w, col.Type)
-
-			io.WriteString(w, ` AS list from json_array_elements_text(`)
-			renderPathJSON(w, item, key, k)
-			io.WriteString(w, `::json) AS a))`)
-
-		} else if col.Array {
-			io.WriteString(w, `(`)
-			renderPathJSON(w, item, key, k)
-			io.WriteString(w, `)::`)
-			io.WriteString(w, col.Type)
-
-			io.WriteString(w, ` = ANY(`)
-			colWithTable(w, ti.Name, k)
-			io.WriteString(w, `)`)
-
-		} else {
-			colWithTable(w, ti.Name, k)
-
-			io.WriteString(w, `= (`)
-			renderPathJSON(w, item, key, k)
-			io.WriteString(w, `)::`)
-			io.WriteString(w, col.Type)
-		}
-
-		i++
-	}
-	return nil
-}
-
-func renderPathJSON(w io.Writer, item kvitem, key1, key2 string) {
-	io.WriteString(w, `(i.j->`)
-	joinPath(w, item.path)
-	io.WriteString(w, `->'`)
-	io.WriteString(w, key1)
-	io.WriteString(w, `'->>'`)
-	io.WriteString(w, key2)
-	io.WriteString(w, `')`)
-}
-
-func renderCteName(w io.Writer, item kvitem) error {
-	io.WriteString(w, `"`)
-	io.WriteString(w, item.ti.Name)
-	if item._type == itemConnect || item._type == itemDisconnect {
-		io.WriteString(w, `_`)
-		int2string(w, item.id)
-	}
-	io.WriteString(w, `"`)
-	return nil
-}
-
-func renderCteNameWithSuffix(w io.Writer, item kvitem, suffix string) error {
-	io.WriteString(w, `"`)
-	io.WriteString(w, item.ti.Name)
-	io.WriteString(w, `_`)
-	io.WriteString(w, suffix)
-	io.WriteString(w, `"`)
-	return nil
-}
-
-func joinPath(w io.Writer, path []string) {
-	for i := range path {
-		if i != 0 {
-			io.WriteString(w, `->`)
-		}
-		io.WriteString(w, `'`)
-		io.WriteString(w, path[i])
-		io.WriteString(w, `'`)
-	}
-}

core/internal/psql/mutate_test.go

@@ -1,123 +0,0 @@
-package psql
-
-import (
-	"encoding/json"
-	"testing"
-)
-
-func singleUpsert(t *testing.T) {
-	gql := `mutation {
-		product(upsert: $upsert) {
-			id
-			name
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"upsert": json.RawMessage(` { "name": "my_name", "description": "my_desc"  }`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "user")
-}
-
-func singleUpsertWhere(t *testing.T) {
-	gql := `mutation {
-		product(upsert: $upsert, where: { price : { gt: 3 } }) {
-			id
-			name
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"upsert": json.RawMessage(` { "name": "my_name",  "description": "my_desc"  }`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "user")
-}
-
-func bulkUpsert(t *testing.T) {
-	gql := `mutation {
-		product(upsert: $upsert) {
-			id
-			name
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"upsert": json.RawMessage(` [{ "name": "my_name",  "description": "my_desc"  }]`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "user")
-}
-
-func delete(t *testing.T) {
-	gql := `mutation {
-		product(delete: true, where: { id: { eq: 1 } }) {
-			id
-			name
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"update": json.RawMessage(` { "name": "my_name", "description": "my_desc"  }`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "user")
-}
-
-// func blockedInsert(t *testing.T) {
-// 	gql := `mutation {
-// 		user(insert: $data) {
-// 			id
-// 		}
-// 	}`
-
-// 	sql := `WITH "users" AS (WITH "input" AS (SELECT '{{data}}' :: json AS j) INSERT INTO "users" ("full_name", "email") SELECT "full_name", "email" FROM input i, json_populate_record(NULL::users, i.j) t WHERE false RETURNING *) SELECT json_object_agg('user', json_0) FROM (SELECT row_to_json((SELECT "json_row_0" FROM (SELECT "users_0"."id" AS "id") AS "json_row_0")) AS "json_0" FROM (SELECT "users"."id" FROM "users" LIMIT ('1') :: integer) AS "users_0" LIMIT ('1') :: integer) AS "sel_0"`
-
-// 	vars := map[string]json.RawMessage{
-// 		"data": json.RawMessage(`{"email": "reannagreenholt@orn.com", "full_name": "Flo Barton"}`),
-// 	}
-
-// 	resSQL, err := compileGQLToPSQL(gql, vars, "bad_dude")
-// 	if err != nil {
-// 		t.Fatal(err)
-// 	}
-// 	fmt.Println(string(resSQL))
-
-// 	if string(resSQL) != sql {
-// 		t.Fatal(errNotExpected)
-// 	}
-// }
-
-// func blockedUpdate(t *testing.T) {
-// 	gql := `mutation {
-// 		user(where: { id: { lt: 5 } }, update: $data) {
-// 			id
-// 			email
-// 		}
-// 	}`
-
-// 	sql := `WITH "users" AS (WITH "input" AS (SELECT '{{data}}' :: json AS j) UPDATE "users" SET ("full_name", "email") = (SELECT "full_name", "email" FROM input i, json_populate_record(NULL::users, i.j) t) WHERE false RETURNING *) SELECT json_object_agg('user', json_0) FROM (SELECT row_to_json((SELECT "json_row_0" FROM (SELECT "users_0"."id" AS "id", "users_0"."email" AS "email") AS "json_row_0")) AS "json_0" FROM (SELECT "users"."id", "users"."email" FROM "users" LIMIT ('1') :: integer) AS "users_0" LIMIT ('1') :: integer) AS "sel_0"`
-
-// 	vars := map[string]json.RawMessage{
-// 		"data": json.RawMessage(`{"email": "reannagreenholt@orn.com", "full_name": "Flo Barton"}`),
-// 	}
-
-// 	resSQL, err := compileGQLToPSQL(gql, vars, "bad_dude")
-// 	if err != nil {
-// 		t.Fatal(err)
-// 	}
-
-// 	if string(resSQL) != sql {
-// 		t.Fatal(errNotExpected)
-// 	}
-// }
-
-func TestCompileMutate(t *testing.T) {
-	t.Run("singleUpsert", singleUpsert)
-	t.Run("singleUpsertWhere", singleUpsertWhere)
-	t.Run("bulkUpsert", bulkUpsert)
-	t.Run("delete", delete)
-	// t.Run("blockedInsert", blockedInsert)
-	// t.Run("blockedUpdate", blockedUpdate)
-}

core/internal/psql/psql_test.go

@@ -1,237 +0,0 @@
-package psql
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/dosco/super-graph/core/internal/qcode"
-)
-
-const (
-	errNotExpected = "Generated SQL did not match what was expected"
-	headerMarker   = "=== RUN"
-	commentMarker  = "---"
-)
-
-var (
-	qcompile *qcode.Compiler
-	pcompile *Compiler
-	expected map[string][]string
-)
-
-func TestMain(m *testing.M) {
-	var err error
-
-	qcompile, err = qcode.NewCompiler(qcode.Config{
-		Blocklist: []string{
-			"secret",
-			"password",
-			"token",
-		},
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = qcompile.AddRole("user", "product", qcode.TRConfig{
-		Query: qcode.QueryConfig{
-			Columns: []string{"id", "name", "price", "users", "customers"},
-			Filters: []string{
-				"{ price: { gt: 0 } }",
-				"{ price: { lt: 8 } }",
-			},
-		},
-		Insert: qcode.InsertConfig{
-			Presets: map[string]string{
-				"user_id":    "$user_id",
-				"created_at": "now",
-				"updated_at": "now",
-			},
-		},
-		Update: qcode.UpdateConfig{
-			Filters: []string{"{ user_id: { eq: $user_id } }"},
-			Presets: map[string]string{"updated_at": "now"},
-		},
-		Delete: qcode.DeleteConfig{
-			Filters: []string{
-				"{ price: { gt: 0 } }",
-				"{ price: { lt: 8 } }",
-			},
-		},
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = qcompile.AddRole("anon", "product", qcode.TRConfig{
-		Query: qcode.QueryConfig{
-			Columns: []string{"id", "name"},
-		},
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = qcompile.AddRole("anon1", "product", qcode.TRConfig{
-		Query: qcode.QueryConfig{
-			Columns:          []string{"id", "name", "price"},
-			DisableFunctions: true,
-		},
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = qcompile.AddRole("user", "users", qcode.TRConfig{
-		Query: qcode.QueryConfig{
-			Columns: []string{"id", "full_name", "avatar", "email", "products"},
-		},
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = qcompile.AddRole("bad_dude", "users", qcode.TRConfig{
-		Query: qcode.QueryConfig{
-			Filters:          []string{"false"},
-			DisableFunctions: true,
-		},
-		Insert: qcode.InsertConfig{
-			Filters: []string{"false"},
-		},
-		Update: qcode.UpdateConfig{
-			Filters: []string{"false"},
-		},
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = qcompile.AddRole("user", "mes", qcode.TRConfig{
-		Query: qcode.QueryConfig{
-			Columns: []string{"id", "full_name", "avatar"},
-			Filters: []string{
-				"{ id: { eq: $user_id } }",
-			},
-		},
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = qcompile.AddRole("user", "customers", qcode.TRConfig{
-		Query: qcode.QueryConfig{
-			Columns: []string{"id", "email", "full_name", "products"},
-		},
-	})
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	schema := getTestSchema()
-
-	vars := NewVariables(map[string]string{
-		"admin_account_id": "5",
-	})
-
-	pcompile = NewCompiler(Config{
-		Schema: schema,
-		Vars:   vars,
-	})
-
-	expected = make(map[string][]string)
-
-	b, err := ioutil.ReadFile("tests.sql")
-	if err != nil {
-		log.Fatal(err)
-	}
-	text := string(b)
-	lines := strings.Split(text, "\n")
-
-	var h string
-
-	for _, v := range lines {
-		switch {
-		case strings.HasPrefix(v, headerMarker):
-			h = strings.TrimSpace(v[len(headerMarker):])
-
-		case strings.HasPrefix(v, commentMarker):
-			break
-
-		default:
-			v := strings.TrimSpace(v)
-			if len(v) != 0 {
-				expected[h] = append(expected[h], v)
-			}
-		}
-	}
-	os.Exit(m.Run())
-}
-
-func compileGQLToPSQL(t *testing.T, gql string, vars Variables, role string) {
-	generateTestFile := false
-
-	if generateTestFile {
-		var sqlStmts []string
-
-		for i := 0; i < 100; i++ {
-			qc, err := qcompile.Compile([]byte(gql), role)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			_, sqlB, err := pcompile.CompileEx(qc, vars)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			sql := string(sqlB)
-
-			match := false
-			for _, s := range sqlStmts {
-				if sql == s {
-					match = true
-					break
-				}
-			}
-
-			if !match {
-				s := string(sql)
-				sqlStmts = append(sqlStmts, s)
-				fmt.Println(s)
-			}
-		}
-
-		return
-	}
-
-	for i := 0; i < 200; i++ {
-		qc, err := qcompile.Compile([]byte(gql), role)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		_, sqlStmt, err := pcompile.CompileEx(qc, vars)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		failed := true
-
-		for _, sql := range expected[t.Name()] {
-			if string(sqlStmt) == sql {
-				failed = false
-			}
-		}
-
-		if failed {
-			fmt.Println(string(sqlStmt))
-			t.Fatal(errNotExpected)
-		}
-	}
-}

core/internal/psql/query_test.go

@@ -1,459 +0,0 @@
-package psql
-
-import (
-	"bytes"
-	"encoding/json"
-	"testing"
-)
-
-func withComplexArgs(t *testing.T) {
-	gql := `query {
-		proDUcts(
-			# returns only 30 items
-			limit: 30,
-
-			# starts from item 10, commented out for now
-			# offset: 10,
-
-			# orders the response items by highest price
-			order_by: { price: desc },
-
-			# no duplicate prices returned
-			distinct: [ price ]
-
-			# only items with an id >= 20 and < 28 are returned
-			where: { id: { and: { greater_or_equals: 20, lt: 28 } } }) {
-			id
-			NAME
-			price
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func withWhereAndList(t *testing.T) {
-	gql := `query {
-		products(
-			where: {
-				and: [
-					{ not: { id: { is_null: true } } },
-					{ price: { gt: 10 } },
-				] } ) {
-			id
-			name
-			price
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func withWhereIsNull(t *testing.T) {
-	gql := `query {
-		products(
-			where: {
-				and: {
-					not: { id: { is_null: true } },
-					price: { gt: 10 }
-				}}) {
-			id
-			name
-			price
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func withWhereMultiOr(t *testing.T) {
-	gql := `query {
-		products(
-			where: {
-				or: {
-					not: { id: { is_null: true } },
-					price: { gt: 10 },
-					price: { lt: 20 }
-				} }
-			) {
-			id
-			name
-			price
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func fetchByID(t *testing.T) {
-	gql := `query {
-		product(id: $id) {
-			id
-			name
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func searchQuery(t *testing.T) {
-	gql := `query {
-		products(search: $query) {
-			id
-			name
-			search_rank
-			search_headline_description
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "admin")
-}
-
-func oneToMany(t *testing.T) {
-	gql := `query {
-		users {
-			email
-			products {
-				name
-				price
-			}
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func oneToManyReverse(t *testing.T) {
-	gql := `query {
-		products {
-			name
-			price
-			users {
-				email
-			}
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func oneToManyArray(t *testing.T) {
-	gql := `
-	query {
-		product {
-			name
-			price
-			tags {
-				id
-				name
-			}
-		}
-		tags {
-			name
-			product {
-				name
-			}
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "admin")
-}
-
-func manyToMany(t *testing.T) {
-	gql := `query {
-		products {
-			name
-			customers {
-				email
-				full_name
-			}
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func manyToManyReverse(t *testing.T) {
-	gql := `query {
-		customers {
-			email
-			full_name
-			products {
-				name
-			}
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func aggFunction(t *testing.T) {
-	gql := `query {
-		products {
-			name
-			count_price
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func aggFunctionBlockedByCol(t *testing.T) {
-	gql := `query {
-		products {
-			name
-			count_price
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "anon")
-}
-
-func aggFunctionDisabled(t *testing.T) {
-	gql := `query {
-		products {
-			name
-			count_price
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "anon1")
-}
-
-func aggFunctionWithFilter(t *testing.T) {
-	gql := `query {
-		products(where: { id: { gt: 10 } }) {
-			id
-			max_price
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func syntheticTables(t *testing.T) {
-	gql := `query {
-		me {
-			email
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func queryWithVariables(t *testing.T) {
-	gql := `query {
-		product(id: $PRODUCT_ID, where: { price: { eq: $PRODUCT_PRICE } }) {
-			id
-			name
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func withWhereOnRelations(t *testing.T) {
-	gql := `query {
-		users(where: { 
-				not: { 
-					products: { 
-						price: { gt: 3 }
-					} 
-				} 
-			}) {
-			id
-			email
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func multiRoot(t *testing.T) {
-	gql := `query {
-		product {
-			id
-			name
-			customer {
-				email
-			}
-			customers {
-				email
-			}
-		}
-		user {
-			id
-			email
-		}
-		customer {
-			id
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "user")
-}
-
-func withCursor(t *testing.T) {
-	gql := `query {
-		Products(
-			first: 20
-			after: $cursor
-			order_by: { price: desc }) {
-			Name
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"cursor": json.RawMessage(`"0,1"`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func jsonColumnAsTable(t *testing.T) {
-	gql := `query {
-		products {
-			id
-			name
-			tag_count {
-				count
-				tags {
-					name
-				}
-			}
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "admin")
-}
-
-func nullForAuthRequiredInAnon(t *testing.T) {
-	gql := `query {
-		products {
-			id
-			name
-			user(where: { id: { eq: $user_id } }) {
-				id
-				email
-			}
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "anon")
-}
-
-func blockedQuery(t *testing.T) {
-	gql := `query {
-		user(id: $id, where: { id: { gt: 3 } }) {
-			id
-			full_name
-			email
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "bad_dude")
-}
-
-func blockedFunctions(t *testing.T) {
-	gql := `query {
-		users {
-			count_id
-			email
-		}
-	}`
-
-	compileGQLToPSQL(t, gql, nil, "bad_dude")
-}
-
-func TestCompileQuery(t *testing.T) {
-	t.Run("withComplexArgs", withComplexArgs)
-	t.Run("withWhereAndList", withWhereAndList)
-	t.Run("withWhereIsNull", withWhereIsNull)
-	t.Run("withWhereMultiOr", withWhereMultiOr)
-	t.Run("fetchByID", fetchByID)
-	t.Run("searchQuery", searchQuery)
-	t.Run("oneToMany", oneToMany)
-	t.Run("oneToManyReverse", oneToManyReverse)
-	t.Run("oneToManyArray", oneToManyArray)
-	t.Run("manyToMany", manyToMany)
-	t.Run("manyToManyReverse", manyToManyReverse)
-	t.Run("aggFunction", aggFunction)
-	t.Run("aggFunctionBlockedByCol", aggFunctionBlockedByCol)
-	t.Run("aggFunctionDisabled", aggFunctionDisabled)
-	t.Run("aggFunctionWithFilter", aggFunctionWithFilter)
-	t.Run("syntheticTables", syntheticTables)
-	t.Run("queryWithVariables", queryWithVariables)
-	t.Run("withWhereOnRelations", withWhereOnRelations)
-	t.Run("multiRoot", multiRoot)
-	t.Run("jsonColumnAsTable", jsonColumnAsTable)
-	t.Run("withCursor", withCursor)
-	t.Run("nullForAuthRequiredInAnon", nullForAuthRequiredInAnon)
-	t.Run("blockedQuery", blockedQuery)
-	t.Run("blockedFunctions", blockedFunctions)
-}
-
-var benchGQL = []byte(`query {
-	proDUcts(
-		# returns only 30 items
-		limit: 30,
-
-		# starts from item 10, commented out for now
-		# offset: 10,
-
-		# orders the response items by highest price
-		order_by: { price: desc },
-
-		# only items with an id >= 30 and < 30 are returned
-		where: { id: { and: { greater_or_equals: 20, lt: 28 } } }) {
-		id
-		NAME
-		price
-		user {
-			full_name
-			picture : avatar
-		}
-	}
-}`)
-
-func BenchmarkCompile(b *testing.B) {
-	w := &bytes.Buffer{}
-
-	b.ResetTimer()
-	b.ReportAllocs()
-
-	for n := 0; n < b.N; n++ {
-		w.Reset()
-
-		qc, err := qcompile.Compile(benchGQL, "user")
-		if err != nil {
-			b.Fatal(err)
-		}
-
-		_, err = pcompile.Compile(qc, w, nil)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkCompileParallel(b *testing.B) {
-	b.ReportAllocs()
-
-	b.RunParallel(func(pb *testing.PB) {
-		w := &bytes.Buffer{}
-
-		for pb.Next() {
-			w.Reset()
-
-			qc, err := qcompile.Compile(benchGQL, "user")
-			if err != nil {
-				b.Fatal(err)
-			}
-
-			_, err = pcompile.Compile(qc, w, nil)
-			if err != nil {
-				b.Fatal(err)
-			}
-		}
-	})
-}

core/internal/psql/schema.go

@@ -1,426 +0,0 @@
-package psql
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/gobuffalo/flect"
-)
-
-type DBSchema struct {
-	ver int
-	t   map[string]*DBTableInfo
-	rm  map[string]map[string]*DBRel
-}
-
-type DBTableInfo struct {
-	Name       string
-	Type       string
-	Singular   bool
-	Columns    []DBColumn
-	PrimaryCol *DBColumn
-	TSVCol     *DBColumn
-	ColMap     map[string]*DBColumn
-	ColIDMap   map[int16]*DBColumn
-}
-
-type RelType int
-
-const (
-	RelOneToOne RelType = iota + 1
-	RelOneToMany
-	RelOneToManyThrough
-	RelEmbedded
-	RelRemote
-)
-
-type DBRel struct {
-	Type    RelType
-	Through string
-	ColT    string
-	Left    struct {
-		col   *DBColumn
-		Table string
-		Col   string
-		Array bool
-	}
-	Right struct {
-		col   *DBColumn
-		Table string
-		Col   string
-		Array bool
-	}
-}
-
-func NewDBSchema(info *DBInfo, aliases map[string][]string) (*DBSchema, error) {
-	schema := &DBSchema{
-		t:  make(map[string]*DBTableInfo),
-		rm: make(map[string]map[string]*DBRel),
-	}
-
-	for i, t := range info.Tables {
-		err := schema.addTable(t, info.Columns[i], aliases)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	for i, t := range info.Tables {
-		err := schema.firstDegreeRels(t, info.Columns[i])
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	for i, t := range info.Tables {
-		err := schema.secondDegreeRels(t, info.Columns[i])
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return schema, nil
-}
-
-func (s *DBSchema) addTable(
-	t DBTable, cols []DBColumn, aliases map[string][]string) error {
-
-	colmap := make(map[string]*DBColumn, len(cols))
-	colidmap := make(map[int16]*DBColumn, len(cols))
-
-	singular := flect.Singularize(t.Key)
-	s.t[singular] = &DBTableInfo{
-		Name:     t.Name,
-		Type:     t.Type,
-		Singular: true,
-		Columns:  cols,
-		ColMap:   colmap,
-		ColIDMap: colidmap,
-	}
-
-	plural := flect.Pluralize(t.Key)
-	s.t[plural] = &DBTableInfo{
-		Name:     t.Name,
-		Type:     t.Type,
-		Singular: false,
-		Columns:  cols,
-		ColMap:   colmap,
-		ColIDMap: colidmap,
-	}
-
-	if al, ok := aliases[t.Key]; ok {
-		for i := range al {
-			k1 := flect.Singularize(al[i])
-			s.t[k1] = s.t[singular]
-
-			k2 := flect.Pluralize(al[i])
-			s.t[k2] = s.t[plural]
-		}
-	}
-
-	for i := range cols {
-		c := &cols[i]
-
-		switch {
-		case c.Type == "tsvector":
-			s.t[singular].TSVCol = c
-			s.t[plural].TSVCol = c
-
-		case c.PrimaryKey:
-			s.t[singular].PrimaryCol = c
-			s.t[plural].PrimaryCol = c
-		}
-
-		colmap[c.Key] = c
-		colidmap[c.ID] = c
-	}
-
-	return nil
-}
-
-func (s *DBSchema) firstDegreeRels(t DBTable, cols []DBColumn) error {
-	ct := t.Key
-	cti, ok := s.t[ct]
-	if !ok {
-		return fmt.Errorf("invalid foreign key table '%s'", ct)
-	}
-
-	for i := range cols {
-		c := cols[i]
-
-		if len(c.FKeyTable) == 0 {
-			continue
-		}
-
-		// Foreign key column name
-		ft := strings.ToLower(c.FKeyTable)
-
-		ti, ok := s.t[ft]
-		if !ok {
-			return fmt.Errorf("invalid foreign key table '%s'", ft)
-		}
-
-		// This is an embedded relationship like when a json/jsonb column
-		// is exposed as a table
-		if c.Name == c.FKeyTable && len(c.FKeyColID) == 0 {
-			rel := &DBRel{Type: RelEmbedded}
-			rel.Left.col = cti.PrimaryCol
-			rel.Left.Table = cti.Name
-			rel.Left.Col = cti.PrimaryCol.Name
-
-			rel.Right.col = &c
-			rel.Right.Table = ti.Name
-			rel.Right.Col = c.Name
-
-			if err := s.SetRel(ft, ct, rel); err != nil {
-				return err
-			}
-			continue
-		}
-
-		if len(c.FKeyColID) == 0 {
-			continue
-		}
-
-		// Foreign key column id
-		fcid := c.FKeyColID[0]
-
-		fc, ok := ti.ColIDMap[fcid]
-		if !ok {
-			return fmt.Errorf("invalid foreign key column id '%d' for table '%s'",
-				fcid, ti.Name)
-		}
-
-		var rel1, rel2 *DBRel
-
-		// One-to-many relation between current table and the
-		// table in the foreign key
-		if fc.UniqueKey {
-			rel1 = &DBRel{Type: RelOneToOne}
-		} else {
-			rel1 = &DBRel{Type: RelOneToMany}
-		}
-
-		rel1.Left.col = &c
-		rel1.Left.Table = t.Name
-		rel1.Left.Col = c.Name
-		rel1.Left.Array = c.Array
-
-		rel1.Right.col = fc
-		rel1.Right.Table = c.FKeyTable
-		rel1.Right.Col = fc.Name
-		rel1.Right.Array = fc.Array
-
-		if err := s.SetRel(ct, ft, rel1); err != nil {
-			return err
-		}
-
-		// One-to-many reverse relation between the foreign key table and the
-		// the current table
-		if c.UniqueKey {
-			rel2 = &DBRel{Type: RelOneToOne}
-		} else {
-			rel2 = &DBRel{Type: RelOneToMany}
-		}
-
-		rel2.Left.col = fc
-		rel2.Left.Table = c.FKeyTable
-		rel2.Left.Col = fc.Name
-		rel2.Left.Array = fc.Array
-
-		rel2.Right.col = &c
-		rel2.Right.Table = t.Name
-		rel2.Right.Col = c.Name
-		rel2.Right.Array = c.Array
-
-		if err := s.SetRel(ft, ct, rel2); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (s *DBSchema) secondDegreeRels(t DBTable, cols []DBColumn) error {
-	jcols := make([]DBColumn, 0, len(cols))
-	ct := t.Key
-	cti, ok := s.t[ct]
-	if !ok {
-		return fmt.Errorf("invalid foreign key table '%s'", ct)
-	}
-
-	for i := range cols {
-		c := cols[i]
-
-		if len(c.FKeyTable) == 0 {
-			continue
-		}
-
-		// Foreign key column name
-		ft := strings.ToLower(c.FKeyTable)
-
-		ti, ok := s.t[ft]
-		if !ok {
-			return fmt.Errorf("invalid foreign key table '%s'", ft)
-		}
-
-		// This is an embedded relationship like when a json/jsonb column
-		// is exposed as a table
-		if c.Name == c.FKeyTable && len(c.FKeyColID) == 0 {
-			continue
-		}
-
-		if len(c.FKeyColID) == 0 {
-			continue
-		}
-
-		// Foreign key column id
-		fcid := c.FKeyColID[0]
-
-		if _, ok := ti.ColIDMap[fcid]; !ok {
-			return fmt.Errorf("invalid foreign key column id '%d' for table '%s'",
-				fcid, ti.Name)
-		}
-
-		jcols = append(jcols, c)
-	}
-
-	// If table contains multiple foreign key columns it's a possible
-	// join table for many-to-many relationships or multiple one-to-many
-	// relations
-
-	// Below one-to-many relations use the current table as the
-	// join table aka through table.
-	if len(jcols) > 1 {
-		for i := range jcols {
-			for n := range jcols {
-				if n == i {
-					continue
-				}
-				err := s.updateSchemaOTMT(cti, jcols[i], jcols[n])
-				if err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
-func (s *DBSchema) updateSchemaOTMT(
-	ti *DBTableInfo, col1, col2 DBColumn) error {
-
-	t1 := strings.ToLower(col1.FKeyTable)
-	t2 := strings.ToLower(col2.FKeyTable)
-
-	fc1, ok := s.t[t1].ColIDMap[col1.FKeyColID[0]]
-	if !ok {
-		return fmt.Errorf("invalid foreign key column id '%d' for table '%s'",
-			col1.FKeyColID[0], ti.Name)
-	}
-	fc2, ok := s.t[t2].ColIDMap[col2.FKeyColID[0]]
-	if !ok {
-		return fmt.Errorf("invalid foreign key column id '%d' for table '%s'",
-			col2.FKeyColID[0], ti.Name)
-	}
-
-	// One-to-many-through relation between 1nd foreign key table and the
-	// 2nd foreign key table
-	rel1 := &DBRel{Type: RelOneToManyThrough}
-	rel1.Through = ti.Name
-	rel1.ColT = col2.Name
-
-	rel1.Left.col = &col2
-	rel1.Left.Table = col2.FKeyTable
-	rel1.Left.Col = fc2.Name
-
-	rel1.Right.col = &col1
-	rel1.Right.Table = ti.Name
-	rel1.Right.Col = col1.Name
-
-	if err := s.SetRel(t1, t2, rel1); err != nil {
-		return err
-	}
-
-	// One-to-many-through relation between 2nd foreign key table and the
-	// 1nd foreign key table
-	rel2 := &DBRel{Type: RelOneToManyThrough}
-	rel2.Through = ti.Name
-	rel2.ColT = col1.Name
-
-	rel1.Left.col = fc1
-	rel2.Left.Table = col1.FKeyTable
-	rel2.Left.Col = fc1.Name
-
-	rel1.Right.col = &col2
-	rel2.Right.Table = ti.Name
-	rel2.Right.Col = col2.Name
-
-	if err := s.SetRel(t2, t1, rel2); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (s *DBSchema) GetTable(table string) (*DBTableInfo, error) {
-	t, ok := s.t[table]
-	if !ok {
-		return nil, fmt.Errorf("unknown table '%s'", table)
-	}
-	return t, nil
-}
-
-func (s *DBSchema) SetRel(child, parent string, rel *DBRel) error {
-	sp := strings.ToLower(flect.Singularize(parent))
-	pp := strings.ToLower(flect.Pluralize(parent))
-
-	sc := strings.ToLower(flect.Singularize(child))
-	pc := strings.ToLower(flect.Pluralize(child))
-
-	if _, ok := s.rm[sc]; !ok {
-		s.rm[sc] = make(map[string]*DBRel)
-	}
-
-	if _, ok := s.rm[pc]; !ok {
-		s.rm[pc] = make(map[string]*DBRel)
-	}
-
-	if _, ok := s.rm[sc][sp]; !ok {
-		s.rm[sc][sp] = rel
-	}
-	if _, ok := s.rm[sc][pp]; !ok {
-		s.rm[sc][pp] = rel
-	}
-	if _, ok := s.rm[pc][sp]; !ok {
-		s.rm[pc][sp] = rel
-	}
-	if _, ok := s.rm[pc][pp]; !ok {
-		s.rm[pc][pp] = rel
-	}
-
-	return nil
-}
-
-func (s *DBSchema) GetRel(child, parent string) (*DBRel, error) {
-	rel, ok := s.rm[child][parent]
-	if !ok {
-		// No relationship found so this time fetch the table info
-		// and try again in case child or parent was an alias
-		ct, err := s.GetTable(child)
-		if err != nil {
-			return nil, err
-		}
-		pt, err := s.GetTable(parent)
-		if err != nil {
-			return nil, err
-		}
-		rel, ok = s.rm[ct.Name][pt.Name]
-		if !ok {
-			return nil, fmt.Errorf("unknown relationship '%s' -> '%s'",
-				child, parent)
-		}
-	}
-	return rel, nil
-}

core/internal/psql/stack_int.go

@@ -1,47 +0,0 @@
-package psql
-
-type IntStack struct {
-	stA [20]int32
-	st  []int32
-	top int
-}
-
-// Create a new IntStack
-func NewIntStack() *IntStack {
-	s := &IntStack{top: -1}
-	s.st = s.stA[:0]
-	return s
-}
-
-// Return the number of items in the IntStack
-func (s *IntStack) Len() int {
-	return (s.top + 1)
-}
-
-// View the top item on the IntStack
-func (s *IntStack) Peek() int32 {
-	if s.top == -1 {
-		return -1
-	}
-	return s.st[s.top]
-}
-
-// Pop the top item of the IntStack and return it
-func (s *IntStack) Pop() int32 {
-	if s.top == -1 {
-		return -1
-	}
-
-	s.top--
-	return s.st[(s.top + 1)]
-}
-
-// Push a value onto the top of the IntStack
-func (s *IntStack) Push(value int32) {
-	s.top++
-	if len(s.st) <= s.top {
-		s.st = append(s.st, value)
-	} else {
-		s.st[s.top] = value
-	}
-}

core/internal/psql/strings.go

@@ -1,28 +0,0 @@
-package psql
-
-import "fmt"
-
-func (rt RelType) String() string {
-	switch rt {
-	case RelOneToOne:
-		return "one to one"
-	case RelOneToMany:
-		return "one to many"
-	case RelOneToManyThrough:
-		return "one to many through"
-	case RelRemote:
-		return "remote"
-	case RelEmbedded:
-		return "embedded"
-	}
-	return ""
-}
-
-func (re *DBRel) String() string {
-	if re.Type == RelOneToManyThrough {
-		return fmt.Sprintf("'%s.%s' --(Through: %s)--> '%s.%s'",
-			re.Left.Table, re.Left.Col, re.Through, re.Right.Table, re.Right.Col)
-	}
-	return fmt.Sprintf("'%s.%s' --(%s)--> '%s.%s'",
-		re.Left.Table, re.Left.Col, re.Type, re.Right.Table, re.Right.Col)
-}

core/internal/psql/tables.go

@@ -1,248 +0,0 @@
-package psql
-
-import (
-	"database/sql"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/jackc/pgtype"
-)
-
-type DBInfo struct {
-	Version int
-	Tables  []DBTable
-	Columns [][]DBColumn
-	colmap  map[string]map[string]*DBColumn
-}
-
-func GetDBInfo(db *sql.DB) (*DBInfo, error) {
-	di := &DBInfo{}
-	var version string
-
-	err := db.QueryRow(`SHOW server_version_num`).Scan(&version)
-	if err != nil {
-		return nil, fmt.Errorf("error fetching version: %w", err)
-	}
-
-	di.Version, err = strconv.Atoi(version)
-	if err != nil {
-		return nil, err
-	}
-
-	di.Tables, err = GetTables(db)
-	if err != nil {
-		return nil, err
-	}
-
-	di.colmap = make(map[string]map[string]*DBColumn, len(di.Tables))
-
-	for i, t := range di.Tables {
-		cols, err := GetColumns(db, "public", t.Name)
-		if err != nil {
-			return nil, err
-		}
-
-		di.Columns = append(di.Columns, cols)
-		di.colmap[t.Key] = make(map[string]*DBColumn, len(cols))
-
-		for n, c := range di.Columns[i] {
-			di.colmap[t.Key][c.Key] = &di.Columns[i][n]
-		}
-	}
-
-	return di, nil
-}
-
-func (di *DBInfo) AddTable(t DBTable, cols []DBColumn) {
-	t.ID = di.Tables[len(di.Tables)-1].ID
-
-	di.Tables = append(di.Tables, t)
-	di.colmap[t.Key] = make(map[string]*DBColumn, len(cols))
-
-	for i := range cols {
-		cols[i].ID = int16(i)
-		c := &cols[i]
-		di.colmap[t.Key][c.Key] = c
-	}
-	di.Columns = append(di.Columns, cols)
-}
-
-func (di *DBInfo) GetColumn(table, column string) (*DBColumn, bool) {
-	v, ok := di.colmap[strings.ToLower(table)][strings.ToLower(column)]
-	return v, ok
-}
-
-type DBTable struct {
-	ID   int
-	Name string
-	Key  string
-	Type string
-}
-
-func GetTables(db *sql.DB) ([]DBTable, error) {
-	sqlStmt := `
-SELECT
-	c.relname as "name",
-	CASE c.relkind WHEN 'r' THEN 'table'
-		WHEN 'v' THEN 'view'
-		WHEN 'm' THEN 'materialized view'
-		WHEN 'f' THEN 'foreign table' 
-	END as "type"
-FROM pg_catalog.pg_class c
-	LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
-WHERE c.relkind IN ('r','v','m','f','')
-	AND n.nspname <> ('pg_catalog')
-	AND n.nspname <> ('information_schema')
-	AND n.nspname !~ ('^pg_toast')
-AND pg_catalog.pg_table_is_visible(c.oid);`
-
-	var tables []DBTable
-
-	rows, err := db.Query(sqlStmt)
-	if err != nil {
-		return nil, fmt.Errorf("Error fetching tables: %s", err)
-	}
-	defer rows.Close()
-
-	for i := 0; rows.Next(); i++ {
-		t := DBTable{ID: i}
-		err = rows.Scan(&t.Name, &t.Type)
-		if err != nil {
-			return nil, err
-		}
-		t.Key = strings.ToLower(t.Name)
-		if t.Key != "schema_migrations" && t.Key != "ar_internal_metadata" {
-			tables = append(tables, t)
-		}
-	}
-
-	return tables, nil
-}
-
-type DBColumn struct {
-	ID         int16
-	Name       string
-	Key        string
-	Type       string
-	Array      bool
-	NotNull    bool
-	PrimaryKey bool
-	UniqueKey  bool
-	FKeyTable  string
-	FKeyColID  []int16
-	fKeyColID  pgtype.Int2Array
-}
-
-func GetColumns(db *sql.DB, schema, table string) ([]DBColumn, error) {
-	sqlStmt := `
-SELECT  
-	f.attnum AS id,  
-	f.attname AS name,  
-	f.attnotnull AS notnull,  
-	pg_catalog.format_type(f.atttypid,f.atttypmod) AS type,  
-	CASE
-	 WHEN f.attndims != 0 THEN true
-	 WHEN right(pg_catalog.format_type(f.atttypid,f.atttypmod), 2) = '[]' THEN true
-	 ELSE false
-	END AS array,
-	CASE  
-		WHEN p.contype = ('p'::char) THEN true  
-		ELSE false 
-	END AS primarykey,  
-	CASE  
-		WHEN p.contype = ('u'::char) THEN true  
-		ELSE false
-	END AS uniquekey,
-	CASE
-		WHEN p.contype = ('f'::char) THEN g.relname 
-		ELSE ''::text
-	END AS foreignkey,
-	CASE
-		WHEN p.contype = ('f'::char) THEN p.confkey::int2[]
-		ELSE ARRAY[]::int2[]
-	END AS foreignkey_fieldnum
-FROM pg_attribute f
-	JOIN pg_class c ON c.oid = f.attrelid  
-	LEFT JOIN pg_attrdef d ON d.adrelid = c.oid AND d.adnum = f.attnum  
-	LEFT JOIN pg_namespace n ON n.oid = c.relnamespace  
-	LEFT JOIN pg_constraint p ON p.conrelid = c.oid AND f.attnum = ANY (p.conkey)  
-	LEFT JOIN pg_class AS g ON p.confrelid = g.oid  
-WHERE c.relkind IN ('r', 'v', 'm', 'f')
-	AND n.nspname = $1  -- Replace with Schema name  
-	AND c.relname = $2  -- Replace with table name  
-	AND f.attnum > 0
-	AND f.attisdropped = false
-ORDER BY id;`
-
-	rows, err := db.Query(sqlStmt, schema, table)
-	if err != nil {
-		return nil, fmt.Errorf("error fetching columns: %s", err)
-	}
-	defer rows.Close()
-
-	cmap := make(map[int16]DBColumn)
-
-	for rows.Next() {
-		c := DBColumn{}
-
-		err = rows.Scan(&c.ID, &c.Name, &c.NotNull, &c.Type, &c.Array, &c.PrimaryKey, &c.UniqueKey, &c.FKeyTable, &c.fKeyColID)
-		if err != nil {
-			return nil, err
-		}
-
-		if v, ok := cmap[c.ID]; ok {
-			if c.PrimaryKey {
-				v.PrimaryKey = true
-				v.UniqueKey = true
-			}
-			if c.NotNull {
-				v.NotNull = true
-			}
-			if c.UniqueKey {
-				v.UniqueKey = true
-			}
-			if c.Array {
-				v.Array = true
-			}
-			if len(c.FKeyTable) != 0 {
-				v.FKeyTable = c.FKeyTable
-			}
-			if c.fKeyColID.Elements != nil {
-				v.fKeyColID = c.fKeyColID
-				err := v.fKeyColID.AssignTo(&v.FKeyColID)
-				if err != nil {
-					return nil, err
-				}
-			}
-			cmap[c.ID] = v
-		} else {
-			err := c.fKeyColID.AssignTo(&c.FKeyColID)
-			if err != nil {
-				return nil, err
-			}
-			c.Key = strings.ToLower(c.Name)
-			if c.PrimaryKey {
-				c.UniqueKey = true
-			}
-			cmap[c.ID] = c
-		}
-	}
-
-	cols := make([]DBColumn, 0, len(cmap))
-	for i := range cmap {
-		cols = append(cols, cmap[i])
-	}
-
-	return cols, nil
-}
-
-// func GetValType(type string) qcode.ValType {
-// 	switch {
-// 		case "bigint", "integer", "smallint", "numeric", "bigserial":
-// 			return qcode.ValInt
-// 		case "double precision", "real":
-// 			return qcode.ValFloat
-// 		case ""
-// 	}
-// }

core/internal/psql/test_schema.go

@@ -1,109 +0,0 @@
-package psql
-
-import (
-	"log"
-	"strings"
-)
-
-func getTestSchema() *DBSchema {
-	tables := []DBTable{
-		DBTable{Name: "customers", Type: "table"},
-		DBTable{Name: "users", Type: "table"},
-		DBTable{Name: "products", Type: "table"},
-		DBTable{Name: "purchases", Type: "table"},
-		DBTable{Name: "tags", Type: "table"},
-		DBTable{Name: "tag_count", Type: "json"},
-	}
-
-	columns := [][]DBColumn{
-		[]DBColumn{
-			DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: true},
-			DBColumn{ID: 2, Name: "full_name", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 3, Name: "phone", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 4, Name: "email", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 5, Name: "encrypted_password", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 6, Name: "reset_password_token", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 7, Name: "reset_password_sent_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 8, Name: "remember_created_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 9, Name: "created_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 10, Name: "updated_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false}},
-		[]DBColumn{
-			DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: true},
-			DBColumn{ID: 2, Name: "full_name", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 3, Name: "phone", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 4, Name: "avatar", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 5, Name: "email", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 6, Name: "encrypted_password", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 7, Name: "reset_password_token", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 8, Name: "reset_password_sent_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 9, Name: "remember_created_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 10, Name: "created_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 11, Name: "updated_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false}},
-		[]DBColumn{
-			DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: true},
-			DBColumn{ID: 2, Name: "name", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 3, Name: "description", Type: "text", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 4, Name: "price", Type: "numeric(7,2)", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 5, Name: "user_id", Type: "bigint", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "users", FKeyColID: []int16{1}},
-			DBColumn{ID: 6, Name: "created_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 7, Name: "updated_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 8, Name: "tsv", Type: "tsvector", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 9, Name: "tags", Type: "text[]", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "tags", FKeyColID: []int16{3}, Array: true},
-			DBColumn{ID: 9, Name: "tag_count", Type: "json", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "tag_count", FKeyColID: []int16{}}},
-		[]DBColumn{
-			DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: true},
-			DBColumn{ID: 2, Name: "customer_id", Type: "bigint", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "customers", FKeyColID: []int16{1}},
-			DBColumn{ID: 3, Name: "product_id", Type: "bigint", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "products", FKeyColID: []int16{1}},
-			DBColumn{ID: 4, Name: "sale_type", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 5, Name: "quantity", Type: "integer", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 6, Name: "due_date", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 7, Name: "returned", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false}},
-		[]DBColumn{
-			DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: true},
-			DBColumn{ID: 2, Name: "name", Type: "text", NotNull: false, PrimaryKey: false, UniqueKey: false},
-			DBColumn{ID: 3, Name: "slug", Type: "text", NotNull: false, PrimaryKey: false, UniqueKey: false}},
-		[]DBColumn{
-			DBColumn{ID: 1, Name: "tag_id", Type: "bigint", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "tags", FKeyColID: []int16{1}},
-			DBColumn{ID: 2, Name: "count", Type: "int", NotNull: false, PrimaryKey: false, UniqueKey: false}},
-	}
-
-	for i := range tables {
-		tables[i].Key = strings.ToLower(tables[i].Name)
-		for n := range columns[i] {
-			columns[i][n].Key = strings.ToLower(columns[i][n].Name)
-		}
-	}
-
-	schema := &DBSchema{
-		ver: 110000,
-		t:   make(map[string]*DBTableInfo),
-		rm:  make(map[string]map[string]*DBRel),
-	}
-
-	aliases := map[string][]string{
-		"users": []string{"mes"},
-	}
-
-	for i, t := range tables {
-		err := schema.addTable(t, columns[i], aliases)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-
-	for i, t := range tables {
-		err := schema.firstDegreeRels(t, columns[i])
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-
-	for i, t := range tables {
-		err := schema.secondDegreeRels(t, columns[i])
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-
-	return schema
-}

core/internal/psql/tests.sql

@@ -1,151 +0,0 @@
-=== RUN   TestCompileInsert
-=== RUN   TestCompileInsert/simpleInsert
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "users" AS (INSERT INTO "users" ("full_name", "email") SELECT CAST( i.j ->>'full_name' AS character varying), CAST( i.j ->>'email' AS character varying) FROM "_sg_input" i RETURNING *) SELECT jsonb_build_object('user', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "users_0"."id" AS "id" FROM (SELECT "users"."id" FROM "users" LIMIT ('1') :: integer) AS "users_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileInsert/singleInsert
-WITH "_sg_input" AS (SELECT '{{insert}}' :: json AS j), "products" AS (INSERT INTO "products" ("name", "description", "price", "user_id") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'description' AS text), CAST( i.j ->>'price' AS numeric(7,2)), CAST( i.j ->>'user_id' AS bigint) FROM "_sg_input" i RETURNING *) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name" FROM (SELECT "products"."id", "products"."name" FROM "products" LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileInsert/bulkInsert
-WITH "_sg_input" AS (SELECT '{{insert}}' :: json AS j), "products" AS (INSERT INTO "products" ("name", "description") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'description' AS text) FROM "_sg_input" i RETURNING *) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name" FROM (SELECT "products"."id", "products"."name" FROM "products" LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileInsert/simpleInsertWithPresets
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "products" AS (INSERT INTO "products" ("name", "price", "created_at", "updated_at", "user_id") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), 'now' :: timestamp without time zone, 'now' :: timestamp without time zone, '{{user_id}}' :: bigint FROM "_sg_input" i RETURNING *) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id" FROM (SELECT "products"."id" FROM "products" LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileInsert/nestedInsertManyToMany
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "products" AS (INSERT INTO "products" ("name", "price") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)) FROM "_sg_input" i RETURNING *), "customers" AS (INSERT INTO "customers" ("full_name", "email") SELECT CAST( i.j ->>'full_name' AS character varying), CAST( i.j ->>'email' AS character varying) FROM "_sg_input" i RETURNING *), "purchases" AS (INSERT INTO "purchases" ("sale_type", "quantity", "due_date", "customer_id", "product_id") SELECT CAST( i.j ->>'sale_type' AS character varying), CAST( i.j ->>'quantity' AS integer), CAST( i.j ->>'due_date' AS timestamp without time zone), "customers"."id", "products"."id" FROM "_sg_input" i, "customers", "products" RETURNING *) SELECT jsonb_build_object('purchase', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "purchases_0"."sale_type" AS "sale_type", "purchases_0"."quantity" AS "quantity", "purchases_0"."due_date" AS "due_date", "__sj_1"."json" AS "product", "__sj_2"."json" AS "customer" FROM (SELECT "purchases"."sale_type", "purchases"."quantity", "purchases"."due_date", "purchases"."product_id", "purchases"."customer_id" FROM "purchases" LIMIT ('1') :: integer) AS "purchases_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_2".*) AS "json"FROM (SELECT "customers_2"."id" AS "id", "customers_2"."full_name" AS "full_name", "customers_2"."email" AS "email" FROM (SELECT "customers"."id", "customers"."full_name", "customers"."email" FROM "customers" WHERE ((("customers"."id") = ("purchases_0"."customer_id"))) LIMIT ('1') :: integer) AS "customers_2") AS "__sr_2") AS "__sj_2" ON ('true') LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."id" AS "id", "products_1"."name" AS "name", "products_1"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."id") = ("purchases_0"."product_id"))) LIMIT ('1') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "customers" AS (INSERT INTO "customers" ("full_name", "email") SELECT CAST( i.j ->>'full_name' AS character varying), CAST( i.j ->>'email' AS character varying) FROM "_sg_input" i RETURNING *), "products" AS (INSERT INTO "products" ("name", "price") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)) FROM "_sg_input" i RETURNING *), "purchases" AS (INSERT INTO "purchases" ("sale_type", "quantity", "due_date", "product_id", "customer_id") SELECT CAST( i.j ->>'sale_type' AS character varying), CAST( i.j ->>'quantity' AS integer), CAST( i.j ->>'due_date' AS timestamp without time zone), "products"."id", "customers"."id" FROM "_sg_input" i, "products", "customers" RETURNING *) SELECT jsonb_build_object('purchase', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "purchases_0"."sale_type" AS "sale_type", "purchases_0"."quantity" AS "quantity", "purchases_0"."due_date" AS "due_date", "__sj_1"."json" AS "product", "__sj_2"."json" AS "customer" FROM (SELECT "purchases"."sale_type", "purchases"."quantity", "purchases"."due_date", "purchases"."product_id", "purchases"."customer_id" FROM "purchases" LIMIT ('1') :: integer) AS "purchases_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_2".*) AS "json"FROM (SELECT "customers_2"."id" AS "id", "customers_2"."full_name" AS "full_name", "customers_2"."email" AS "email" FROM (SELECT "customers"."id", "customers"."full_name", "customers"."email" FROM "customers" WHERE ((("customers"."id") = ("purchases_0"."customer_id"))) LIMIT ('1') :: integer) AS "customers_2") AS "__sr_2") AS "__sj_2" ON ('true') LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."id" AS "id", "products_1"."name" AS "name", "products_1"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."id") = ("purchases_0"."product_id"))) LIMIT ('1') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileInsert/nestedInsertOneToMany
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "users" AS (INSERT INTO "users" ("full_name", "email", "created_at", "updated_at") SELECT CAST( i.j ->>'full_name' AS character varying), CAST( i.j ->>'email' AS character varying), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone) FROM "_sg_input" i RETURNING *), "products" AS (INSERT INTO "products" ("name", "price", "created_at", "updated_at", "user_id") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone), "users"."id" FROM "_sg_input" i, "users" RETURNING *) SELECT jsonb_build_object('user', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "users_0"."id" AS "id", "users_0"."full_name" AS "full_name", "users_0"."email" AS "email", "__sj_1"."json" AS "product" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" LIMIT ('1') :: integer) AS "users_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."id" AS "id", "products_1"."name" AS "name", "products_1"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."user_id") = ("users_0"."id"))) LIMIT ('1') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileInsert/nestedInsertOneToOne
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "users" AS (INSERT INTO "users" ("full_name", "email", "created_at", "updated_at") SELECT CAST( i.j ->>'full_name' AS character varying), CAST( i.j ->>'email' AS character varying), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone) FROM "_sg_input" i RETURNING *), "products" AS (INSERT INTO "products" ("name", "price", "created_at", "updated_at", "user_id") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone), "users"."id" FROM "_sg_input" i, "users" RETURNING *) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "__sj_1"."json" AS "user" FROM (SELECT "products"."id", "products"."name", "products"."user_id" FROM "products" LIMIT ('1') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "users_1"."id" AS "id", "users_1"."full_name" AS "full_name", "users_1"."email" AS "email" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" WHERE ((("users"."id") = ("products_0"."user_id"))) LIMIT ('1') :: integer) AS "users_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileInsert/nestedInsertOneToManyWithConnect
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "users" AS (INSERT INTO "users" ("full_name", "email", "created_at", "updated_at") SELECT CAST( i.j ->>'full_name' AS character varying), CAST( i.j ->>'email' AS character varying), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone) FROM "_sg_input" i RETURNING *), "products" AS ( UPDATE "products" SET "user_id" = "users"."id" FROM "users" WHERE ("products"."id"= ((i.j->'product'->'connect'->>'id'))::bigint) RETURNING "products".*) SELECT jsonb_build_object('user', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "users_0"."id" AS "id", "users_0"."full_name" AS "full_name", "users_0"."email" AS "email", "__sj_1"."json" AS "product" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" LIMIT ('1') :: integer) AS "users_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."id" AS "id", "products_1"."name" AS "name", "products_1"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."user_id") = ("users_0"."id"))) LIMIT ('1') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileInsert/nestedInsertOneToOneWithConnect
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "_x_users" AS (SELECT "id" FROM "_sg_input" i,"users" WHERE "users"."id"= ((i.j->'user'->'connect'->>'id'))::bigint LIMIT 1), "products" AS (INSERT INTO "products" ("name", "price", "created_at", "updated_at", "user_id") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone), "_x_users"."id" FROM "_sg_input" i, "_x_users" RETURNING *) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "__sj_1"."json" AS "user", "__sj_2"."json" AS "tags" FROM (SELECT "products"."id", "products"."name", "products"."user_id", "products"."tags" FROM "products" LIMIT ('1') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(jsonb_agg("__sj_2"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_2".*) AS "json"FROM (SELECT "tags_2"."id" AS "id", "tags_2"."name" AS "name" FROM (SELECT "tags"."id", "tags"."name" FROM "tags" WHERE ((("tags"."slug") = any ("products_0"."tags"))) LIMIT ('20') :: integer) AS "tags_2") AS "__sr_2") AS "__sj_2") AS "__sj_2" ON ('true') LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "users_1"."id" AS "id", "users_1"."full_name" AS "full_name", "users_1"."email" AS "email" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" WHERE ((("users"."id") = ("products_0"."user_id"))) LIMIT ('1') :: integer) AS "users_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileInsert/nestedInsertOneToOneWithConnectArray
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "_x_users" AS (SELECT "id" FROM "_sg_input" i,"users" WHERE "users"."id" = ANY((select a::bigint AS list from json_array_elements_text((i.j->'user'->'connect'->>'id')::json) AS a)) LIMIT 1), "products" AS (INSERT INTO "products" ("name", "price", "created_at", "updated_at", "user_id") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone), "_x_users"."id" FROM "_sg_input" i, "_x_users" RETURNING *) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "__sj_1"."json" AS "user" FROM (SELECT "products"."id", "products"."name", "products"."user_id" FROM "products" LIMIT ('1') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "users_1"."id" AS "id", "users_1"."full_name" AS "full_name", "users_1"."email" AS "email" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" WHERE ((("users"."id") = ("products_0"."user_id"))) LIMIT ('1') :: integer) AS "users_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
---- PASS: TestCompileInsert (0.02s)
-    --- PASS: TestCompileInsert/simpleInsert (0.00s)
-    --- PASS: TestCompileInsert/singleInsert (0.00s)
-    --- PASS: TestCompileInsert/bulkInsert (0.00s)
-    --- PASS: TestCompileInsert/simpleInsertWithPresets (0.00s)
-    --- PASS: TestCompileInsert/nestedInsertManyToMany (0.00s)
-    --- PASS: TestCompileInsert/nestedInsertOneToMany (0.00s)
-    --- PASS: TestCompileInsert/nestedInsertOneToOne (0.00s)
-    --- PASS: TestCompileInsert/nestedInsertOneToManyWithConnect (0.00s)
-    --- PASS: TestCompileInsert/nestedInsertOneToOneWithConnect (0.00s)
-    --- PASS: TestCompileInsert/nestedInsertOneToOneWithConnectArray (0.00s)
-=== RUN   TestCompileMutate
-=== RUN   TestCompileMutate/singleUpsert
-WITH "_sg_input" AS (SELECT '{{upsert}}' :: json AS j), "products" AS (INSERT INTO "products" ("name", "description") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'description' AS text) FROM "_sg_input" i RETURNING *)  ON CONFLICT (id) DO UPDATE SET name = EXCLUDED.name, description = EXCLUDED.description RETURNING *) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name" FROM (SELECT "products"."id", "products"."name" FROM "products" LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileMutate/singleUpsertWhere
-WITH "_sg_input" AS (SELECT '{{upsert}}' :: json AS j), "products" AS (INSERT INTO "products" ("name", "description") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'description' AS text) FROM "_sg_input" i RETURNING *)  ON CONFLICT (id) WHERE (("products"."price") > '3' :: numeric(7,2)) DO UPDATE SET name = EXCLUDED.name, description = EXCLUDED.description RETURNING *) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name" FROM (SELECT "products"."id", "products"."name" FROM "products" LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileMutate/bulkUpsert
-WITH "_sg_input" AS (SELECT '{{upsert}}' :: json AS j), "products" AS (INSERT INTO "products" ("name", "description") SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'description' AS text) FROM "_sg_input" i RETURNING *)  ON CONFLICT (id) DO UPDATE SET name = EXCLUDED.name, description = EXCLUDED.description RETURNING *) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name" FROM (SELECT "products"."id", "products"."name" FROM "products" LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileMutate/delete
-WITH "products" AS (DELETE FROM "products" WHERE (((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2))) AND (("products"."id") = '1' :: bigint)) RETURNING "products".*) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name" FROM (SELECT "products"."id", "products"."name" FROM "products" LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
---- PASS: TestCompileMutate (0.00s)
-    --- PASS: TestCompileMutate/singleUpsert (0.00s)
-    --- PASS: TestCompileMutate/singleUpsertWhere (0.00s)
-    --- PASS: TestCompileMutate/bulkUpsert (0.00s)
-    --- PASS: TestCompileMutate/delete (0.00s)
-=== RUN   TestCompileQuery
-=== RUN   TestCompileQuery/withComplexArgs
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price" FROM (SELECT DISTINCT ON ("products"."price") "products"."id", "products"."name", "products"."price" FROM "products" WHERE (((("products"."id") < '28' :: bigint) AND (("products"."id") >= '20' :: bigint) AND ((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2))))) ORDER BY "products"."price" DESC LIMIT ('30') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/withWhereAndList
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE (((("products"."price") > '10' :: numeric(7,2)) AND NOT (("products"."id") IS NULL) AND ((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2))))) LIMIT ('20') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/withWhereIsNull
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE (((("products"."price") > '10' :: numeric(7,2)) AND NOT (("products"."id") IS NULL) AND ((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2))))) LIMIT ('20') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/withWhereMultiOr
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2))) AND ((("products"."price") < '20' :: numeric(7,2)) OR (("products"."price") > '10' :: numeric(7,2)) OR NOT (("products"."id") IS NULL)))) LIMIT ('20') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/fetchByID
-SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name" FROM (SELECT "products"."id", "products"."name" FROM "products" WHERE ((((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2))) AND (("products"."id") =  '{{id}}' :: bigint))) LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileQuery/searchQuery
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."search_rank" AS "search_rank", "products_0"."search_headline_description" AS "search_headline_description" FROM (SELECT "products"."id", "products"."name", ts_rank("products"."tsv", websearch_to_tsquery('{{query}}')) AS "search_rank", ts_headline("products"."description", websearch_to_tsquery('{{query}}')) AS "search_headline_description" FROM "products" WHERE ((("products"."tsv") @@ websearch_to_tsquery('{{query}}'))) LIMIT ('20') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/oneToMany
-SELECT jsonb_build_object('users', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "users_0"."email" AS "email", "__sj_1"."json" AS "products" FROM (SELECT "users"."email", "users"."id" FROM "users" LIMIT ('20') :: integer) AS "users_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(jsonb_agg("__sj_1"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."name" AS "name", "products_1"."price" AS "price" FROM (SELECT "products"."name", "products"."price" FROM "products" WHERE ((("products"."user_id") = ("users_0"."id")) AND ((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2)))) LIMIT ('20') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/oneToManyReverse
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."name" AS "name", "products_0"."price" AS "price", "__sj_1"."json" AS "users" FROM (SELECT "products"."name", "products"."price", "products"."user_id" FROM "products" WHERE (((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2)))) LIMIT ('20') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(jsonb_agg("__sj_1"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "users_1"."email" AS "email" FROM (SELECT "users"."email" FROM "users" WHERE ((("users"."id") = ("products_0"."user_id"))) LIMIT ('20') :: integer) AS "users_1") AS "__sr_1") AS "__sj_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/oneToManyArray
-SELECT jsonb_build_object('tags', "__sj_0"."json", 'product', "__sj_2"."json") as "__root" FROM (SELECT to_jsonb("__sr_2".*) AS "json"FROM (SELECT "products_2"."name" AS "name", "products_2"."price" AS "price", "__sj_3"."json" AS "tags" FROM (SELECT "products"."name", "products"."price", "products"."tags" FROM "products" LIMIT ('1') :: integer) AS "products_2" LEFT OUTER JOIN LATERAL (SELECT coalesce(jsonb_agg("__sj_3"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_3".*) AS "json"FROM (SELECT "tags_3"."id" AS "id", "tags_3"."name" AS "name" FROM (SELECT "tags"."id", "tags"."name" FROM "tags" WHERE ((("tags"."slug") = any ("products_2"."tags"))) LIMIT ('20') :: integer) AS "tags_3") AS "__sr_3") AS "__sj_3") AS "__sj_3" ON ('true')) AS "__sr_2") AS "__sj_2", (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "tags_0"."name" AS "name", "__sj_1"."json" AS "product" FROM (SELECT "tags"."name", "tags"."slug" FROM "tags" LIMIT ('20') :: integer) AS "tags_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."name" AS "name" FROM (SELECT "products"."name" FROM "products" WHERE ((("tags_0"."slug") = any ("products"."tags"))) LIMIT ('1') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/manyToMany
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."name" AS "name", "__sj_1"."json" AS "customers" FROM (SELECT "products"."name", "products"."id" FROM "products" WHERE (((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2)))) LIMIT ('20') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(jsonb_agg("__sj_1"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "customers_1"."email" AS "email", "customers_1"."full_name" AS "full_name" FROM (SELECT "customers"."email", "customers"."full_name" FROM "customers" LEFT OUTER JOIN "purchases" ON (("purchases"."product_id") = ("products_0"."id")) WHERE ((("customers"."id") = ("purchases"."customer_id"))) LIMIT ('20') :: integer) AS "customers_1") AS "__sr_1") AS "__sj_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/manyToManyReverse
-SELECT jsonb_build_object('customers', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "customers_0"."email" AS "email", "customers_0"."full_name" AS "full_name", "__sj_1"."json" AS "products" FROM (SELECT "customers"."email", "customers"."full_name", "customers"."id" FROM "customers" LIMIT ('20') :: integer) AS "customers_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(jsonb_agg("__sj_1"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."name" AS "name" FROM (SELECT "products"."name" FROM "products" LEFT OUTER JOIN "purchases" ON (("purchases"."customer_id") = ("customers_0"."id")) WHERE ((("products"."id") = ("purchases"."product_id")) AND ((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2)))) LIMIT ('20') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/aggFunction
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."name" AS "name", "products_0"."count_price" AS "count_price" FROM (SELECT "products"."name", count("products"."price") AS "count_price" FROM "products" WHERE (((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2)))) GROUP BY "products"."name" LIMIT ('20') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/aggFunctionBlockedByCol
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."name" AS "name" FROM (SELECT "products"."name" FROM "products" GROUP BY "products"."name" LIMIT ('20') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/aggFunctionDisabled
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."name" AS "name" FROM (SELECT "products"."name" FROM "products" GROUP BY "products"."name" LIMIT ('20') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/aggFunctionWithFilter
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."max_price" AS "max_price" FROM (SELECT "products"."id", max("products"."price") AS "max_price" FROM "products" WHERE ((((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2))) AND (("products"."id") > '10' :: bigint))) GROUP BY "products"."id" LIMIT ('20') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/syntheticTables
-SELECT jsonb_build_object('me', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT  FROM (SELECT "users"."email" FROM "users" WHERE ((("users"."id") =  '{{user_id}}' :: bigint)) LIMIT ('1') :: integer) AS "users_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileQuery/queryWithVariables
-SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name" FROM (SELECT "products"."id", "products"."name" FROM "products" WHERE (((("products"."price") =  '{{product_price}}' :: numeric(7,2)) AND (("products"."id") =  '{{product_id}}' :: bigint) AND ((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2))))) LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileQuery/withWhereOnRelations
-SELECT jsonb_build_object('users', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "users_0"."id" AS "id", "users_0"."email" AS "email" FROM (SELECT "users"."id", "users"."email" FROM "users" WHERE (NOT EXISTS (SELECT 1 FROM products WHERE (("products"."user_id") = ("users"."id")) AND ((("products"."price") > '3' :: numeric(7,2))))) LIMIT ('20') :: integer) AS "users_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/multiRoot
-SELECT jsonb_build_object('customer', "__sj_0"."json", 'user', "__sj_1"."json", 'product', "__sj_2"."json") as "__root" FROM (SELECT to_jsonb("__sr_2".*) AS "json"FROM (SELECT "products_2"."id" AS "id", "products_2"."name" AS "name", "__sj_3"."json" AS "customers", "__sj_4"."json" AS "customer" FROM (SELECT "products"."id", "products"."name" FROM "products" WHERE (((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2)))) LIMIT ('1') :: integer) AS "products_2" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_4".*) AS "json"FROM (SELECT "customers_4"."email" AS "email" FROM (SELECT "customers"."email" FROM "customers" LEFT OUTER JOIN "purchases" ON (("purchases"."product_id") = ("products_2"."id")) WHERE ((("customers"."id") = ("purchases"."customer_id"))) LIMIT ('1') :: integer) AS "customers_4") AS "__sr_4") AS "__sj_4" ON ('true') LEFT OUTER JOIN LATERAL (SELECT coalesce(jsonb_agg("__sj_3"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_3".*) AS "json"FROM (SELECT "customers_3"."email" AS "email" FROM (SELECT "customers"."email" FROM "customers" LEFT OUTER JOIN "purchases" ON (("purchases"."product_id") = ("products_2"."id")) WHERE ((("customers"."id") = ("purchases"."customer_id"))) LIMIT ('20') :: integer) AS "customers_3") AS "__sr_3") AS "__sj_3") AS "__sj_3" ON ('true')) AS "__sr_2") AS "__sj_2", (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "users_1"."id" AS "id", "users_1"."email" AS "email" FROM (SELECT "users"."id", "users"."email" FROM "users" LIMIT ('1') :: integer) AS "users_1") AS "__sr_1") AS "__sj_1", (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "customers_0"."id" AS "id" FROM (SELECT "customers"."id" FROM "customers" LIMIT ('1') :: integer) AS "customers_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileQuery/jsonColumnAsTable
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "__sj_1"."json" AS "tag_count" FROM (SELECT "products"."id", "products"."name" FROM "products" LIMIT ('20') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "tag_count_1"."count" AS "count", "__sj_2"."json" AS "tags" FROM (SELECT "tag_count"."count", "tag_count"."tag_id" FROM "products", json_to_recordset("products"."tag_count") AS "tag_count"(tag_id bigint, count int) WHERE ((("products"."id") = ("products_0"."id"))) LIMIT ('1') :: integer) AS "tag_count_1" LEFT OUTER JOIN LATERAL (SELECT coalesce(jsonb_agg("__sj_2"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_2".*) AS "json"FROM (SELECT "tags_2"."name" AS "name" FROM (SELECT "tags"."name" FROM "tags" WHERE ((("tags"."id") = ("tag_count_1"."tag_id"))) LIMIT ('20') :: integer) AS "tags_2") AS "__sr_2") AS "__sj_2") AS "__sj_2" ON ('true')) AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/withCursor
-SELECT jsonb_build_object('products', "__sj_0"."json", 'products_cursor', "__sj_0"."cursor") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json", CONCAT_WS(',', max("__cur_0"), max("__cur_1")) as "cursor" FROM (SELECT to_jsonb("__sr_0".*) - '__cur_0' - '__cur_1' AS "json", "__cur_0", "__cur_1"FROM (SELECT "products_0"."name" AS "name", LAST_VALUE("products_0"."price") OVER() AS "__cur_0", LAST_VALUE("products_0"."id") OVER() AS "__cur_1" FROM (WITH "__cur" AS (SELECT a[1] as "price", a[2] as "id" FROM string_to_array('{{cursor}}', ',') as a) SELECT "products"."name", "products"."id", "products"."price" FROM "products", "__cur" WHERE (((("products"."price") < "__cur"."price" :: numeric(7,2)) OR ((("products"."price") = "__cur"."price" :: numeric(7,2)) AND (("products"."id") > "__cur"."id" :: bigint)))) ORDER BY "products"."price" DESC, "products"."id" ASC LIMIT ('20') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/nullForAuthRequiredInAnon
-SELECT jsonb_build_object('products', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", NULL AS "user" FROM (SELECT "products"."id", "products"."name", "products"."user_id" FROM "products" LIMIT ('20') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
-=== RUN   TestCompileQuery/blockedQuery
-SELECT jsonb_build_object('user', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "users_0"."id" AS "id", "users_0"."full_name" AS "full_name", "users_0"."email" AS "email" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" WHERE (false) LIMIT ('1') :: integer) AS "users_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileQuery/blockedFunctions
-SELECT jsonb_build_object('users', "__sj_0"."json") as "__root" FROM (SELECT coalesce(jsonb_agg("__sj_0"."json"), '[]') as "json" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "users_0"."email" AS "email" FROM (SELECT , "users"."email" FROM "users" WHERE (false) GROUP BY "users"."email" LIMIT ('20') :: integer) AS "users_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
---- PASS: TestCompileQuery (0.02s)
-    --- PASS: TestCompileQuery/withComplexArgs (0.00s)
-    --- PASS: TestCompileQuery/withWhereAndList (0.00s)
-    --- PASS: TestCompileQuery/withWhereIsNull (0.00s)
-    --- PASS: TestCompileQuery/withWhereMultiOr (0.00s)
-    --- PASS: TestCompileQuery/fetchByID (0.00s)
-    --- PASS: TestCompileQuery/searchQuery (0.00s)
-    --- PASS: TestCompileQuery/oneToMany (0.00s)
-    --- PASS: TestCompileQuery/oneToManyReverse (0.00s)
-    --- PASS: TestCompileQuery/oneToManyArray (0.00s)
-    --- PASS: TestCompileQuery/manyToMany (0.00s)
-    --- PASS: TestCompileQuery/manyToManyReverse (0.00s)
-    --- PASS: TestCompileQuery/aggFunction (0.00s)
-    --- PASS: TestCompileQuery/aggFunctionBlockedByCol (0.00s)
-    --- PASS: TestCompileQuery/aggFunctionDisabled (0.00s)
-    --- PASS: TestCompileQuery/aggFunctionWithFilter (0.00s)
-    --- PASS: TestCompileQuery/syntheticTables (0.00s)
-    --- PASS: TestCompileQuery/queryWithVariables (0.00s)
-    --- PASS: TestCompileQuery/withWhereOnRelations (0.00s)
-    --- PASS: TestCompileQuery/multiRoot (0.00s)
-    --- PASS: TestCompileQuery/jsonColumnAsTable (0.00s)
-    --- PASS: TestCompileQuery/withCursor (0.00s)
-    --- PASS: TestCompileQuery/nullForAuthRequiredInAnon (0.00s)
-    --- PASS: TestCompileQuery/blockedQuery (0.00s)
-    --- PASS: TestCompileQuery/blockedFunctions (0.00s)
-=== RUN   TestCompileUpdate
-=== RUN   TestCompileUpdate/singleUpdate
-WITH "_sg_input" AS (SELECT '{{update}}' :: json AS j), "products" AS (UPDATE "products" SET ("name", "description") = (SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'description' AS text) FROM "_sg_input" i)  WHERE ((("products"."id") = '1' :: bigint) AND (("products"."id") =  '{{id}}' :: bigint)) RETURNING "products".*) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name" FROM (SELECT "products"."id", "products"."name" FROM "products" LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileUpdate/simpleUpdateWithPresets
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "products" AS (UPDATE "products" SET ("name", "price", "updated_at") = (SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), 'now' :: timestamp without time zone FROM "_sg_input" i)  WHERE (("products"."user_id") =  '{{user_id}}' :: bigint) RETURNING "products".*) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id" FROM (SELECT "products"."id" FROM "products" LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileUpdate/nestedUpdateManyToMany
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "purchases" AS (UPDATE "purchases" SET ("sale_type", "quantity", "due_date") = (SELECT CAST( i.j ->>'sale_type' AS character varying), CAST( i.j ->>'quantity' AS integer), CAST( i.j ->>'due_date' AS timestamp without time zone) FROM "_sg_input" i)  WHERE (("purchases"."id") =  '{{id}}' :: bigint) RETURNING "purchases".*), "products" AS (UPDATE "products" SET ("name", "price") = (SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)) FROM "_sg_input" i) FROM "purchases" WHERE (("products"."id") = ("purchases"."product_id")) RETURNING "products".*), "customers" AS (UPDATE "customers" SET ("full_name", "email") = (SELECT CAST( i.j ->>'full_name' AS character varying), CAST( i.j ->>'email' AS character varying) FROM "_sg_input" i) FROM "purchases" WHERE (("customers"."id") = ("purchases"."customer_id")) RETURNING "customers".*) SELECT jsonb_build_object('purchase', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "purchases_0"."sale_type" AS "sale_type", "purchases_0"."quantity" AS "quantity", "purchases_0"."due_date" AS "due_date", "__sj_1"."json" AS "product", "__sj_2"."json" AS "customer" FROM (SELECT "purchases"."sale_type", "purchases"."quantity", "purchases"."due_date", "purchases"."product_id", "purchases"."customer_id" FROM "purchases" LIMIT ('1') :: integer) AS "purchases_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_2".*) AS "json"FROM (SELECT "customers_2"."id" AS "id", "customers_2"."full_name" AS "full_name", "customers_2"."email" AS "email" FROM (SELECT "customers"."id", "customers"."full_name", "customers"."email" FROM "customers" WHERE ((("customers"."id") = ("purchases_0"."customer_id"))) LIMIT ('1') :: integer) AS "customers_2") AS "__sr_2") AS "__sj_2" ON ('true') LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."id" AS "id", "products_1"."name" AS "name", "products_1"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."id") = ("purchases_0"."product_id"))) LIMIT ('1') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "purchases" AS (UPDATE "purchases" SET ("sale_type", "quantity", "due_date") = (SELECT CAST( i.j ->>'sale_type' AS character varying), CAST( i.j ->>'quantity' AS integer), CAST( i.j ->>'due_date' AS timestamp without time zone) FROM "_sg_input" i)  WHERE (("purchases"."id") =  '{{id}}' :: bigint) RETURNING "purchases".*), "customers" AS (UPDATE "customers" SET ("full_name", "email") = (SELECT CAST( i.j ->>'full_name' AS character varying), CAST( i.j ->>'email' AS character varying) FROM "_sg_input" i) FROM "purchases" WHERE (("customers"."id") = ("purchases"."customer_id")) RETURNING "customers".*), "products" AS (UPDATE "products" SET ("name", "price") = (SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)) FROM "_sg_input" i) FROM "purchases" WHERE (("products"."id") = ("purchases"."product_id")) RETURNING "products".*) SELECT jsonb_build_object('purchase', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "purchases_0"."sale_type" AS "sale_type", "purchases_0"."quantity" AS "quantity", "purchases_0"."due_date" AS "due_date", "__sj_1"."json" AS "product", "__sj_2"."json" AS "customer" FROM (SELECT "purchases"."sale_type", "purchases"."quantity", "purchases"."due_date", "purchases"."product_id", "purchases"."customer_id" FROM "purchases" LIMIT ('1') :: integer) AS "purchases_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_2".*) AS "json"FROM (SELECT "customers_2"."id" AS "id", "customers_2"."full_name" AS "full_name", "customers_2"."email" AS "email" FROM (SELECT "customers"."id", "customers"."full_name", "customers"."email" FROM "customers" WHERE ((("customers"."id") = ("purchases_0"."customer_id"))) LIMIT ('1') :: integer) AS "customers_2") AS "__sr_2") AS "__sj_2" ON ('true') LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."id" AS "id", "products_1"."name" AS "name", "products_1"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."id") = ("purchases_0"."product_id"))) LIMIT ('1') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileUpdate/nestedUpdateOneToMany
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "users" AS (UPDATE "users" SET ("full_name", "email", "created_at", "updated_at") = (SELECT CAST( i.j ->>'full_name' AS character varying), CAST( i.j ->>'email' AS character varying), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone) FROM "_sg_input" i)  WHERE (("users"."id") = '8' :: bigint) RETURNING "users".*), "products" AS (UPDATE "products" SET ("name", "price", "created_at", "updated_at") = (SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone) FROM "_sg_input" i) FROM "users" WHERE (("products"."user_id") = ("users"."id") AND "products"."id"= ((i.j->'product'->'where'->>'id'))::bigint) RETURNING "products".*) SELECT jsonb_build_object('user', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "users_0"."id" AS "id", "users_0"."full_name" AS "full_name", "users_0"."email" AS "email", "__sj_1"."json" AS "product" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" LIMIT ('1') :: integer) AS "users_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."id" AS "id", "products_1"."name" AS "name", "products_1"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."user_id") = ("users_0"."id"))) LIMIT ('1') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileUpdate/nestedUpdateOneToOne
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "products" AS (UPDATE "products" SET ("name", "price", "created_at", "updated_at") = (SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone) FROM "_sg_input" i)  WHERE (("products"."id") =  '{{id}}' :: bigint) RETURNING "products".*), "users" AS (UPDATE "users" SET ("email") = (SELECT CAST( i.j ->>'email' AS character varying) FROM "_sg_input" i) FROM "products" WHERE (("users"."id") = ("products"."user_id")) RETURNING "users".*) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "__sj_1"."json" AS "user" FROM (SELECT "products"."id", "products"."name", "products"."user_id" FROM "products" LIMIT ('1') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "users_1"."id" AS "id", "users_1"."full_name" AS "full_name", "users_1"."email" AS "email" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" WHERE ((("users"."id") = ("products_0"."user_id"))) LIMIT ('1') :: integer) AS "users_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileUpdate/nestedUpdateOneToManyWithConnect
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "users" AS (UPDATE "users" SET ("full_name", "email", "created_at", "updated_at") = (SELECT CAST( i.j ->>'full_name' AS character varying), CAST( i.j ->>'email' AS character varying), CAST( i.j ->>'created_at' AS timestamp without time zone), CAST( i.j ->>'updated_at' AS timestamp without time zone) FROM "_sg_input" i)  WHERE (("users"."id") =  '{{id}}' :: bigint) RETURNING "users".*), "products_c" AS ( UPDATE "products" SET "user_id" = "users"."id" FROM "users" WHERE ("products"."id"= ((i.j->'product'->'connect'->>'id'))::bigint) RETURNING "products".*), "products_d" AS ( UPDATE "products" SET "user_id" =  NULL FROM "users" WHERE ("products"."id"= ((i.j->'product'->'disconnect'->>'id'))::bigint) RETURNING "products".*), "products" AS (SELECT * FROM "products_c" UNION ALL SELECT * FROM "products_d") SELECT jsonb_build_object('user', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "users_0"."id" AS "id", "users_0"."full_name" AS "full_name", "users_0"."email" AS "email", "__sj_1"."json" AS "product" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" LIMIT ('1') :: integer) AS "users_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "products_1"."id" AS "id", "products_1"."name" AS "name", "products_1"."price" AS "price" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."user_id") = ("users_0"."id"))) LIMIT ('1') :: integer) AS "products_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileUpdate/nestedUpdateOneToOneWithConnect
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "_x_users" AS (SELECT "id" FROM "_sg_input" i,"users" WHERE "users"."id"= ((i.j->'user'->'connect'->>'id'))::bigint AND "users"."email"= ((i.j->'user'->'connect'->>'email'))::character varying LIMIT 1), "products" AS (UPDATE "products" SET ("name", "price", "user_id") = (SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), "_x_users"."id" FROM "_sg_input" i, "_x_users")  WHERE (("products"."id") =  '{{product_id}}' :: bigint) RETURNING "products".*) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "__sj_1"."json" AS "user" FROM (SELECT "products"."id", "products"."name", "products"."user_id" FROM "products" LIMIT ('1') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "users_1"."id" AS "id", "users_1"."full_name" AS "full_name", "users_1"."email" AS "email" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" WHERE ((("users"."id") = ("products_0"."user_id"))) LIMIT ('1') :: integer) AS "users_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "_x_users" AS (SELECT "id" FROM "_sg_input" i,"users" WHERE "users"."email"= ((i.j->'user'->'connect'->>'email'))::character varying AND "users"."id"= ((i.j->'user'->'connect'->>'id'))::bigint LIMIT 1), "products" AS (UPDATE "products" SET ("name", "price", "user_id") = (SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), "_x_users"."id" FROM "_sg_input" i, "_x_users")  WHERE (("products"."id") =  '{{product_id}}' :: bigint) RETURNING "products".*) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "__sj_1"."json" AS "user" FROM (SELECT "products"."id", "products"."name", "products"."user_id" FROM "products" LIMIT ('1') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT to_jsonb("__sr_1".*) AS "json"FROM (SELECT "users_1"."id" AS "id", "users_1"."full_name" AS "full_name", "users_1"."email" AS "email" FROM (SELECT "users"."id", "users"."full_name", "users"."email" FROM "users" WHERE ((("users"."id") = ("products_0"."user_id"))) LIMIT ('1') :: integer) AS "users_1") AS "__sr_1") AS "__sj_1" ON ('true')) AS "__sr_0") AS "__sj_0"
-=== RUN   TestCompileUpdate/nestedUpdateOneToOneWithDisconnect
-WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "_x_users" AS (SELECT * FROM (VALUES(NULL::bigint)) AS LOOKUP("id")), "products" AS (UPDATE "products" SET ("name", "price", "user_id") = (SELECT CAST( i.j ->>'name' AS character varying), CAST( i.j ->>'price' AS numeric(7,2)), "_x_users"."id" FROM "_sg_input" i, "_x_users")  WHERE (("products"."id") =  '{{id}}' :: bigint) RETURNING "products".*) SELECT jsonb_build_object('product', "__sj_0"."json") as "__root" FROM (SELECT to_jsonb("__sr_0".*) AS "json"FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."user_id" AS "user_id" FROM (SELECT "products"."id", "products"."name", "products"."user_id" FROM "products" LIMIT ('1') :: integer) AS "products_0") AS "__sr_0") AS "__sj_0"
---- PASS: TestCompileUpdate (0.02s)
-    --- PASS: TestCompileUpdate/singleUpdate (0.00s)
-    --- PASS: TestCompileUpdate/simpleUpdateWithPresets (0.00s)
-    --- PASS: TestCompileUpdate/nestedUpdateManyToMany (0.00s)
-    --- PASS: TestCompileUpdate/nestedUpdateOneToMany (0.00s)
-    --- PASS: TestCompileUpdate/nestedUpdateOneToOne (0.00s)
-    --- PASS: TestCompileUpdate/nestedUpdateOneToManyWithConnect (0.00s)
-    --- PASS: TestCompileUpdate/nestedUpdateOneToOneWithConnect (0.00s)
-    --- PASS: TestCompileUpdate/nestedUpdateOneToOneWithDisconnect (0.00s)
-PASS
-ok  	github.com/dosco/super-graph/core/internal/psql	0.306s

core/internal/psql/update.go

@@ -1,223 +0,0 @@
-//nolint:errcheck
-package psql
-
-import (
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/dosco/super-graph/core/internal/qcode"
-	"github.com/dosco/super-graph/core/internal/util"
-)
-
-func (c *compilerContext) renderUpdate(qc *qcode.QCode, w io.Writer,
-	vars Variables, ti *DBTableInfo) (uint32, error) {
-
-	update, ok := vars[qc.ActionVar]
-	if !ok {
-		return 0, fmt.Errorf("variable '%s' not !defined", qc.ActionVar)
-	}
-	if len(update) == 0 {
-		return 0, fmt.Errorf("variable '%s' is empty", qc.ActionVar)
-	}
-
-	io.WriteString(c.w, `WITH "_sg_input" AS (SELECT '{{`)
-	io.WriteString(c.w, qc.ActionVar)
-	io.WriteString(c.w, `}}' :: json AS j)`)
-
-	st := util.NewStack()
-	st.Push(kvitem{_type: itemUpdate, key: ti.Name, val: update, ti: ti})
-
-	for {
-		if st.Len() == 0 {
-			break
-		}
-		if update[0] == '[' && st.Len() > 1 {
-			return 0, errors.New("Nested bulk update not supported")
-		}
-		intf := st.Pop()
-
-		switch item := intf.(type) {
-		case kvitem:
-			if err := c.handleKVItem(st, item); err != nil {
-				return 0, err
-			}
-
-		case renitem:
-			var err error
-
-			// if w := qc.Selects[0].Where; w != nil && w.Op == qcode.OpFalse {
-			// 	io.WriteString(c.w, ` WHERE false`)
-			// }
-
-			switch item._type {
-			case itemUpdate:
-				err = c.renderUpdateStmt(w, qc, item)
-			case itemConnect:
-				err = c.renderConnectStmt(qc, w, item)
-			case itemDisconnect:
-				err = c.renderDisconnectStmt(qc, w, item)
-			case itemUnion:
-				err = c.renderUnionStmt(w, item)
-			}
-
-			if err != nil {
-				return 0, err
-			}
-
-		}
-	}
-	io.WriteString(c.w, ` `)
-
-	return 0, nil
-}
-
-func (c *compilerContext) renderUpdateStmt(w io.Writer, qc *qcode.QCode, item renitem) error {
-	ti := item.ti
-	jt := item.data
-	sk := nestedUpdateRelColumnsMap(item.kvitem)
-
-	io.WriteString(c.w, `, `)
-	renderCteName(c.w, item.kvitem)
-	io.WriteString(c.w, ` AS (`)
-
-	io.WriteString(w, `UPDATE `)
-	quoted(w, ti.Name)
-	io.WriteString(w, ` SET (`)
-	renderInsertUpdateColumns(w, qc, jt, ti, sk, false)
-	renderNestedUpdateRelColumns(w, item.kvitem, false)
-
-	io.WriteString(w, `) = (SELECT `)
-	renderInsertUpdateColumns(w, qc, jt, ti, sk, true)
-	renderNestedUpdateRelColumns(w, item.kvitem, true)
-
-	io.WriteString(w, ` FROM "_sg_input" i`)
-	renderNestedUpdateRelTables(w, item.kvitem)
-	io.WriteString(w, `) `)
-
-	if item.id != 0 {
-		// Render sql to set id values if child-to-parent
-		// relationship is one-to-one
-		rel := item.relCP
-
-		io.WriteString(w, `FROM `)
-		quoted(w, rel.Right.Table)
-
-		io.WriteString(w, ` WHERE ((`)
-		colWithTable(w, rel.Left.Table, rel.Left.Col)
-		io.WriteString(w, `) = (`)
-		colWithTable(w, rel.Right.Table, rel.Right.Col)
-		io.WriteString(w, `)`)
-
-		if item.relPC.Type == RelOneToMany {
-			if conn, ok := item.data["where"]; ok {
-				io.WriteString(w, ` AND `)
-				renderWhereFromJSON(w, item.kvitem, "where", conn)
-			} else if conn, ok := item.data["_where"]; ok {
-				io.WriteString(w, ` AND `)
-				renderWhereFromJSON(w, item.kvitem, "_where", conn)
-			}
-		}
-		io.WriteString(w, `)`)
-
-	} else {
-		if qc.Selects[0].Where != nil {
-			io.WriteString(w, ` WHERE `)
-			if err := c.renderWhere(&qc.Selects[0], ti); err != nil {
-				return err
-			}
-		}
-	}
-
-	io.WriteString(w, ` RETURNING `)
-	quoted(w, ti.Name)
-	io.WriteString(w, `.*)`)
-
-	return nil
-}
-
-func nestedUpdateRelColumnsMap(item kvitem) map[string]struct{} {
-	sk := make(map[string]struct{}, len(item.items))
-
-	for _, v := range item.items {
-		if v._ctype > 0 && v.relCP.Type == RelOneToMany {
-			sk[v.relCP.Right.Col] = struct{}{}
-		}
-	}
-
-	return sk
-}
-
-func renderNestedUpdateRelColumns(w io.Writer, item kvitem, values bool) error {
-	// Render child foreign key columns if child-to-parent
-	// relationship is one-to-many
-	for _, v := range item.items {
-		if v._ctype > 0 && v.relCP.Type == RelOneToMany {
-			if values {
-				// if v.relCP.Right.Array {
-				// 	io.WriteString(w, `array_diff(`)
-				// 	colWithTable(w, v.relCP.Right.Table, v.relCP.Right.Col)
-				// 	io.WriteString(w, `, `)
-				// }
-
-				if v._ctype > 0 {
-					io.WriteString(w, `"_x_`)
-					io.WriteString(w, v.relCP.Left.Table)
-					io.WriteString(w, `".`)
-					quoted(w, v.relCP.Left.Col)
-				} else {
-					colWithTable(w, v.relCP.Left.Table, v.relCP.Left.Col)
-				}
-
-				// if v.relCP.Right.Array {
-				// 	io.WriteString(w, `)`)
-				// }
-			} else {
-
-				quoted(w, v.relCP.Right.Col)
-
-			}
-		}
-	}
-
-	return nil
-}
-
-func renderNestedUpdateRelTables(w io.Writer, item kvitem) error {
-	// Render tables needed to set values if child-to-parent
-	// relationship is one-to-many
-	for _, v := range item.items {
-		if v._ctype > 0 && v.relCP.Type == RelOneToMany {
-			io.WriteString(w, `, "_x_`)
-			io.WriteString(w, v.relCP.Left.Table)
-			io.WriteString(w, `"`)
-		}
-	}
-
-	return nil
-}
-
-func (c *compilerContext) renderDelete(qc *qcode.QCode, w io.Writer,
-	vars Variables, ti *DBTableInfo) (uint32, error) {
-	root := &qc.Selects[0]
-
-	io.WriteString(c.w, `WITH `)
-	quoted(c.w, ti.Name)
-
-	io.WriteString(c.w, ` AS (DELETE FROM `)
-	quoted(c.w, ti.Name)
-	io.WriteString(c.w, ` WHERE `)
-
-	if root.Where == nil {
-		return 0, errors.New("'where' clause missing in delete mutation")
-	}
-
-	if err := c.renderWhere(root, ti); err != nil {
-		return 0, err
-	}
-
-	io.WriteString(w, ` RETURNING `)
-	quoted(w, ti.Name)
-	io.WriteString(w, `.*) `)
-	return 0, nil
-}

core/internal/psql/update_test.go

@@ -1,258 +0,0 @@
-package psql
-
-import (
-	"encoding/json"
-	"testing"
-)
-
-func singleUpdate(t *testing.T) {
-	gql := `mutation {
-		product(id: $id, update: $update, where: { id: { eq: 1 } }) {
-			id
-			name
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"update": json.RawMessage(` { "name": "my_name", "description": "my_desc"  }`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "anon")
-}
-
-func simpleUpdateWithPresets(t *testing.T) {
-	gql := `mutation {
-		product(update: $data) {
-			id
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{"name": "Apple", "price": 1.25}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "user")
-}
-
-func nestedUpdateManyToMany(t *testing.T) {
-	gql := `mutation {
-		purchase(update: $data, id: $id) {
-			sale_type
-			quantity
-			due_date
-			customer {
-				id
-				full_name
-				email
-			}
-			product {
-				id
-				name
-				price
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(` {
-			"sale_type": "bought",
-			"quantity": 5,
-			"due_date": "now",
-			"customer": {
-				"email": "thedude@rug.com",
-				"full_name": "The Dude"
-			},
-			"product": {
-				"name": "Apple",
-				"price": 1.25
-			}
-		}
-	`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func nestedUpdateOneToMany(t *testing.T) {
-	gql := `mutation {
-		user(update: $data, where: { id: { eq: 8 } }) {
-			id
-			full_name
-			email
-			product {
-				id
-				name
-				price
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{
-			"email": "thedude@rug.com",
-			"full_name": "The Dude",
-			"created_at": "now",
-			"updated_at": "now",
-			"product": {
-				"where": {
-					"id": 2
-				},
-				"name": "Apple",
-				"price": 1.25,
-				"created_at": "now",
-				"updated_at": "now"
-			}
-		}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func nestedUpdateOneToOne(t *testing.T) {
-	gql := `mutation {
-		product(update: $data, id: $id) {
-			id
-			name
-			user {
-				id
-				full_name
-				email
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{
-			"name": "Apple",
-			"price": 1.25,
-			"created_at": "now",
-			"updated_at": "now",
-			"user": {
-				"email": "thedude@rug.com"
-			}
-		}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-
-}
-
-func nestedUpdateOneToManyWithConnect(t *testing.T) {
-	gql := `mutation {
-		user(update: $data, id: $id) {
-			id
-			full_name
-			email
-			product {
-				id
-				name
-				price
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{
-			"email": "thedude@rug.com",
-			"full_name": "The Dude",
-			"created_at": "now",
-			"updated_at": "now",
-			"product": {
-				"connect": { "id": 7 },
-				"disconnect": { "id": 8 }
-			}
-		}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func nestedUpdateOneToOneWithConnect(t *testing.T) {
-	gql := `mutation {
-		product(update: $data, id: $product_id) {
-			id
-			name
-			user {
-				id
-				full_name
-				email
-			}
-		}
-	}`
-
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{
-			"name": "Apple",
-			"price": 1.25,
-			"user": {
-				"connect": { "id": 5, "email": "test@test.com" }
-			}
-		}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-func nestedUpdateOneToOneWithDisconnect(t *testing.T) {
-	gql := `mutation {
-		product(update: $data, id: $id) {
-			id
-			name
-			user_id
-		}
-	}`
-	vars := map[string]json.RawMessage{
-		"data": json.RawMessage(`{
-			"name": "Apple",
-			"price": 1.25,
-			"user": {
-				"disconnect": { "id": 5 }
-			}
-		}`),
-	}
-
-	compileGQLToPSQL(t, gql, vars, "admin")
-}
-
-// func nestedUpdateOneToOneWithDisconnectArray(t *testing.T) {
-// 	gql := `mutation {
-// 		product(update: $data, id: 2) {
-// 			id
-// 			name
-// 			user_id
-// 		}
-// 	}`
-
-// 	sql := `WITH "_sg_input" AS (SELECT '{{data}}' :: json AS j), "users" AS (SELECT * FROM (VALUES(NULL::bigint)) AS LOOKUP("id")), "products" AS (UPDATE "products" SET ("name", "price", "user_id") = (SELECT "t"."name", "t"."price", "users"."id" FROM "_sg_input" i, "users", json_populate_record(NULL::products, i.j) t) WHERE (("products"."id") = 2) RETURNING "products".*) SELECT json_object_agg('product', json_0) FROM (SELECT row_to_json((SELECT "json_row_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."user_id" AS "user_id") AS "json_row_0")) AS "json_0" FROM (SELECT "products"."id", "products"."name", "products"."user_id" FROM "products" LIMIT ('1') :: integer) AS "products_0" LIMIT ('1') :: integer) AS "sel_0"`
-
-// 	vars := map[string]json.RawMessage{
-// 		"data": json.RawMessage(`{
-// 			"name": "Apple",
-// 			"price": 1.25,
-// 			"user": {
-// 				"disconnect": { "id": 5 }
-// 			}
-// 		}`),
-// 	}
-
-// 	resSQL, err := compileGQLToPSQL(gql, vars, "admin")
-// 	if err != nil {
-// 		t.Fatal(err)
-// 	}
-
-// 	if string(resSQL) != sql {
-// 		t.Fatal(errNotExpected)
-// 	}
-// }
-
-func TestCompileUpdate(t *testing.T) {
-	t.Run("singleUpdate", singleUpdate)
-	t.Run("simpleUpdateWithPresets", simpleUpdateWithPresets)
-	t.Run("nestedUpdateManyToMany", nestedUpdateManyToMany)
-	t.Run("nestedUpdateOneToMany", nestedUpdateOneToMany)
-	t.Run("nestedUpdateOneToOne", nestedUpdateOneToOne)
-	t.Run("nestedUpdateOneToManyWithConnect", nestedUpdateOneToManyWithConnect)
-	t.Run("nestedUpdateOneToOneWithConnect", nestedUpdateOneToOneWithConnect)
-	t.Run("nestedUpdateOneToOneWithDisconnect", nestedUpdateOneToOneWithDisconnect)
-	//t.Run("nestedUpdateOneToOneWithDisconnectArray", nestedUpdateOneToOneWithDisconnectArray)
-}

core/internal/qcode/utils.go

@@ -1,47 +0,0 @@
-package qcode
-
-func GetQType(gql string) QType {
-	ic := false
-	for i := range gql {
-		b := gql[i]
-		switch {
-		case b == '#':
-			ic = true
-		case b == '\n':
-			ic = false
-		case !ic && b == '{':
-			return QTQuery
-		case !ic && al(b):
-			switch b {
-			case 'm', 'M':
-				return QTMutation
-			case 'q', 'Q':
-				return QTQuery
-			}
-		}
-	}
-	return -1
-}
-
-func al(b byte) bool {
-	return (b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z') || (b >= '0' && b <= '9')
-}
-
-func (qt QType) String() string {
-	switch qt {
-	case QTQuery:
-		return "query"
-	case QTMutation:
-		return "mutation"
-	case QTInsert:
-		return "insert"
-	case QTUpdate:
-		return "update"
-	case QTDelete:
-		return "delete"
-	case QTUpsert:
-		return "upsert"
-	}
-
-	return ""
-}

core/internal/qcode/utils_test.go

@@ -1,50 +0,0 @@
-package qcode
-
-import "testing"
-
-func TestGetQType(t *testing.T) {
-	type args struct {
-		gql string
-	}
-	type ts struct {
-		name string
-		args args
-		want QType
-	}
-	tests := []ts{
-		ts{
-			name: "query",
-			args: args{gql: "  query {"},
-			want: QTQuery,
-		},
-		ts{
-			name: "mutation",
-			args: args{gql: "  mutation {"},
-			want: QTMutation,
-		},
-		ts{
-			name: "default query",
-			args: args{gql: "  {"},
-			want: QTQuery,
-		},
-		ts{
-			name: "default query with comment",
-			args: args{gql: `# query is good 
-			{`},
-			want: QTQuery,
-		},
-		ts{
-			name: "failed query with comment",
-			args: args{gql: `# query is good query {`},
-			want: -1,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := GetQType(tt.args.gql); got != tt.want {
-				t.Errorf("GetQType() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

core/prepare.go

@@ -1,258 +0,0 @@
-package core
-
-import (
-	"bytes"
-	"context"
-	"crypto/sha1"
-	"database/sql"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/dosco/super-graph/core/internal/allow"
-	"github.com/dosco/super-graph/core/internal/psql"
-	"github.com/dosco/super-graph/core/internal/qcode"
-	"github.com/valyala/fasttemplate"
-)
-
-type preparedItem struct {
-	sd      *sql.Stmt
-	args    [][]byte
-	st      stmt
-	roleArg bool
-}
-
-func (sg *SuperGraph) initPrepared() error {
-	ct := context.Background()
-
-	if sg.allowList.IsPersist() {
-		return nil
-	}
-	sg.prepared = make(map[string]*preparedItem)
-
-	tx, err := sg.db.BeginTx(ct, nil)
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback() //nolint: errcheck
-
-	if err = sg.prepareRoleStmt(tx); err != nil {
-		return fmt.Errorf("prepareRoleStmt: %w", err)
-	}
-
-	if err := tx.Commit(); err != nil {
-		return err
-	}
-
-	success := 0
-
-	list, err := sg.allowList.Load()
-	if err != nil {
-		return err
-	}
-
-	for _, v := range list {
-		if len(v.Query) == 0 {
-			continue
-		}
-
-		err := sg.prepareStmt(v)
-		if err != nil {
-			sg.log.Printf("WRN %s: %v", v.Name, err)
-		} else {
-			success++
-		}
-	}
-
-	sg.log.Printf("INF allow list: prepared %d / %d queries", success, len(list))
-
-	return nil
-}
-
-func (sg *SuperGraph) prepareStmt(item allow.Item) error {
-	query := item.Query
-	qb := []byte(query)
-	vars := item.Vars
-
-	qt := qcode.GetQType(query)
-	ct := context.Background()
-	switch qt {
-	case qcode.QTQuery:
-		var stmts1 []stmt
-		var err error
-
-		if sg.abacEnabled {
-			stmts1, err = sg.buildMultiStmt(qb, vars)
-		} else {
-			stmts1, err = sg.buildRoleStmt(qb, vars, "user")
-		}
-
-		if err != nil {
-			return err
-		}
-
-		//logger.Debug().Msgf("Prepared statement 'query %s' (user)", item.Name)
-
-		err = sg.prepare(ct, stmts1, stmtHash(item.Name, "user"))
-		if err != nil {
-			return err
-		}
-
-		if sg.anonExists {
-			// logger.Debug().Msgf("Prepared statement 'query %s' (anon)", item.Name)
-
-			stmts2, err := sg.buildRoleStmt(qb, vars, "anon")
-			if err == psql.ErrAllTablesSkipped {
-				return nil
-			}
-			if err != nil {
-				return err
-			}
-
-			err = sg.prepare(ct, stmts2, stmtHash(item.Name, "anon"))
-			if err != nil {
-				return err
-			}
-		}
-
-	case qcode.QTMutation:
-		for _, role := range sg.conf.Roles {
-			// logger.Debug().Msgf("Prepared statement 'mutation %s' (%s)", item.Name, role.Name)
-
-			stmts, err := sg.buildRoleStmt(qb, vars, role.Name)
-			if err == psql.ErrAllTablesSkipped {
-				return nil
-			}
-			if err != nil {
-				return err
-			}
-
-			err = sg.prepare(ct, stmts, stmtHash(item.Name, role.Name))
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (sg *SuperGraph) prepare(ct context.Context, st []stmt, key string) error {
-	finalSQL, am := processTemplate(st[0].sql)
-
-	sd, err := sg.db.Prepare(finalSQL)
-	if err != nil {
-		return fmt.Errorf("prepare failed: %v: %s", err, finalSQL)
-	}
-
-	sg.prepared[key] = &preparedItem{
-		sd:      sd,
-		args:    am,
-		st:      st[0],
-		roleArg: len(st) > 1,
-	}
-	return nil
-}
-
-// nolint: errcheck
-func (sg *SuperGraph) prepareRoleStmt(tx *sql.Tx) error {
-	var err error
-
-	if !sg.abacEnabled {
-		return nil
-	}
-
-	w := &bytes.Buffer{}
-
-	io.WriteString(w, `SELECT (CASE WHEN EXISTS (`)
-	io.WriteString(w, sg.conf.RolesQuery)
-	io.WriteString(w, `) THEN `)
-
-	io.WriteString(w, `(SELECT (CASE`)
-	for _, role := range sg.conf.Roles {
-		if len(role.Match) == 0 {
-			continue
-		}
-		io.WriteString(w, ` WHEN `)
-		io.WriteString(w, role.Match)
-		io.WriteString(w, ` THEN '`)
-		io.WriteString(w, role.Name)
-		io.WriteString(w, `'`)
-	}
-
-	io.WriteString(w, ` ELSE {{role}} END) FROM (`)
-	io.WriteString(w, sg.conf.RolesQuery)
-	io.WriteString(w, `) AS "_sg_auth_roles_query" LIMIT 1) `)
-	io.WriteString(w, `ELSE 'anon' END) FROM (VALUES (1)) AS "_sg_auth_filler" LIMIT 1; `)
-
-	roleSQL, _ := processTemplate(w.String())
-
-	sg.getRole, err = tx.Prepare(roleSQL)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func processTemplate(tmpl string) (string, [][]byte) {
-	st := struct {
-		vmap map[string]int
-		am   [][]byte
-		i    int
-	}{
-		vmap: make(map[string]int),
-		am:   make([][]byte, 0, 5),
-		i:    0,
-	}
-
-	execFunc := func(w io.Writer, tag string) (int, error) {
-		if n, ok := st.vmap[tag]; ok {
-			return w.Write([]byte(fmt.Sprintf("$%d", n)))
-		}
-		st.am = append(st.am, []byte(tag))
-		st.i++
-		st.vmap[tag] = st.i
-		return w.Write([]byte(fmt.Sprintf("$%d", st.i)))
-	}
-
-	t1 := fasttemplate.New(tmpl, `'{{`, `}}'`)
-	ts1 := t1.ExecuteFuncString(execFunc)
-
-	t2 := fasttemplate.New(ts1, `{{`, `}}`)
-	ts2 := t2.ExecuteFuncString(execFunc)
-
-	return ts2, st.am
-}
-
-func (sg *SuperGraph) initAllowList() error {
-	var ac allow.Config
-	var err error
-
-	if len(sg.conf.AllowListFile) == 0 {
-		sg.conf.UseAllowList = false
-		sg.log.Printf("WRN allow list disabled no file specified")
-	}
-
-	// When list is not eabled it is still created and
-	// and new queries are saved to it.
-	if !sg.conf.UseAllowList {
-		ac = allow.Config{CreateIfNotExists: true, Persist: true}
-	}
-
-	sg.allowList, err = allow.New(sg.conf.AllowListFile, ac)
-	if err != nil {
-		return fmt.Errorf("failed to initialize allow list: %w", err)
-	}
-
-	return nil
-}
-
-// nolint: errcheck
-func stmtHash(name string, role string) string {
-	h := sha1.New()
-	io.WriteString(h, strings.ToLower(name))
-	io.WriteString(h, role)
-	return hex.EncodeToString(h.Sum(nil))
-}

core/utils.go

@@ -1,15 +0,0 @@
-package core
-
-import (
-	"github.com/cespare/xxhash/v2"
-)
-
-// nolint: errcheck
-func mkkey(h *xxhash.Digest, k1 string, k2 string) uint64 {
-	h.WriteString(k1)
-	h.WriteString(k2)
-	v := h.Sum64()
-	h.Reset()
-
-	return v
-}

docker-compose.yml

@@ -1,10 +1,7 @@
 version: '3.4'
 services:
   db:
-    image: postgres:12
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+    image: postgres
     ports:
       - "5432:5432"
 
@@ -40,6 +37,6 @@ services:
     command: wtc
     depends_on:
       - db
-      # - rails_app
+      - rails_app
 
     # - redis

docs/.vuepress/components/Card.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="shadow p-4 flex items-start" :class="className">
+<div class="shadow bg-white p-4 flex items-start" :class="className">
   <slot name="image"></slot>
   <div class="pl-4">
     <h2 class="p-0">

docs/.vuepress/components/HomeLayout.vue

@@ -0,0 +1,267 @@
+<template>
+  <div>
+    <main aria-labelledby="main-title" >
+    <Navbar />
+
+    <div class="container mx-auto">
+      <div class="flex flex-col md:flex-row justify-between px-10 md:px-20">
+        <div class="bg-bottom bg-no-repeat bg-cover">
+          <div class="text-center md:text-left pt-24">
+            <h1 v-if="data.heroText !== null" class="text-5xl font-bold text-black pb-0 uppercase">
+              <img src="/super-graph.png" width="250" />
+            </h1>
+            
+            <p class="text-4xl text-gray-800 leading-tight mt-1">
+              Build web products faster. Secure high performance GraphQL
+            </p>
+
+            <NavLink
+              class="inline-block px-4 py-3 my-8 bg-blue-600 text-blue-100 font-bold rounded"
+              :item="actionLink"
+            />
+
+            <a
+              class="px-4 py-3 my-8 border-2 border-gray-500 text-gray-600 font-bold rounded"
+              href="https://github.com/dosco/super-graph"
+              target="_blank"
+            >Github</a>
+
+          </div>
+        </div>
+
+        <div class="py-10 md:p-20">
+          <img src="/hologram.svg" class="h-64">
+        </div>
+
+      </div>
+      </div>
+
+      <div>
+        <div
+          class="flex flex-wrap mx-2 md:mx-20"
+          v-if="data.features && data.features.length"
+        >
+          <div
+            class="w-2/4 md:w-1/3 shadow"
+            v-for="(feature, index) in data.features"
+            :key="index"
+          >
+            <div class="p-8">
+            <h2 class="md:text-xl text-blue-800 font-medium border-0 mb-1">{{ feature.title }}</h2>
+            <p class="md:text-xl text-gray-700 leading-snug">{{ feature.details }}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+
+      <div class="bg-gray-100 mt-10">
+        <div class="container mx-auto px-10 md:px-0 py-32">
+
+          <div class="pb-8 hidden md:block ">
+            <img src="arch-basic.svg">
+          </div>
+
+          <h1 class="uppercase font-semibold text-xl text-blue-800 mb-4">
+            What is {{ data.heroText }}?
+          </h1>
+          <div class="text-2xl md:text-3xl">
+            Super Graph can automatically learn a Postgres database and instantly serve it as a fast and secured GraphQL API. It comes with tools to create a new app and manage it's database. You get it all, a very productive developer and a highly scalable app backend. It's designed to work well on serverless platforms by Google, AWS, Microsoft, etc. The goal is to save you a ton of time and money so you can focus on you're apps core value.
+          </div>
+
+
+        </div>
+      </div>
+
+
+      <div class="flex flex-wrap">
+        <div class="md:w-2/4">
+          <img src="/graphql.png">
+        </div>
+
+        <div class="md:w-2/4">
+          <img src="/json.png">
+        </div>
+      </div>
+
+      <div class="mt-10 py-10 md:py-20">
+        <div class="container mx-auto px-10 md:px-0">
+          <h1 class="uppercase font-semibold text-xl text-blue-800 mb-4">
+            How to use {{ data.heroText }}?
+          </h1>
+          <div class="text-2xl md:text-3xl">
+            <small class="text-sm">Use the below command to download and install Super Graph. You will need Go 1.13 or above</small>
+            <pre>&#8227; GO111MODULE=on go get -u github.com/dosco/super-graph</pre>
+
+            <small class="text-sm">Create a new app and change to it's directory</small>
+            <pre>&#8227; super-graph new blog; cd blog</pre>
+
+            <small class="text-sm">Setup the app database and seed it with fake data. Docker compose will start a Postgres database for your app</small>
+            <pre>&#8227; docker-compose run blog_api ./super-graph db:setup</pre>
+
+            <small class="text-sm">And finally launch Super Graph configured for your app</small>
+            <pre>&#8227; docker-compose up</pre>
+          </div>
+        </div>
+      </div>
+
+      <div class="bg-gray-100 mt-10">
+        <div class="container mx-auto px-10 md:px-0 py-32">
+          <h1 class="uppercase font-semibold text-xl text-blue-800 mb-4">
+            The story of {{ data.heroText }}
+          </h1>
+          <div class="text-2xl md:text-3xl">
+            After working on several products through my career I find that we spend way too much time on building API backends. Most APIs also require constant updating, this costs real time and money.<br><br>
+            
+            It's always the same thing, figure out what the UI needs then build an endpoint for it. Most API code involves struggling with an ORM to query a database and mangle the data into a shape that the UI expects to see.<br><br>
+            
+            I didn't want to write this code anymore, I wanted the computer to do it. Enter GraphQL, to me it sounded great, but it still required me to write all the same database query code.<br><br>
+            
+            Having worked with compilers before I saw this as a compiler problem. Why not build a compiler that converts GraphQL to highly efficient SQL.<br><br>
+            
+            This compiler is what sits at the heart of Super Graph with layers of useful functionality around it like authentication, remote joins, rails integration, database migrations and everything else needed for you to build production ready apps with it.
+          </div>
+        </div>
+      </div>
+
+      <div class="overflow-hidden bg-indigo-900">
+        <div class="container mx-auto py-20">
+        <img src="/super-graph-web-ui.png">
+        </div>
+      </div>
+
+      <div class="py-10 md:py-20">
+        <div class="container mx-auto px-10 md:px-0">
+          <h1 class="uppercase font-semibold text-xl text-blue-800 mb-4">
+            Try it with a demo Rails app
+          </h1>
+          <div class="text-2xl md:text-3xl">
+            <small class="text-sm">Download the Docker compose config for the demo</small>
+            <pre>&#8227; curl -L -o demo.yml https://bit.ly/2mq05lW</pre>
+
+            <small class="text-sm">Setup the demo database</small>
+            <pre>&#8227; docker-compose -f demo.yml run rails_app rake db:create db:migrate db:seed</pre>
+
+            <small class="text-sm">Run the demo</small>
+            <pre>&#8227; docker-compose -f demo.yml up</pre>
+
+            <small class="text-sm">Signin to the demo app (user1@demo.com / 123456)</small>
+            <pre>&#8227; open http://localhost:3000</pre>
+
+            <small class="text-sm">Try the super graph web ui</small>
+            <pre>&#8227; open http://localhost:8080</pre>
+          </div>
+        </div>
+      </div>
+
+      <div class="border-t py-10">
+        <div class="block md:hidden w-100">
+          <iframe src='https://www.youtube.com/embed/MfPL2A-DAJk' frameborder='0' allowfullscreen style="width: 100%; height: 250px;">
+          </iframe>
+        </div>
+        
+        <div class="container mx-auto flex flex-col md:flex-row items-center">
+          <div class="w-100 md:w-1/2 p-8">
+            <h1 class="text-2xl font-bold">GraphQL the future of APIs</h1>
+            <p class="text-xl text-gray-600">Keeping a tight and fast development loop helps you iterate quickly. Leveraging technology like Super Graph focuses your team on building the core product and not reinventing wheels. GraphQL eliminate the dependency on the backend engineering and keeps the things moving fast</p>
+          </div>
+
+          <div class="hidden md:block md:w-1/2">
+            <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }</style>
+            <div class="embed-container shadow">
+              <iframe src='https://www.youtube.com/embed/MfPL2A-DAJk' frameborder='0' allowfullscreen >
+              </iframe>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="bg-gray-200 mt-10">
+        <div class="container mx-auto px-10 md:px-0 py-32">
+          <h1 class="uppercase font-semibold text-xl text-blue-800 mb-4">
+            Build Secure Apps
+          </h1>
+          <div class="flex flex-col text-2xl md:text-3xl">
+            <card className="mb-1 p-8">
+              <template #image><font-awesome-icon icon="portrait" class="text-red-500" /></template>
+              <template #title>Role Based Access Control</template>
+              <template #body>Dynamically assign roles like admin, manager or anon to specific users. Generate role specific queries at runtime. For example admins can get all users while others can only fetch their own user.</template>
+            </card>
+            <card className="mb-1 p-8">
+              <template #image><font-awesome-icon icon="shield-alt" class="text-blue-500" /></template>
+              <template #title>Prepared Statements</template>
+              <template #body>An additional layer of protection from a variety of security issues like SQL injection. In production mode all queries are precompiled into prepared statements so only those can be executed. This also significantly speeds up all queries.</template>
+            </card>
+            <card className="p-8">
+              <template #image><font-awesome-icon icon="lock" class="text-green-500"/></template>
+              <template #title>Fuzz Tested Code</template>
+              <template #body>Fuzzing is done by complex software that generates massives amounts of random input to detect if code is free of security bugs. Google uses fuzzing to protects everything from their cloud infrastructure to the Chrome browser.</template>
+            </card>         
+          </div>
+        </div>
+      </div>
+
+      <div class="">
+        <div class="container mx-auto px-10 md:px-0 py-32">
+          <h1 class="uppercase font-semibold text-xl text-blue-800 mb-4">
+            More Features
+          </h1>
+          <div class="flex flex-col md:flex-row text-2xl md:text-3xl">
+            <card className="mr-0 md:mr-1 mb-1 flex-col w-100 md:w-1/3 items-center">
+              <template #image><img src="/arch-remote-join.svg" class="h-64"></template>
+              <template #title>Remote Joins</template>
+              <template #body>A powerful feature that allows you to query your database and remote REST APIs at the same time. For example fetch a user from the DB, his tweets from Twitter and his payments from Stripe with a single GraphQL query.</template>
+            </card>
+            <card className="mr-0 md:mr-1 mb-1 flex-col w-100 md:w-1/3">
+              <template #image><img src="/arch-search.svg" class="h-64"></template>
+              <template #title>Full Text Search</template>
+              <template #body>Postgres has excellent full-text search built-in. You don't need another expensive service. Super Graph makes it super easy to use with keyword ranking and highlighting also supported.</template>
+            </card>
+            <card className="mb-1 flex-col w-100 md:w-1/3">
+              <template #image><img src="/arch-bulk.svg" class="h-64"></template>
+              <template #title>Bulk Inserts</template>
+              <template #body>Efficiently insert, update and delete multiple items with a single query. Upserts are also supported</template>
+            </card>         
+          </div>
+        </div>
+      </div>
+
+      <div
+        class="mx-auto text-center py-8"
+        v-if="data.footer"
+      >
+        {{ data.footer }}
+      </div>
+    </main>
+  </div>
+</template>
+
+<script>
+import NavLink from '@theme/components/NavLink.vue'
+import Navbar from '@theme/components/Navbar.vue'
+import Card from './Card.vue'
+
+
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faPortrait, faShieldAlt, faLock } from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+
+library.add(faPortrait, faShieldAlt, faLock)
+
+export default {
+  components: { NavLink, Navbar, FontAwesomeIcon, Card },
+
+  computed: {
+    data () {
+      return this.$page.frontmatter
+    },
+
+    actionLink () {
+      return {
+        link: this.data.actionLink,
+        text: this.data.actionText
+      }
+    }
+  }
+}
+</script>

docs/.vuepress/config.js

@@ -1,6 +1,6 @@
 let ogprefix = 'og: http://ogp.me/ns#'
 let title = 'Super Graph'
-let description = 'Fetch data without code'
+let description = 'An instant GraphQL API for your app. No code needed.'
 let color = '#f42525'
 
 module.exports = {

docs/.vuepress/styles/index.styl

@@ -1,9 +1,6 @@
 @tailwind base;
 
 @css {
-  body, .navbar, .navbar .links {
-    @apply bg-white text-black border-0 !important;
-  }
   h1 {
     @apply font-semibold text-3xl border-0 py-4
   }

docs/README.md

@@ -19,8 +19,8 @@ features:
   details: Compiles your GraphQL into a fast SQL query in realtime.
 - title: Built in GO
   details: Built in Go is a language created at Google to build fast and secure web services.
-- title: In your own Code
-  details: Use as a library in your own GO code. Build faster save time and money.
+- title: Ruby-on-Rails
+  details: Can read Rails cookies and supports rails database conventions.
 - title: Serverless
   details: Instant startup for scale to zero environments like Google Cloud Run, App Engine, AWS Lambda
 - title: Free and Open Source

docs/guide.md

@@ -4,9 +4,9 @@ sidebar: auto
 
 # Guide to Super Graph
 
-Super Graph is a service that instantly and without code gives you a high performance and secure GraphQL API. Your GraphQL queries are auto translated into a single fast SQL query. No more spending weeks or months writing backend API code. Just make the query you need and Super Graph will do the rest. 
+Super Graph is a micro-service that instantly and without code gives you a high performance and secure GraphQL API. Your GraphQL queries are auto translated into a single fast SQL query. No more writing API code as you develop your web frontend just make the query you need and Super Graph will do the rest.
 
-Super Graph has a rich feature set like integrating with your existing Ruby on Rails apps, joining your DB with data from remote APIs, Role and Attribute based access control, Support for JWT tokens, DB migrations, seeding and a lot more.
+Super Graph has a rich feature set like integrating with your existing Ruby on Rails apps, joining your DB with data from remote APIs, Role and Attribute based access control, Supoport for JWT tokens, DB migrations, seeding and a lot more.
 
 
 ## Features
@@ -31,20 +31,14 @@ Super Graph has a rich feature set like integrating with your existing Ruby on R
 ## Try the demo app
 
 ```bash
-# clone the repository
-git clone https://github.com/dosco/super-graph
-
-# run db in background
-docker-compose up -d db
-
-# see logs and wait until DB is really UP
-docker-compose logs db
+# download the Docker compose config for the demo
+curl -L -o demo.yml https://bit.ly/2mq05lW
 
 # setup the demo rails app & database and run it
-docker-compose run rails_app rake db:create db:migrate db:seed
+docker-compose -f demo.yml run rails_app rake db:create db:migrate db:seed
 
 # run the demo
-docker-compose up
+docker-compose -f demo.yml up
 
 # signin to the demo app (user1@demo.com / 123456)
 open http://localhost:3000
@@ -53,14 +47,14 @@ open http://localhost:3000
 open http://localhost:8080
 ```
 
-::: tip DEMO REQUIREMENTS
+::: warning DEMO REQUIREMENTS
 This demo requires `docker` you can either install it using `brew` or from the
 docker website [https://docs.docker.com/docker-for-mac/install/](https://docs.docker.com/docker-for-mac/install/)
 :::
 
 #### Trying out GraphQL
 
-We fully support queries and mutations. For example the below GraphQL query would fetch two products that belong to the current user where the price is greater than 10.
+We currently fully support queries and mutations. Support for `subscriptions` is work in progress. For example the below GraphQL query would fetch two products that belong to the current user where the price is greater than 10.
 
 #### GQL Query
 
@@ -82,6 +76,32 @@ query {
 }
 ```
 
+In another example the below GraphQL mutation would insert a product into the database. The first part of the below example is the variable data and the second half is the GraphQL mutation. For mutations data has to always ben passed as a variable.
+
+```json
+{
+  "data": { 
+    "name": "Art of Computer Programming",
+    "description": "The Art of Computer Programming (TAOCP) is a comprehensive monograph written by computer scientist Donald Knuth",
+    "price": 30.5
+  }
+}
+```
+
+```graphql
+mutation {
+  product(insert: $data) {
+    id
+    name
+  }
+}
+```
+
+The above GraphQL query returns the JSON result below. It handles all
+kinds of complexity without you having to writing a line of code.
+
+For example there is a while greater than `gt` and a limit clause on a child field. And the `avatar` field is renamed to `picture`. The `password` field is blocked and not returned. Finally the relationship between the `users` table and the `products` table is auto discovered and used.
+
 #### JSON Result
 
 ```json
@@ -108,107 +128,19 @@ query {
 }
 ```
 
-::: tip Testing with a user
-In development mode you can use the `X-User-ID: 4` header to set a user id so you don't have to worries about cookies etc. This can be set using the *HTTP Headers* tab at the bottom of the web UI.
-:::
+#### Try with an authenticated user
 
-In another example the below GraphQL mutation would insert a product into the database. The first part of the below example is the variable data and the second half is the GraphQL mutation. For mutations data has to always ben passed as a variable.
+In development mode you can use the `X-User-ID: 4` header to set a user id so you don't have to worries about cookies etc. This can be set using the *HTTP Headers* tab at the bottom of the web UI you'll see when you visit the above link. You can also directly run queries from the commandline like below.
 
-```json
-{
-  "data": { 
-    "name": "Art of Computer Programming",
-    "description": "The Art of Computer Programming (TAOCP) is a comprehensive monograph written by computer scientist Donald Knuth",
-    "price": 30.5
-  }
-}
-```
+#### Querying the GQL endpoint
 
-```graphql
-mutation {
-  product(insert: $data) {
-    id
-    name
-  }
-}
-```
+```bash
 
-## Why Super Graph
-
-Let's take a simple example say you want to fetch 5 products priced over 12 dollars along with the photos of the products and the users that owns them. Additionally also fetch the last 10 of your own purchases along with the name and ID of the product you purchased. This is a common type of query to render a view in say an ecommerce app. Lets be honest it's not very exciting write and maintain. Keep in mind the data needed will only continue to grow and change as your app evolves. Developers might find that most ORMs will not be able to do all of this in a single SQL query and will require n+1 queries to fetch all the data and assembly it into the right JSON response.
-
-What if I told you Super Graph will fetch all this data with a single SQL query and without you having to write a single line of code. Also as your app evolves feel free to evolve the query as you like. In our experience Super Graph saves us hundreds or thousands of man hours that we can put towards the more exciting parts of our app.
-
-#### GraphQL Query
-
-```graphql
-query {
-    products(limit: 5, where: { price: { gt: 12 } }) {
-      id
-      name
-      description
-      price
-      photos {
-        url
-      }
-      user {
-        id
-        email
-        picture : avatar
-        full_name
-      }
-  }
-  purchases(
-      limit: 10, 
-      order_by: { created_at: desc } , 
-      where: { user_id: { eq: $user_id } }
-    ) {
-    id 
-    created_at
-    product {
-      id
-      name
-    }
-  }
-}
-```
-
-#### JSON Result
-
-```json
-
-  "data": {
-    "products": [
-      {
-        "id": 1,
-        "name": "Oaked Arrogant Bastard Ale",
-        "description": "Coors lite, European Amber Lager, Perle, 1272 - American Ale II, 38 IBU, 6.4%, 9.7°Blg",
-        "price": 20,
-        "photos: [{
-          "url": "https://www.scienceworld.ca/wp-content/uploads/science-world-beer-flavours.jpg"
-        }],
-        "user": {
-          "id": 1,
-          "email": "user0@demo.com",
-          "picture": "https://robohash.org/sitaliquamquaerat.png?size=300x300&set=set1",
-          "full_name": "Mrs. Wilhemina Hilpert"
-        }
-      },
-      ...
-    ]
-  },
-  "purchases": [
-    {
-      "id": 5,
-      "created_at": "2020-01-24T05:34:39.880599",
-      "product": {
-        "id": 45,
-        "name": "Brooklyn Black",
-      }
-    },
-    ...
-  ]
-}
+# fetch the response json directly from the endpoint using user id 5
+curl 'http://localhost:8080/api/v1/graphql' \
+  -H 'content-type: application/json' \
+  -H 'X-User-ID: 5' \
+  --data-binary '{"query":"{ products { name price users { email }}}"}'
 ```
 
 ## Get Started
@@ -222,7 +154,7 @@ You can then add your database schema to the migrations, maybe create some seed
 git clone https://github.com/dosco/super-graph && cd super-graph && make install
 ```
 
-And then create and launch your new app
+And then create and launch you're new app
 
 ```bash
 # create a new app and change to it's directory
@@ -292,12 +224,6 @@ for (i = 0; i < 10; i++) {
 }
 ```
 
-If you want to import a lot of data using a CSV file is the best and fastest option. The `import_csv` command uses the `COPY FROM` Postgres method to load massive amounts of data into tables. The first line of the CSV file must be the header with column names.
-
-```javascript
-var post_count = import_csv("posts", "posts.csv")
-```
-
 You can generate the following fake data for your seeding purposes. Below is the list of fake data functions supported by the built-in fake data library. For example `fake.image_url()` will generate a fake image url or `fake.shuffle_strings(['hello', 'world', 'cool'])` will generate a randomly shuffled version of that array of strings or `fake.rand_string(['hello', 'world', 'cool'])` will return a random string from the array provided.
 
 ```
@@ -347,10 +273,12 @@ beer_style
 beer_yeast
 
 // Cars
-car
-car_type
+vehicle
+vehicle_type
 car_maker
 car_model
+fuel_type
+transmission_gear_type
 
 // Text
 word
@@ -436,8 +364,8 @@ hipster_paragraph
 hipster_sentence
 
 // File
-file_extension
-file_mine_type
+extension
+mine_type
 
 // Numbers
 number
@@ -461,18 +389,11 @@ mac_address
 digit
 letter
 lexify
+rand_string
 shuffle_strings
 numerify
 ```
 
-Other utility functions
-
-```
-shuffle_strings(string_array)
-make_slug(text)
-make_slug_lang(text, lang)
-```
-
 ### Migrations
 
 Easy database migrations is the most important thing when building products backend by a relational database. We make it super easy to manage and migrate your database.
@@ -599,20 +520,7 @@ query {
 }
 ```
 
-### Sorting
-
-To sort or ordering results just use the `order_by` argument. This can be combined with `where`, `search`, etc to build complex queries to fit you needs.
-
-```graphql
-query {
-  products(order_by: { cached_votes_total: desc }) {
-    id
-    name
-  }
-}
-```
-
-### Filtering
+### Advanced queries
 
 Super Graph support complex queries where you can add filters, ordering,offsets and limits on the query. For example the below query will list all products where the price is greater than 10 and the id is not 5.
 
@@ -730,7 +638,9 @@ query {
 }
 ```
 
-In GraphQL mutations is the operation type for when you need to modify data. Super Graph supports the `insert`, `update`, `upsert` and `delete`. You can also do complex nested inserts and updates.
+## Mutations
+
+In GraphQL mutations is the operation type for when you need to modify data. Super Graph supports the `insert`, `update`, `upsert` and `delete` database operations. Here are some examples.
 
 When using mutations the data must be passed as variables since Super Graphs compiles the query into an prepared statement in the database for maximum speed. Prepared statements are are functions in your code when called they accept arguments and your variables are passed in as those arguments.
 
@@ -913,244 +823,9 @@ mutation {
 }
 ```
 
-Often you will need to create or update multiple related items at the same time. This can be done using nested mutations. For example you might need to create a product and assign it to a user, or create a user and his products at the same time. You just have to use simple json to define you mutation and Super Graph takes care of the rest.
+### Using variables
 
-### Nested Insert 
-
-Create a product item first and then assign it to a user
-
-```json
-{
-  "data": {
-    "name": "Apple",
-    "price": 1.25,
-    "created_at": "now",
-    "updated_at": "now",
-    "user": {
-      "connect": { "id": 5 }
-    }
-  }
-}
-```
-
-```graphql
-mutation {
-  product(insert: $data) {
-    id
-    name
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-```
-
-Or it's reverse, create the user first and then his product
-
-```json
-{
-  "data": {
-    "email": "thedude@rug.com",
-    "full_name": "The Dude",
-    "created_at": "now",
-    "updated_at": "now",
-    "product": {
-      "name": "Apple",
-      "price": 1.25,
-      "created_at": "now",
-      "updated_at": "now"
-    }
-  }
-}
-```
-
-```graphql
-mutation {
-  user(insert: $data) {
-    id
-    full_name
-    email
-    product {
-      id
-      name
-      price
-    }
-  }
-}
-```
-
-### Nested Update 
-
-Update a product item first and then assign it to a user
-
-```json
-{
-  "data": {
-    "name": "Apple",
-    "price": 1.25,
-    "user": {
-      "connect": { "id": 5 }
-    }
-  }
-}
-```
-
-```graphql
-mutation {
-  product(update: $data, id: 5) {
-    id
-    name
-    user {
-      id
-      full_name
-      email
-    }
-  }
-}
-```
-
-Or it's reverse, update a user first and then his product
-
-```json
-{
-  "data": {
-    "email": "newemail@me.com",
-    "full_name": "The Dude",
-    "product": {
-      "name": "Banana",
-      "price": 1.25,
-    }
-  }
-}
-```
-
-```graphql
-mutation {
-  user(update: $data, id: 1) {
-    id
-    full_name
-    email
-    product {
-      id
-      name
-      price
-    }
-  }
-}
-```
-
-### Pagination
-
-This is a must have feature of any API. When you want your users to go thought a list page by page or implement some fancy infinite scroll you're going to need pagination. There are two ways to paginate in Super Graph.
-
- Limit-Offset
-This is simple enough but also inefficient when working with a large number of total items. Limit, limits the number of items fetched and offset is the point you want to fetch from. The below query will fetch 10 results at a time starting with the 100th item. You will have to keep updating offset (110, 120, 130, etc ) to walk thought the results so make offset a variable.
-
-```graphql
-query {
-  products(limit: 10, offset: 100) {
-    id
-    slug
-    name
-  }
-}
-```
-
-#### Cursor
-This is a powerful and highly efficient way to paginate though a large number of results. Infact it does not matter how many total results there are this will always be lighting fast. You can use a cursor to walk forward of backward though the results. If you plan to implement infinite scroll this is the option you should choose. 
-
-When going this route the results will contain a cursor value this is an encrypted string that you don't have to worry about just pass this back in to the next API call and you'll received the next set of results. The cursor value is encrypted since its contents should only matter to Super Graph and not the client. Also since the primary key is used for this feature it's possible you might not want to leak it's value to clients. 
-
-You will need to set this config value to ensure the encrypted cursor data is secure. If not set a random value is used which will change with each deployment breaking older cursor values that clients might be using so best to set it.
-
-```yaml
-# Secret key for general encryption operations like 
-# encrypting the cursor data
-secret_key: supercalifajalistics
-```
-
-Paginating forward through your results
-
-```json
-{
-  "variables": { 
-    "cursor": "MJoTLbQF4l0GuoDsYmCrpjPeaaIlNpfm4uFU4PQ="
-  }
-}
-```
-
-```graphql
-query {
-  products(first: 10, after: $cursor) {
-    slug
-    name
-  }
-}
-```
-
-Paginating backward through your results
-
-```graphql
-query {
-  products(last: 10, before: $cursor) {
-    slug
-    name
-  }
-}
-```
-
-```graphql
-"data": {
-   "products": [
-    {
-      "slug": "eius-nulla-et-8",
-      "name" "Pale Ale"
-    },
-    {
-      "slug": "sapiente-ut-alias-12",
-      "name" "Brown Ale"
-    }
-    ...
-  ],
-  "products_cursor": "dJwHassm5+d82rGydH2xQnwNxJ1dcj4/cxkh5Cer"
-}
-```
-
-Nested tables can also have cursors. Requesting multiple cursors are supported on a single request but when paginating using a cursor only one table is currently supported. To explain this better, you can only use a `before` or `after` argument with a cursor value to paginate a single table in a query.
-
-```graphql
-query {
-  products(last: 10) {
-    slug
-    name
-    customers(last: 5) {
-      email
-      full_name
-    }
-  }
-}
-```
-
-Multiple order-by arguments are supported. Super Graph is smart enough to allow cursor based pagination when you also need complex sort order like below.
-
-```graphql
-query {
-  products(
-    last: 10
-    before: $cursor
-    order_by: [ price: desc, total_customers: asc ]) {
-    slug
-    name
-  }
-}
-```
-
-
-## Using Variables
-
-Variables (`$product_id`) and their values (`"product_id": 5`) can be passed along side the GraphQL query. Using variables makes for better client side code as well as improved server side SQL query caching. The built-in web-ui also supports setting variables. Not having to manipulate your GraphQL query string to insert values into it makes for cleaner
+Variables (`$product_id`) and their values (`"product_id": 5`) can be passed along side the GraphQL query. Using variables makes for better client side code as well as improved server side SQL query caching. The build-in web-ui also supports setting variables. Not having to manipulate your GraphQL query string to insert values into it makes for cleaner
 and better client side code.
 
 ```javascript
@@ -1170,105 +845,7 @@ fetch('http://localhost:8080/api/v1/graphql', {
 .then(res => console.log(res.data));
 ```
 
-## GraphQL with React
-
-This is a quick simple example using `graphql.js` [https://github.com/f/graphql.js/](https://github.com/f/graphql.js/)
-
-```js
-import React, { useState, useEffect } from 'react'
-import graphql from 'graphql.js'
-
-// Create a GraphQL client pointing to Super Graph
-var graph = graphql("http://localhost:3000/api/v1/graphql", { asJSON: true })
-
-const App = () => {
-  const [user, setUser] = useState(null)
-  
-  useEffect(() => {
-    async function action() {
-      // Use the GraphQL client to execute a graphQL query
-      // The second argument to the client are the variables you need to pass
-      const result = await graph(`{ user { id first_name last_name picture_url } }`)()
-      setUser(result)
-    }
-    action()
-  }, []);
-
-  return (
-    <div className="App">
-      <h1>{ JSON.stringify(user) }</h1>
-    </div>
-  );
-}
-```
-
-export default App;
-
-## Advanced Columns
-
-The ablity to have `JSON/JSONB` and `Array` columns is often considered in the top most useful features of Postgres. There are many cases where using an array or a json column saves space and reduces complexity in your app. The only issue with these columns is the really that your SQL queries can get harder to write and maintain. 
-
-Super Graph steps in here to help you by supporting these columns right out of the box. It allows you to work with these columns just like you would with tables. Joining data against or modifying array columns using the `connect` or `disconnect` keywords in mutations is fully supported. Another very useful feature is the ability to treat `json` or `binary json (jsonb)` columns as seperate tables, even using them in nested queries joining against related tables. To replicate these features on your own will take a lot of complex SQL. Using Super Graph means you don't have to deal with any of this it just works.
-
-### Array Columns
-
-Configure a relationship between an array column `tag_ids` which contains integer id's for tags and the column `id` in the table `tags`.
-
-```yaml
-tables:
-  - name: posts
-    columns:
-      - name: tag_ids
-        related_to: tags.id
-
-```
-
-```graphql
-query {
-  posts {
-    title
-    tags {
-      name
-      image
-    }
-  }
-}
-```
-
-### JSON Column
-
-Configure a JSON column called `tag_count` in the table `products` into a seperate table. This JSON column contains a json array of objects each with a tag id and a count of the number of times the tag was used. As a seperate table you can nest it into your GraphQL query and treat it like table using any of the standard features like `order_by`, `limit`, `where clauses`, etc.
-
-The configuration below tells Super Graph to create a synthetic table called `tag_count` using the column `tag_count` from the `products` table. And that this new table has two columns `tag_id` and `count` of the listed types and with the defined relationships.
-
-```yaml
-tables:
-  - name: tag_count
-    table: products
-    columns:
-      - name: tag_id
-        type: bigint
-        related_to: tags.id
-      - name: count
-        type: int
-```
-
-```graphql
-query {
-  products {
-    name
-    tag_counts {
-      count
-      tag {
-        name
-      }
-    }
-  }
-}
-```
-
-
-## Full text search
+### Full text search
 
 Every app these days needs search. Enought his often means reaching for something heavy like Solr. While this will work why add complexity to your infrastructure when Postgres has really great
 and fast full text search built-in. And since it's part of Postgres it's also available in Super Graph.
@@ -1353,45 +930,45 @@ class AddSearchColumn < ActiveRecord::Migration[5.1]
 end
 ```
 
-## API Security
+## GraphQL with React
 
-One of the the most common questions I get asked is what happens if a user out on the internet sends queries
-that we don't want run. For example how do we stop him from fetching all users or the emails of users. Our answer to this is that it is not an issue as this cannot happen, let me explain.
+This is a quick simple example using `graphql.js` [https://github.com/f/graphql.js/](https://github.com/f/graphql.js/)
 
-Super Graph runs in one of two modes `development` or `production`, this is controlled via the config value `production: false` when it's false it's running in development mode and when true, production. In development mode all the **named** queries (including mutations) are saved to the allow list `./config/allow.list`. While in production mode when Super Graph starts only the queries from this allow list file are registered with the database as [prepared statements](https://stackoverflow.com/questions/8263371/how-can-prepared-statements-protect-from-sql-injection-attacks). 
+```js
+import React, { useState, useEffect } from 'react'
+import graphql from 'graphql.js'
 
-Prepared statements are designed by databases to be fast and secure. They protect against all kinds of sql injection attacks and since they are pre-processed and pre-planned they are much faster to run then raw sql queries. Also there's no GraphQL to SQL compiling happening in production mode which makes your queries lighting fast as they are directly sent to the database with almost no overhead.
+// Create a GraphQL client pointing to Super Graph
+var graph = graphql("http://localhost:3000/api/v1/graphql", { asJSON: true })
 
-In short in production only queries listed in the allow list file `./config/allow.list` can be used, all other queries will be blocked. 
-
-::: tip How to think about the allow list?
-The allow list file is essentially a list of all your exposed API calls and the data that passes within them. It's very easy to build tooling to do things like parsing this file within your tests to ensure fields like `credit_card_no` are not accidently leaked. It's a great way to build compliance tooling and ensure your user data is always safe.
-:::
-
-This is an example of a named query, `getUserWithProducts` is the name you've given to this query it can be anything you like but should be unique across all you're queries. Only named queries are saved in the allow list in development mode.
-
-
-```graphql
-query getUserWithProducts {
-  users {
-    id
-    name
-    products {
-      id
-      name
-      price
+const App = () => {
+  const [user, setUser] = useState(null)
+  
+  useEffect(() => {
+    async function action() {
+      // Use the GraphQL client to execute a graphQL query
+      // The second argument to the client are the variables you need to pass
+      const result = await graph(`{ user { id first_name last_name picture_url } }`)()
+      setUser(result)
     }
-  }
+    action()
+  }, []);
+
+  return (
+    <div className="App">
+      <h1>{ JSON.stringify(user) }</h1>
+    </div>
+  );
 }
 ```
 
-
+export default App;
 
 ## Authentication
 
-You can only have one type of auth enabled either Rails or JWT. 
+You can only have one type of auth enabled. You can either pick Rails or JWT. 
 
-### Ruby on Rails
+### Rails Auth (Devise / Warden)
 
 Almost all Rails apps use Devise or Warden for authentication. Once the user is
 authenticated a session is created with the users ID. The session can either be
@@ -1443,7 +1020,7 @@ auth:
     max_active: 12000
 ```
 
-### JWT Tokens
+### JWT Token Auth
 
 ```yaml
 auth:
@@ -1457,78 +1034,19 @@ auth:
     public_key_type: ecdsa #rsa
 ```
 
-For JWT tokens we currently support tokens from a provider like Auth0 or if you have a custom solution then we look for the `user_id` in the `subject` claim of of the `id token`. If you pick Auth0 then we derive two variables from the token `user_id` and `user_id_provider` for to use in your filters.
+For JWT tokens we currently support tokens from a provider like Auth0
+or if you have a custom solution then we look for the `user_id` in the
+`subject` claim of of the `id token`. If you pick Auth0 then we derive two variables from the token `user_id` and `user_id_provider` for to use in your filters.
 
 We can get the JWT token either from the `authorization` header where we expect it to be a `bearer` token or if `cookie` is specified then we look there.
 
 For validation a `secret` or a public key (ecdsa or rsa) is required. When using public keys they have to be in a PEM format file.
 
-### HTTP Headers
+## Role based Access Control
 
-```yaml
-header:
-  name: X-AppEngine-QueueName
-  exists: true
-  #value: default
-```
+It's a common usecase for APIs to control what information they return or insert based on the role of the user. For example when fetching a list of users, a normal user can only fetch his own entry while a manager can fetch all the users within a company and an admin user can fetch everyone. Or when creating a new user an an admin user can set a users role while the user himself cannot set or change it. This is called role based access control or RBAC.
 
-Header auth is usually the best option to authenticate requests to the action endpoints. For example you
-might want to use an action to refresh a materalized view every hour and only want a cron service like the Google AppEngine Cron service to make that request in this case a config similar to the one above will do. 
-
-The `exists: true` parameter ensures that only the existance of the header is checked not its value. The `value` parameter lets you confirm that the value matches the one assgined to the parameter. This helps in the case you are using a shared secret to protect the endpoint.
-
-### Named Auth
-
-```yaml
-# You can add additional named auths to use with actions
-# In this example actions using this auth can only be
-# called from the Google Appengine Cron service that
-# sets a special header to all it's requests
-auths:
-  - name: from_taskqueue
-    type: header
-    header:
-      name: X-Appengine-Cron
-      exists: true
-```
-
-In addition to the default auth configuration you can create additional named auth configurations to be used
-with features like `actions`. For example while your main GraphQL endpoint uses JWT for authentication you may want to use a header value to ensure your actions can only be called by clients having access to a shared secret
-or security header.
-
-## Actions
-
-Actions is a very useful feature that is currently work in progress. For now the best use case for actions is to
-refresh database tables like materialized views or call a database procedure to refresh a cache table, etc. An action creates an http endpoint that anyone can call to have the SQL query executed. The below example will create an endpoint `/api/v1/actions/refresh_leaderboard_users` any request send to that endpoint will cause the sql query to be executed. the `auth_name` points to a named auth that should be used to secure this endpoint. In future we have big plans to allow your own custom code to run using actions.
-
-```yaml
-actions:
-  - name: refresh_leaderboard_users
-    sql: REFRESH MATERIALIZED VIEW CONCURRENTLY "leaderboard_users"
-    auth_name: from_taskqueue
-```
-
-#### Using CURL to test a query
-
-```bash
-# fetch the response json directly from the endpoint using user id 5
-curl 'http://localhost:8080/api/v1/graphql' \
-  -H 'content-type: application/json' \
-  -H 'X-User-ID: 5' \
-  --data-binary '{"query":"{ products { name price users { email }}}"}'
-```
-
-## Access Control
-
-It's common for APIs to control what information they return or insert based on the role of the user. In Super Graph we have two primary roles `user` and `anon` the first for users where a `user_id` is available the latter for users where it's not.
-
-::: tip
-An authenticated request is one where Super Graph can extract an `user_id` based on the configured authentication method (jwt, rails cookies, etc).
-:::
-
-The `user` role can be divided up into further roles based on attributes in the database. For example when fetching a list of users, a normal user can only fetch his own entry while an admin can fetch all the users within a company and an admin user can fetch everyone. In some places this is called Attribute based access control. So in way we support both. Role based access control and Attribute based access control.
-
-Super Graph allows you to create roles dynamically using a `roles_query` and `  match` config values.
+Super Graph allows you to set access control rules based on dynamically defined roles. You can create as many roles as you wish. The only two default (built-in) roles are `user` for authenticated requests and `anon` for unauthenticated. An authenticated request is one where Super Graph can extract an `user_id` based on the configured authenication method (jwt, rails cookies, etc).
 
 ### Configure RBAC
 
@@ -1567,9 +1085,10 @@ roles:
           filters: []
 ```
 
-This configuration is relatively simple to follow the `roles_query` parameter is the query that must be run to help figure out a users role. This query can be as complex as you like and include joins with other tables. 
+This configuration is relatively simple to follow the `roles_query` parameter is the query that
+must be run to help figure out a users role. This query can be as complex as you like and include joins with other tables. 
 
-The individual roles are defined under the `roles` parameter and this includes each table the role has a custom setting for. The role is dynamically matched using the `match` parameter for example in the above case `users.id = 1` means that when the `roles_query` is executed a user with the id `1` will be assigned the admin role and those that don't match get the `user` role if authenticated successfully or the `anon` role.
+The individual roles are defined under the `roles` parameter and this includes each table the role has a custom setting for. The role is dynamically matched using the `match` parameter for example in the above case `users.id = 1` means that when the `roles_query` is executed a user with the id `1` willbe assigned the admin role and those that don't match get the `user` role if authenticated successfully or the `anon` role.
 
 ## Remote Joins
 
@@ -1648,25 +1167,8 @@ Even tracing data is availble in the Super Graph web UI if tracing is enabled in
 
 ![Query Tracing](/tracing.png "Super Graph Web UI Query Tracing")
 
-## Database Relationships
 
-In most cases you don't need this configuration, Super Graph will discover and learn
-the relationship graph within your database automatically. It does this using `Foreign Key` relationships that you have defined in your database schema.
-
-The below configs are only needed in special cases such as when you don't use foreign keys or when you want to create a relationship between two tables where a foreign key is not defined or cannot be defined.
-
-For example in the sample below a relationship is defined between the `tags` column on the `posts` table with the `slug` column on the `tags` table. This cannot be defined as using foreign keys since the `tags` column is of type array `text[]` and Postgres for one does not allow foreign keys with array columns.
-
-```yaml
-tables:
-  - name: posts
-    columns:
-      - name: tags
-        related_to: tags.slug
-```
-
-
-## Configuration
+## Configuration files
 
 Configuration files can either be in YAML or JSON their names are derived from the `GO_ENV` variable, for example `GO_ENV=prod` will cause the `prod.yaml` config file to be used. or `GO_ENV=dev` will use the `dev.yaml`. A path to look for the config files in can be specified using the `-path <folder>` command line argument.
 
@@ -1681,12 +1183,9 @@ app_name: "Super Graph Development"
 host_port: 0.0.0.0:8080
 web_ui: true
 
-# debug, error, warn, info
+# debug, info, warn, error, fatal, panic
 log_level: "debug"
 
-# enable or disable http compression (uses gzip)
-http_compress: true
-
 # When production mode is 'true' only queries 
 # from the allow list are permitted.
 # When it's 'false' all queries are saved to the
@@ -1709,7 +1208,7 @@ reload_on_config_change: true
 # seed_file: seed.js
 
 # Path pointing to where the migrations can be found
-migrations_path: ./migrations
+migrations_path: ./config/migrations
 
 # Postgres related environment Variables
 # SG_DATABASE_HOST
@@ -1762,29 +1261,13 @@ auth:
   #   public_key_file: /secrets/public_key.pem
   #   public_key_type: ecdsa #rsa
 
-  # header:
-  #   name: dnt
-  #   exists: true
-  #   value: localhost:8080
-
-# You can add additional named auths to use with actions
-# In this example actions using this auth can only be
-# called from the Google Appengine Cron service that
-# sets a special header to all it's requests
-auths:
-  - name: from_taskqueue
-    type: header
-    header:
-      name: X-Appengine-Cron
-      exists: true
-
 database:
   type: postgres
   host: db
   port: 5432
   dbname: app_development
   user: postgres
-  password: postgres
+  password: ''
 
   #schema: "public"
   #pool_size: 10
@@ -1795,48 +1278,18 @@ database:
   # Enable this if you need the user id in triggers, etc
   set_user_id: false
 
-  # database ping timeout is used for db health checking
-  ping_timeout: 1m
-
-  # Set up an secure tls encrypted db connection
-  enable_tls: false
-
-  # Required for tls. For example with Google Cloud SQL it's
-  # <gcp-project-id>:<cloud-sql-instance>"
-  # server_name: blah
-
-  # Required for tls. Can be a file path or the contents of the pem file
-  # server_cert: ./server-ca.pem
-
-  # Required for tls. Can be a file path or the contents of the pem file
-  # client_cert: ./client-cert.pem
-
-  # Required for tls. Can be a file path or the contents of the pem file
-  # client_key: ./client-key.pem
-
-# Define additional variables here to be used with filters
-variables:
-  admin_account_id: "5"
-
-# Field and table names that you wish to block
-blocklist:
-  - ar_internal_metadata
-  - schema_migrations
-  - secret
-  - password
-  - encrypted
-  - token
-
-# Create custom actions with their own api endpoints
-# For example the below action will be available at /api/v1/actions/refresh_leaderboard_users
-# A request to this url will execute the configured SQL query
-# which in this case refreshes a materialized view in the database.
-# The auth_name is from one of the configured auths
-actions:
-  - name: refresh_leaderboard_users
-    sql: REFRESH MATERIALIZED VIEW CONCURRENTLY "leaderboard_users"
-    auth_name: from_taskqueue
+  # Define additional variables here to be used with filters
+  variables:
+    admin_account_id: "5"
 
+  # Field and table names that you wish to block
+  blocklist:
+    - ar_internal_metadata
+    - schema_migrations
+    - secret
+    - password
+    - encrypted
+    - token
 
 tables:
   - name: customers
@@ -1938,74 +1391,9 @@ SG_AUTH_RAILS_REDIS_PASSWORD
 SG_AUTH_JWT_PUBLIC_KEY_FILE
 ```
 
-## YugabyteDB
-
-Yugabyte is an open-source, geo-distrubuted cloud-native relational DB that scales horizontally. Super Graph works with Yugabyte right out of the box. If you think you're data needs will outgrow Postgres and you don't really want to deal with sharding then Yugabyte is the way to go. Just point Super Graph to your Yugabyte DB and everything will just work including running migrations, seeding, querying, mutations, etc.
-
-To use Yugabyte in your local development flow just uncomment the following lines in the `docker-compose.yml` file that is part of your Super Graph app. Also remember to comment out the originl postgres `db` config.
-
-```yaml
-  # Postgres DB
-  # db:
-  #   image: postgres:latest
-  #   ports:
-  #     - "5432:5432"
-  
-  #Standard config to run a single node of Yugabyte
-  yb-master:                                                                                         
-    image: yugabytedb/yugabyte:latest                                                              
-    container_name: yb-master-n1                                                                   
-    command: [ "/home/yugabyte/bin/yb-master",                                                     
-              "--fs_data_dirs=/mnt/disk0,/mnt/disk1",                                              
-              "--master_addresses=yb-master-n1:7100",                                              
-              "--replication_factor=1",                                                            
-              "--enable_ysql=true"]                                                                
-    ports:                                                                                         
-      - "7000:7000"                                                                                  
-    environment:                                                                                   
-      SERVICE_7000_NAME: yb-master                                                                 
-                                                                                                    
-  db:                                                                                        
-    image: yugabytedb/yugabyte:latest                                                              
-    container_name: yb-tserver-n1                                                                  
-    command: [ "/home/yugabyte/bin/yb-tserver",                                                    
-              "--fs_data_dirs=/mnt/disk0,/mnt/disk1",                                              
-              "--start_pgsql_proxy",                                                               
-              "--tserver_master_addrs=yb-master-n1:7100"]                                          
-    ports:                                                                                         
-      - "9042:9042"                                                                                  
-      - "6379:6379"                                                                                  
-      - "5433:5433"                                                                                  
-      - "9000:9000"                                                                                  
-    environment:                                                                                   
-      SERVICE_5433_NAME: ysql                                                                      
-      SERVICE_9042_NAME: ycql                                                                      
-      SERVICE_6379_NAME: yedis                                                                     
-      SERVICE_9000_NAME: yb-tserver                                                                
-    depends_on:                                                                                    
-      - yb-master
-
-  # Environment variables to point Super Graph to Yugabyte
-  # This is required since it uses a different user and port number
-  yourapp_api:
-    image: dosco/super-graph:latest
-    environment:
-      GO_ENV: "development"
-      Uncomment below for Yugabyte DB
-      SG_DATABASE_PORT: 5433
-      SG_DATABASE_USER: yugabyte
-      SG_DATABASE_PASSWORD: yugabyte
-    volumes:
-     - ./config:/config
-    ports:
-      - "8080:8080"
-    depends_on:
-      - db
-```
-
 ## Developing Super Graph
 
-If you want to build and run Super Graph from code then the below commands will build the web ui and launch Super Graph in developer mode with a watcher to rebuild on code changes. And the demo rails app is also launched to make it easier to test changes.
+If you want to build and run Super Graph from code then the below commands will build the web ui and launch Super Graph in developer mode with a watcher to rebuild on code changes. And the demo rails app is also launched to make it essier to test changes.
 
 ```bash
 

docs/guide/.vuepress/components/HomeLayout.vue

@@ -1,436 +0,0 @@
-<template>
-  <div>
-    <main aria-labelledby="main-title" >
-    <Navbar />
-    <div style="height: 3.6rem"></div>
-
-    <div class="container mx-auto pt-4">
-      <div class="text-center">
-        <div class="text-center text-3xl md:text-4xl text-black leading-tight font-semibold">
-          Fetch data without code
-        </div>
-
-        <NavLink
-          class="inline-block px-4 py-3 my-8 bg-blue-600 text-white font-bold rounded"
-          :item="actionLink"
-        />
-
-        <a
-          class="px-4 py-3 my-8 border-2 border-blue-600 text-blue-600 font-bold rounded"
-          href="https://github.com/dosco/super-graph"
-          target="_blank"
-        >Github</a>
-      </div>
-    </div>
-
-
-    <div class="container mx-auto mb-8 mt-0 md:mt-20 bg-green-100">
-      <div class="flex flex-wrap">
-        <div class="w-100 md:w-1/2 border border-green-500 text-gray-6 00 text-sm md:text-lg p-6">
-          <div class="text-xl font-bold pb-4">Before, struggle with SQL</div>
-          <pre>
-type User struct {
-  gorm.Model
-  Profile   Profile
-  ProfileID int
-}
-
-type Profile struct {
-  gorm.Model
-  Name string
-}
-
-db.Model(&user).
-  Related(&profile).
-  Association("Languages").
-  Where("name in (?)", []string{"test"}).
-  Joins("left join emails on emails.user_id = users.id")
-  Find(&users)
-
-and more ...
-        </pre>
-        </div>
-
-        <div class="w-100 md:w-1/2 border border-l md:border-l-0 border-green-500 text-blue-900 text-sm md:text-lg p-6">
-          <div class="text-xl font-bold pb-4">With Super Graph, just ask.</div>
-          <pre>
-query {
-  user(id: 5) {
-    id
-    first_name
-    last_name
-    picture_url
-    posts(first: 20, order_by: { score: desc }) {
-      slug
-      title
-      created_at
-      votes_total
-      votes { created_at }
-      author { id name }
-      tags { id name }
-    }
-    posts_cursor
-  }
-}
-          </pre>
-        </div>
-      </div>
-    </div>
-
-    <div class="mt-0 md:mt-20">
-      <div
-        class="flex flex-wrap mx-2 md:mx-20"
-        v-if="data.features && data.features.length"
-      >
-        <div
-          class="w-2/4 md:w-1/3 shadow"
-          v-for="(feature, index) in data.features"
-          :key="index"
-        >
-          <div class="p-8">
-          <h2 class="text-lg uppercase border-0">{{ feature.title }}</h2>
-          <div class="text-xl text-gray-900 leading-snug">{{ feature.details }}</div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-
-    <div class="pt-0 md:pt-20">
-      <div class="container mx-auto p-10">
-
-        <div class="flex justify-center pb-20">
-          <img src="arch-basic.svg">
-        </div>
-
-        <div class="text-2xl md:text-3xl">
-          Super Graph is a library and service that fetches data from any Postgres database using just GraphQL. No more struggling with ORMs and SQL to wrangle data out of the database. No more having to figure out the right joins or making ineffiient queries. However complex the GraphQL, Super Graph will always generate just one single efficient SQL query. The goal is to save you time and money so you can focus on you're apps core value.
-        </div>
-      </div>
-    </div>
-
-
-    <div class="pt-20">
-      <div class="container mx-auto px-10 md:px-0">
-        <h1 class="uppercase font-semibold text-2xl text-blue-800 text-center">
-          Try Super Graph
-        </h1>
-
-        <h1 class="uppercase font-semibold text-lg text-gray-800">
-          Deploy as a service using docker
-        </h1>
-        <div class="p-4 rounded bg-black text-white">
-          <pre>$ git clone https://github.com/dosco/super-graph && cd super-graph && make install</pre>
-          <pre>$ super-graph new blog; cd blog</pre>
-          <pre>$ docker-compose run blog_api ./super-graph db:setup</pre>
-          <pre>$ docker-compose up</pre>
-        </div>
-
-        <h1 class="uppercase font-semibold text-lg text-gray-800">
-          Or use it with your own code
-        </h1>
-        <div class="text-md">
-          <pre class="p-4 rounded bg-black text-white">
-package main
-
-import (
-  "database/sql"
-  "fmt"
-  "time"
-  "github.com/dosco/super-graph/config"
-  "github.com/dosco/super-graph/core"
-  _ "github.com/jackc/pgx/v4/stdlib"
-)
-
-func main() {
-  db, err := sql.Open("pgx", "postgres://postgrs:@localhost:5432/example_db")
-  if err != nil {
-    log.Fatalf(err)
-  }
-
-  conf, err := config.NewConfig("./config")
-  if err != nil {
-    log.Fatalf(err)
-  }
-
-  sg, err = core.NewSuperGraph(conf, db)
-  if err != nil {
-    log.Fatalf(err)
-  }
-
-  graphqlQuery := `
-    query {
-      posts {
-      id
-      title
-    }
-  }`
-
-  res, err := sg.GraphQL(context.Background(), graphqlQuery, nil)
-  if err != nil {
-    log.Fatalf(err)
-  }
-
-  fmt.Println(string(res.Data))
-}
-          </pre>
-        </div>
-      </div>
-    </div>
-
-    <div class="pt-0 md:pt-20">
-      <div class="container mx-auto px-10 md:px-0 py-32">
-        <h1 class="uppercase font-semibold text-xl text-blue-800 mb-4">
-          The story of {{ data.heroText }}
-        </h1>
-        <div class="text-2xl md:text-3xl">
-          After working on several products through my career I find that we spend way too much time on building API backends. Most APIs also require constant updating, this costs real time and money.<br><br>
-          
-          It's always the same thing, figure out what the UI needs then build an endpoint for it. Most API code involves struggling with an ORM to query a database and mangle the data into a shape that the UI expects to see.<br><br>
-          
-          I didn't want to write this code anymore, I wanted the computer to do it. Enter GraphQL, to me it sounded great, but it still required me to write all the same database query code.<br><br>
-          
-          Having worked with compilers before I saw this as a compiler problem. Why not build a compiler that converts GraphQL to highly efficient SQL.<br><br>
-          
-          This compiler is what sits at the heart of Super Graph with layers of useful functionality around it like authentication, remote joins, rails integration, database migrations and everything else needed for you to build production ready apps with it.
-        </div>
-      </div>
-    </div>
-
-    <div class="overflow-hidden bg-indigo-900">
-      <div class="container mx-auto py-20">
-      <img src="/super-graph-web-ui.png">
-      </div>
-    </div>
-
-    <!--
-    <div class="py-10 md:py-20">
-      <div class="container mx-auto px-10 md:px-0">
-        <h1 class="uppercase font-semibold text-xl text-blue-800 mb-4">
-          Try it with a demo Rails app
-        </h1>
-        <div class="text-2xl md:text-3xl">
-          <small class="text-sm">Download the Docker compose config for the demo</small>
-          <pre>&#8227; curl -L -o demo.yml https://bit.ly/2FZS0uw</pre>
-
-          <small class="text-sm">Setup the demo database</small>
-          <pre>&#8227; docker-compose -f demo.yml run rails_app rake db:create db:migrate db:seed</pre>
-
-          <small class="text-sm">Run the demo</small>
-          <pre>&#8227; docker-compose -f demo.yml up</pre>
-
-          <small class="text-sm">Signin to the demo app (user1@demo.com / 123456)</small>
-          <pre>&#8227; open http://localhost:3000</pre>
-
-          <small class="text-sm">Try the super graph web ui</small>
-          <pre>&#8227; open http://localhost:8080</pre>
-        </div>
-      </div>
-    </div>
-    -->
-
-    <div class="pt-0 md:pt-20">
-      <div class="block md:hidden w-100">
-        <iframe src='https://www.youtube.com/embed/MfPL2A-DAJk' frameborder='0' allowfullscreen style="width: 100%; height: 250px;">
-        </iframe>
-      </div>
-      
-      <div class="container mx-auto flex flex-col md:flex-row items-center">
-        <div class="w-100 md:w-1/2 p-8">
-          <h1 class="text-2xl font-bold">GraphQL the future of APIs</h1>
-          <p class="text-xl text-gray-600">Keeping a tight and fast development loop helps you iterate quickly. Leveraging technology like Super Graph focuses your team on building the core product and not reinventing wheels. GraphQL eliminate the dependency on the backend engineering and keeps the things moving fast</p>
-        </div>
-
-        <div class="hidden md:block md:w-1/2">
-          <style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }</style>
-          <div class="embed-container shadow">
-            <iframe src='https://www.youtube.com/embed/MfPL2A-DAJk' frameborder='0' allowfullscreen >
-            </iframe>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="container mx-auto pt-0 md:pt-20">
-      <div class="flex flex-wrap bg-green-100">
-        <div class="w-100 md:w-1/2 border border-green-500 text-gray-6 00 text-sm md:text-lg p-6">
-          <div class="text-xl font-bold pb-4">No more joins joins, json, orms, just use GraphQL. Fetch all the data want in the structure you need.</div>
-          <pre>
-query  {
-  thread {
-    slug
-    title
-    published
-    createdAt : created_at
-    totalVotes : cached_votes_total
-    totalPosts : cached_posts_total
-    vote : thread_vote(where: { user_id: { eq: $user_id } }) {
-      created_at
-    }
-    topics {
-      slug
-      name
-    }
-    author : me {
-      slug
-    }
-    posts(first: 1, order_by: { score: desc }) {
-      slug
-      body
-      published
-      createdAt : created_at
-      totalVotes : cached_votes_total
-      totalComments : cached_comments_total
-      vote {
-        created_at
-      }
-      author : user {
-        slug 
-        firstName : first_name
-        lastName : last_name
-      }
-    }
-    posts_cursor
-  }
-}
-        </pre>
-        </div>
-
-        <div class="w-100 md:w-1/2 border border-l md:border-l-0 border-green-500 text-blue-900 text-sm md:text-lg p-6">
-          <div class="text-xl font-bold pb-4">Instant results using a single highly optimized SQL. It's just that simple.</div>
-          <pre>
-{
-  "data": {
-    "thread": {
-      "slug": "eveniet-ex-24",
-      "vote": null,
-      "posts": [
-        {
-          "body": "Dolor laborum harum sed sit est ducimus temporibus velit non nobis repudiandae nobis suscipit commodi voluptatem debitis sed voluptas sequi officia.",
-          "slug": "illum-in-voluptas-1418",
-          "vote": null,
-          "author": {
-            "slug": "sigurd-kemmer",
-            "lastName": "Effertz",
-            "firstName": "Brandt"
-          },
-          "createdAt": "2020-04-07T04:22:42.115874+00:00",
-          "published": true,
-          "totalVotes": 0,
-          "totalComments": 2
-        }
-      ],
-      "title": "In aut qui deleniti quia dolore quasi porro tenetur voluptatem ut adita alias fugit explicabo.",
-      "author": null,
-      "topics": [
-        {
-          "name": "CloudRun",
-          "slug": "cloud-run"
-        },
-        {
-          "name": "Postgres",
-          "slug": "postgres"
-        }
-      ],
-      "createdAt": "2020-04-07T04:22:38.099482+00:00",
-      "published": true,
-      "totalPosts": 24,
-      "totalVotes": 0,
-      "posts_cursor": "mpeBl6L+QfJHc3cmLkLDj9pOdEZYTt5KQtLsazG3TLITB3hJhg=="
-    }
-  }
-}
-          </pre>
-        </div>
-      </div>
-    </div>
-
-    <div class="pt-0 md:pt-20">
-      <div class="container mx-auto px-10 md:px-0 py-32">
-        <h1 class="uppercase font-semibold text-xl text-blue-800 mb-4">
-          Build Secure Apps
-        </h1>
-        <div class="flex flex-col text-2xl md:text-3xl">
-          <card className="mb-1 p-8">
-            <template #image><font-awesome-icon icon="portrait" class="text-red-500" /></template>
-            <template #title>Role Based Access Control</template>
-            <template #body>Dynamically assign roles like admin, manager or anon to specific users. Generate role specific queries at runtime. For example admins can get all users while others can only fetch their own user.</template>
-          </card>
-          <card className="mb-1 p-8">
-            <template #image><font-awesome-icon icon="shield-alt" class="text-blue-500" /></template>
-            <template #title>Prepared Statements</template>
-            <template #body>An additional layer of protection from a variety of security issues like SQL injection. In production mode all queries are precompiled into prepared statements so only those can be executed. This also significantly speeds up all queries.</template>
-          </card>
-          <card className="p-8">
-            <template #image><font-awesome-icon icon="lock" class="text-green-500"/></template>
-            <template #title>Fuzz Tested Code</template>
-            <template #body>Fuzzing is done by complex software that generates massives amounts of random input to detect if code is free of security bugs. Google uses fuzzing to protects everything from their cloud infrastructure to the Chrome browser.</template>
-          </card>         
-        </div>
-      </div>
-    </div>
-
-    <div class="pt-0 md:py  -20">
-      <div class="container mx-auto">
-        <h1 class="uppercase font-semibold text-xl text-blue-800 mb-4">
-          More Features
-        </h1>
-        <div class="flex flex-col md:flex-row text-2xl md:text-3xl">
-          <card className="mr-0 md:mr-1 mb-1 flex-col w-100 md:w-1/3 items-center">
-            <!-- <template #image><img src="/arch-remote-join.svg" class="h-64"></template> -->
-            <template #title>Remote Joins</template>
-            <template #body>A powerful feature that allows you to query your database and remote REST APIs at the same time. For example fetch a user from the DB, his tweets from Twitter and his payments from Stripe with a single GraphQL query.</template>
-          </card>
-          <card className="mr-0 md:mr-1 mb-1 flex-col w-100 md:w-1/3">
-            <!-- <template #image><img src="/arch-search.svg" class="h-64"></template> -->
-            <template #title>Full Text Search</template>
-            <template #body>Postgres has excellent full-text search built-in. You don't need another expensive service. Super Graph makes it super easy to use with keyword ranking and highlighting also supported.</template>
-          </card>
-          <card className="mb-1 flex-col w-100 md:w-1/3">
-            <!-- <template #image><img src="/arch-bulk.svg" class="h-64"></template> -->
-            <template #title>Bulk Inserts</template>
-            <template #body>Efficiently insert, update and delete multiple items with a single query. Upserts are also supported</template>
-          </card>         
-        </div>
-      </div>
-    </div>
-
-    <div
-      class="mx-auto text-center py-8"
-      v-if="data.footer"
-    >
-      {{ data.footer }}
-    </div>
-  </main>
-</div>
-</template>
-
-<script>
-import NavLink from '@theme/components/NavLink.vue'
-import Navbar from '@theme/components/Navbar.vue'
-import Card from './Card.vue'
-
-
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faPortrait, faShieldAlt, faLock } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-
-library.add(faPortrait, faShieldAlt, faLock)
-
-export default {
-  components: { NavLink, Navbar, FontAwesomeIcon, Card },
-
-  computed: {
-    data () {
-      return this.$page.frontmatter
-    },
-
-    actionLink () {
-      return {
-        link: this.data.actionLink,
-        text: this.data.actionText
-      }
-    }
-  }
-}
-</script>

docs/internals.md

@@ -13,7 +13,7 @@ Super Graph code is made up of a number of packages. We have done our best to ke
 
 ## QCODE
 
-This package contains the core of the GraphQL compiler it handling the lexing and parsing of the GraphQL query transforming it into an internal representation called
+This package contains the core of the GraphQL conpiler it handling the lexing and parsing of the GraphQL query transforming it into an internal representation called
 `QCode`.
 
 This is the first step of the compiling process the `func NewCompiler(c Config)` function creates a new instance of this compiler which has it's own config. 
@@ -71,7 +71,7 @@ item{itemObjOpen, 16, 20} // {
 ...
 ```
 
-These tokens are then fed into the parser `parse.go` the parser does the work of generating an abstract syntax tree (AST) from the tokens. This AST is an internal representation (data structure) and is not exposed outside the package. Since the AST is a tree a stack `stack.go` is used to walk the tree and generate the QCode AST. The QCode data structure is also a tree (represented as an array). This is then returned to the caller of the compile function.
+These tokens are then fed into the parser `parse.go` the parser does the work of generating an abstract syntax tree (AST) from the tokens. This AST is an internal representation (data structure) and is not exposed outside the package. Sinc the AST is a tree a stack `stack.go` is used to walk the tree and generate the QCode AST. The QCode data structure is also a tree (represented as an array). This is then returned to the caller of the compile function.
 
 ```go
 type Operation struct {
@@ -238,4 +238,4 @@ ok      github.com/dosco/super-graph/psql       2.530s
 
 ## Reach out
 
-If you'd like me to explain other parts of the code please reach out over Twitter or Discord. I'll keep adding to this doc as I get time.
+If you'd like me to explain other parts of the code please reach out over Twitter or Discord. I'll keep adding to this doc as I get time.

examples/rails-app/config/database.yml

@@ -19,7 +19,7 @@ default: &default
   encoding: unicode
   host: db
   username: postgres
-  password: postgres
+  password:
   pool: 5
 
 development:

examples/rails-app/config/environments/development.rb

@@ -63,6 +63,4 @@ Rails.application.configure do
   
   config.web_console.whitelisted_ips = ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16']
 
-  config.hosts << "rails_app"
-
 end

examples/rails-app/demo.yml

@@ -3,11 +3,6 @@ services:
   db:
     image: postgres
     tmpfs: /var/lib/postgresql/data
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-    ports:
-      - "5432:5432"
       
   rails_app:
     image: dosco/super-graph-demo:latest

go.mod

@@ -2,40 +2,34 @@ module github.com/dosco/super-graph
 
 require (
 	github.com/GeertJohan/go.rice v1.0.0
-	github.com/NYTimes/gziphandler v1.1.1
+	github.com/Masterminds/semver v1.5.0
 	github.com/adjust/gorails v0.0.0-20171013043634-2786ed0c03d3
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
-	github.com/brianvoe/gofakeit/v5 v5.2.0
-	github.com/cespare/xxhash/v2 v2.1.1
+	github.com/brianvoe/gofakeit v3.18.0+incompatible
+	github.com/cespare/xxhash/v2 v2.1.0
 	github.com/daaku/go.zipexe v1.0.1 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/dlclark/regexp2 v1.2.0 // indirect
-	github.com/dop251/goja v0.0.0-20200414142002-77e84ffb8c65
-	github.com/fsnotify/fsnotify v1.4.9
+	github.com/dop251/goja v0.0.0-20190912223329-aa89e6a4c733
+	github.com/fsnotify/fsnotify v1.4.7
 	github.com/garyburd/redigo v1.6.0
-	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
-	github.com/gobuffalo/flect v0.2.1
-	github.com/gosimple/slug v1.9.0
-	github.com/jackc/pgtype v1.3.0
-	github.com/jackc/pgx/v4 v4.6.0
-	github.com/mitchellh/mapstructure v1.2.2 // indirect
-	github.com/pelletier/go-toml v1.7.0 // indirect
-	github.com/pkg/errors v0.9.1
-	github.com/rs/cors v1.7.0
+	github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect
+	github.com/gobuffalo/flect v0.1.6
+	github.com/jackc/pgconn v1.0.1
+	github.com/jackc/pgtype v1.0.1
+	github.com/jackc/pgx/v4 v4.0.1
+	github.com/magiconair/properties v1.8.1 // indirect
+	github.com/pelletier/go-toml v1.4.0 // indirect
+	github.com/pkg/errors v0.8.1
+	github.com/rs/zerolog v1.15.0
 	github.com/spf13/afero v1.2.2 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
-	github.com/spf13/cobra v1.0.0
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.6.3
-	github.com/stretchr/testify v1.5.1
-	github.com/valyala/fasttemplate v1.1.0
-	go.uber.org/zap v1.14.1
-	golang.org/x/crypto v0.0.0-20200414173820-0848c9571904
-	golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
-	golang.org/x/tools v0.0.0-20191114200427-caa0b0f7d508 // indirect
-	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
-	gopkg.in/ini.v1 v1.55.0 // indirect
+	github.com/spf13/viper v1.4.0
+	github.com/valyala/fasttemplate v1.0.1
+	golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad
+	golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9 // indirect
+	gopkg.in/yaml.v2 v2.2.7 // indirect
 )
 
 go 1.13

go.sum

@@ -5,8 +5,8 @@ github.com/GeertJohan/go.incremental v1.0.0 h1:7AH+pY1XUgQE4Y1HcXYaMqAI0m9yrFqo/
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
 github.com/GeertJohan/go.rice v1.0.0 h1:KkI6O9uMaQU3VEKaj01ulavtF7o1fWT7+pk/4voiMLQ=
 github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
-github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
-github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/adjust/gorails v0.0.0-20171013043634-2786ed0c03d3 h1:+qz9Ga6l6lKw6fgvk5RMV5HQznSLvI8Zxajwdj4FhFg=
 github.com/adjust/gorails v0.0.0-20171013043634-2786ed0c03d3/go.mod h1:FlkD11RtgMTYjVuBnb7cxoHmQGqvPpCsr2atC88nl/M=
@@ -19,23 +19,24 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
-github.com/brianvoe/gofakeit/v5 v5.2.0 h1:De9X+2PQum9U2zCaIDxLV7wx0YBL6c7RN2sFBImzHGI=
-github.com/brianvoe/gofakeit/v5 v5.2.0/go.mod h1:/ZENnKqX+XrN8SORLe/fu5lZDIo1tuPncWuRD+eyhSI=
+github.com/brianvoe/gofakeit v3.18.0+incompatible h1:wDOmHc9DLG4nRjUVVaxA+CEglKOW72Y5+4WNxUIkjM8=
+github.com/brianvoe/gofakeit v3.18.0+incompatible/go.mod h1:kfwdRA90vvNhPutZWfH7WPaDzUjz+CZFqG+rPkOjGOc=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA=
+github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/daaku/go.zipexe v1.0.0 h1:VSOgZtH418pH9L16hC/JrgSNJbbAL26pj7lmD1+CGdY=
 github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
@@ -49,23 +50,21 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
 github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dop251/goja v0.0.0-20200414142002-77e84ffb8c65 h1:Nud597JuGCF/MScrb6NNVDRgmuk8X7w3pFc5GvSsm5E=
-github.com/dop251/goja v0.0.0-20200414142002-77e84ffb8c65/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
+github.com/dop251/goja v0.0.0-20190912223329-aa89e6a4c733 h1:cyNc40Dx5YNEO94idePU8rhVd3dn+sd04Arh0kDBAaw=
+github.com/dop251/goja v0.0.0-20190912223329-aa89e6a4c733/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
 github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
-github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
+github.com/go-sourcemap/sourcemap v2.1.2+incompatible h1:0b/xya7BKGhXuqFESKM4oIiRo9WOt2ebz7KxfreD6ug=
+github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gobuffalo/flect v0.2.1 h1:GPoRjEN0QObosV4XwuoWvSd5uSiL0N3e91/xqyY4crQ=
-github.com/gobuffalo/flect v0.2.1/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc=
+github.com/gobuffalo/flect v0.1.6 h1:D7KWNRFiCknJKA495/e1BO7oxqf8tbieaLv/ehoZ/+g=
+github.com/gobuffalo/flect v0.1.6/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80=
 github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -77,14 +76,8 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gosimple/slug v1.9.0 h1:r5vDcYrFz9BmfIAMC829un9hq7hKM4cHUrsv36LbEqs=
-github.com/gosimple/slug v1.9.0/go.mod h1:AMZ+sOVe65uByN3kgEyf9WEBKBCSS+dJjMX9x4vDJbg=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
@@ -96,13 +89,11 @@ github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZb
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0 h1:DUwgMQuuPnS0rhMXenUtZpqZqrR/30NWY+qQvTpSvEs=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
-github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
-github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
 github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
 github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
-github.com/jackc/pgconn v1.5.0 h1:oFSOilzIZkyg787M1fEmyMfOUUvwj0daqYMfaWwNL4o=
-github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.0.1 h1:ZANo4pIkeHKIVD1cQMcxu8fwrwIICLblzi9HCjooZeQ=
+github.com/jackc/pgconn v1.0.1/go.mod h1:GgY/Lbj1VonNaVdNUHs9AwWom3yP2eymFQ1C8z9r/Lk=
 github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
 github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
 github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA=
@@ -115,31 +106,25 @@ github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
-github.com/jackc/pgproto3/v2 v2.0.1 h1:Rdjp4NFjwHnEslx2b66FfCI2S0LhO4itac3hXz6WX9M=
-github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8 h1:Q3tB+ExeflWUW7AFcAhXqk40s9mnNYLk1nOkKNZ5GnU=
-github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgproto3/v2 v2.0.0 h1:FApgMJ/GtaXfI0s8Lvd0kaLaRwMOhs4VH92pwkwQQvU=
+github.com/jackc/pgproto3/v2 v2.0.0/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
 github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
 github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
-github.com/jackc/pgtype v1.3.0 h1:l8JvKrby3RI7Kg3bYEeU9TA4vqC38QDpFCfcrC7KuN0=
-github.com/jackc/pgtype v1.3.0/go.mod h1:b0JqxHvPmljG+HQ5IsvQ0yqeSi4nGcDTVjFoiLDb0Ik=
-github.com/jackc/pgx v3.6.2+incompatible h1:2zP5OD7kiyR3xzRYMhOcXVvkDZsImVXfj+yIyTQf3/o=
-github.com/jackc/pgx v3.6.2+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
+github.com/jackc/pgtype v1.0.1 h1:7GWB9n3DdnO3TIbj59wMAE9QcHPL4cy/Bbtk5P1Noow=
+github.com/jackc/pgtype v1.0.1/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
-github.com/jackc/pgx/v4 v4.6.0 h1:Fh0O9GdlG4gYpjpwOqjdEodJUQM9jzN3Hdv7PN0xmm0=
-github.com/jackc/pgx/v4 v4.6.0/go.mod h1:vPh43ZzxijXUVJ+t/EmXBtFmbFVO72cuneCT9oAlxAg=
+github.com/jackc/pgx/v4 v4.0.1 h1:NNrG0MX2AVEJw1NNDYg+ixSXycCfWWKeqMuQHQkAngc=
+github.com/jackc/pgx/v4 v4.0.1/go.mod h1:NeQ64VJooukJGFLX2r01sJL/gRbKlpvsO2giBvjfgrY=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.0.0 h1:rbjAshlgKscNa7j0jAM0uNQflis5o2XUogPMVAwtcsM=
+github.com/jackc/puddle v1.0.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
@@ -172,24 +157,17 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.2.2 h1:dxe5oCinTXiTIcfgmZecdCzPmAJKd46KsCWc35r0TV4=
-github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229 h1:E2B8qYyeSgv5MXpmzZXRNp8IAQ4vjxIjhpAf5hv/tAg=
 github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI=
-github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
+github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg=
+github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -201,28 +179,19 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ=
-github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
-github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0 h1:uPRuwkWF4J6fGsJ2R0Gn2jB1EQiav9k3S6CSdygQJXY=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
@@ -231,22 +200,18 @@ github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
-github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=
-github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
-github.com/spf13/viper v1.6.3 h1:pDDu1OyEDTKzpJwdq4TiuLyMsUgRa/BT5cn5O62NoHs=
-github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
@@ -255,49 +220,35 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
-github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4=
-github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
-go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
-go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo=
-go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 h1:bXoxMPcSLOq08zI3/c5dEBT6lE4eh+jOh886GHrn6V8=
-golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad h1:5E5raQxcv+6CZ11RrBYQe5WRbUIWpScjh0kvHZkZIrQ=
+golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -318,6 +269,8 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a h1:1n5lsVfiQW3yfsRGu98756EH1YthsFqr/5mxHduZW2A=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -327,9 +280,8 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
-golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9 h1:ZBzSG/7F4eNKz2L3GE9o300RX0Az1Bw5HF7PDraD+qU=
+golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
@@ -339,21 +291,12 @@ golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs=
-golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191114200427-caa0b0f7d508 h1:0FYNp0PF9kFm/ZUrvcJiQ12IUJJG7iAc6Cu01wbKrbU=
-golang.org/x/tools v0.0.0-20191114200427-caa0b0f7d508/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -363,21 +306,12 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
-gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
-gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.55.0 h1:E8yzL5unfpW3M6fz/eB7Cb5MQAYSZ7GKo4Qth+N2sgQ=
-gopkg.in/ini.v1 v1.55.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099 h1:XJP7lxbSxWLOMNdBE4B/STaqVy6L73o0knwj2vIlxnw=
+gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

internal/scripts/start.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-if [ $1 = "secrets" ]
-then
-  ./sops --config ./config "${@:2}"
-  exit 0
-fi
-
-if test -f "./config/$SECRETS_FILE"
-then
-  ./sops --config ./config exec-env "./config/$SECRETS_FILE" "$*"
-else
-  $@
-fi

internal/serv/actions.go

@@ -1,40 +0,0 @@
-package serv
-
-import (
-	"fmt"
-	"net/http"
-)
-
-type actionFn func(w http.ResponseWriter, r *http.Request) error
-
-func newAction(a *Action) (http.Handler, error) {
-	var fn actionFn
-	var err error
-
-	if len(a.SQL) != 0 {
-		fn, err = newSQLAction(a)
-	} else {
-		return nil, fmt.Errorf("invalid config for action '%s'", a.Name)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	httpFn := func(w http.ResponseWriter, r *http.Request) {
-		if err := fn(w, r); err != nil {
-			renderErr(w, err, nil)
-		}
-	}
-
-	return http.HandlerFunc(httpFn), nil
-}
-
-func newSQLAction(a *Action) (actionFn, error) {
-	fn := func(w http.ResponseWriter, r *http.Request) error {
-		_, err := db.ExecContext(r.Context(), a.SQL)
-		return err
-	}
-
-	return fn, nil
-}

internal/serv/api.go

@@ -1,111 +0,0 @@
-package serv
-
-import (
-	"time"
-
-	"github.com/dosco/super-graph/core"
-	"github.com/dosco/super-graph/internal/serv/internal/auth"
-
-	"github.com/spf13/viper"
-)
-
-const (
-	LogLevelNone int = iota
-	LogLevelInfo
-	LogLevelWarn
-	LogLevelError
-	LogLevelDebug
-)
-
-type Core = core.Config
-
-// Config struct holds the Super Graph config values
-type Config struct {
-	Core `mapstructure:",squash"`
-	Serv `mapstructure:",squash"`
-
-	cpath string
-	vi    *viper.Viper
-}
-
-// Serv struct contains config values used by the Super Graph service
-type Serv struct {
-	AppName        string `mapstructure:"app_name"`
-	Production     bool
-	LogLevel       string `mapstructure:"log_level"`
-	HostPort       string `mapstructure:"host_port"`
-	Host           string
-	Port           string
-	HTTPGZip       bool     `mapstructure:"http_compress"`
-	WebUI          bool     `mapstructure:"web_ui"`
-	EnableTracing  bool     `mapstructure:"enable_tracing"`
-	WatchAndReload bool     `mapstructure:"reload_on_config_change"`
-	AuthFailBlock  bool     `mapstructure:"auth_fail_block"`
-	SeedFile       string   `mapstructure:"seed_file"`
-	MigrationsPath string   `mapstructure:"migrations_path"`
-	AllowedOrigins []string `mapstructure:"cors_allowed_origins"`
-	DebugCORS      bool     `mapstructure:"cors_debug"`
-
-	Auth  auth.Auth
-	Auths []auth.Auth
-
-	DB struct {
-		Type        string
-		Host        string
-		Port        uint16
-		DBName      string
-		User        string
-		Password    string
-		Schema      string
-		PoolSize    int32         `mapstructure:"pool_size"`
-		MaxRetries  int           `mapstructure:"max_retries"`
-		PingTimeout time.Duration `mapstructure:"ping_timeout"`
-		EnableTLS   bool          `mapstructure:"enable_tls"`
-		ServerName  string        `mapstructure:"server_name"`
-		ServerCert  string        `mapstructure:"server_cert"`
-		ClientCert  string        `mapstructure:"client_cert"`
-		ClientKey   string        `mapstructure:"client_key"`
-	} `mapstructure:"database"`
-
-	Actions []Action
-}
-
-// Auth struct contains authentication related config values used by the Super Graph service
-type Auth struct {
-	Name          string
-	Type          string
-	Cookie        string
-	CredsInHeader bool `mapstructure:"creds_in_header"`
-
-	Rails struct {
-		Version       string
-		SecretKeyBase string `mapstructure:"secret_key_base"`
-		URL           string
-		Password      string
-		MaxIdle       int `mapstructure:"max_idle"`
-		MaxActive     int `mapstructure:"max_active"`
-		Salt          string
-		SignSalt      string `mapstructure:"sign_salt"`
-		AuthSalt      string `mapstructure:"auth_salt"`
-	}
-
-	JWT struct {
-		Provider   string
-		Secret     string
-		PubKeyFile string `mapstructure:"public_key_file"`
-		PubKeyType string `mapstructure:"public_key_type"`
-	}
-
-	Header struct {
-		Name   string
-		Value  string
-		Exists bool
-	}
-}
-
-// Action struct contains config values for a Super Graph service action
-type Action struct {
-	Name     string
-	SQL      string
-	AuthName string `mapstructure:"auth_name"`
-}

internal/serv/cmd.go

@@ -1,190 +0,0 @@
-package serv
-
-import (
-	"database/sql"
-	"fmt"
-	_log "log"
-	"os"
-	"runtime"
-
-	"github.com/spf13/cobra"
-	"go.uber.org/zap"
-)
-
-//go:generate rice embed-go
-
-const (
-	serverName = "Super Graph"
-)
-
-var (
-	// These variables are set using -ldflags
-	version        string
-	gitBranch      string
-	lastCommitSHA  string
-	lastCommitTime string
-)
-
-var (
-	log       *_log.Logger // logger
-	zlog      *zap.Logger  // fast logger
-	logLevel  int          // log level
-	conf      *Config      // parsed config
-	confPath  string       // path to the config file
-	db        *sql.DB      // database connection pool
-	secretKey [32]byte     // encryption key
-)
-
-func Cmd() {
-	log = _log.New(os.Stdout, "", 0)
-	zlog = zap.NewExample()
-
-	rootCmd := &cobra.Command{
-		Use:   "super-graph",
-		Short: BuildDetails(),
-	}
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "serv",
-		Short: "Run the super-graph service",
-		Run:   cmdServ,
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "db:create",
-		Short: "Create database",
-		Run:   cmdDBCreate,
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "db:drop",
-		Short: "Drop database",
-		Run:   cmdDBDrop,
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "db:seed",
-		Short: "Run the seed script to seed the database",
-		Run:   cmdDBSeed,
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "db:migrate",
-		Short: "Migrate the database",
-		Long: `Migrate the database to destination migration version.
-
-Destination migration version can be one of the following value types:
-
-Migrate to the most recent migration. 
-e.g. db:migrate up
-
-Rollback the most recent migration. 
-e.g. db:migrate down
-
-Migrate to a specific migration.
-e.g. db:migrate 42
-
-Migrate forward N steps.
-e.g. db:migrate +3
-
-Migrate backward N steps.
-e.g. db:migrate -2
-
-Redo previous N steps (migrate backward N steps then forward N steps).
-e.g. db:migrate -+1
-	`,
-		Run: cmdDBMigrate,
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "db:status",
-		Short: "Print current migration status",
-		Run:   cmdDBStatus,
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "db:new NAME",
-		Short: "Generate a new migration",
-		Long:  "Generate a new migration with the next sequence number and provided name",
-		Run:   cmdDBNew,
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "db:setup",
-		Short: "Setup database",
-		Long:  "This command will create, migrate and seed the database",
-		Run:   cmdDBSetup,
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "db:reset",
-		Short: "Reset database",
-		Long:  "This command will drop, create, migrate and seed the database (won't run in production)",
-		Run:   cmdDBReset,
-	})
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "new APP-NAME",
-		Short: "Create a new application",
-		Long:  "Generate all the required files to start on a new Super Graph app",
-		Run:   cmdNew,
-	})
-
-	// rootCmd.AddCommand(&cobra.Command{
-	// 	Use:   fmt.Sprintf("conf:dump [%s]", strings.Join(viper.SupportedExts, "|")),
-	// 	Short: "Dump config to file",
-	// 	Long:  "Dump current config to a file in the selected format",
-	// 	Run:   cmdConfDump,
-	// })
-
-	rootCmd.AddCommand(&cobra.Command{
-		Use:   "version",
-		Short: "Super Graph binary version information",
-		Run:   cmdVersion,
-	})
-
-	rootCmd.PersistentFlags().StringVar(&confPath,
-		"path", "./config", "path to config files")
-
-	if err := rootCmd.Execute(); err != nil {
-		log.Fatalf("ERR %s", err)
-	}
-}
-
-func cmdVersion(cmd *cobra.Command, args []string) {
-	fmt.Printf("%s\n", BuildDetails())
-}
-
-func BuildDetails() string {
-	if len(version) == 0 {
-		return fmt.Sprintf(`
-Super Graph (unknown version)
-For documentation, visit https://supergraph.dev
-
-To build with version information please use the Makefile
-> git clone https://github.com/dosco/super-graph
-> cd super-graph && make install
-
-Licensed under the Apache Public License 2.0
-Copyright 2020, Vikram Rangnekar
-`)
-	}
-
-	return fmt.Sprintf(`
-Super Graph %v 
-For documentation, visit https://supergraph.dev
-
-Commit SHA-1          : %v
-Commit timestamp      : %v
-Branch                : %v
-Go version            : %v
-
-Licensed under the Apache Public License 2.0
-Copyright 2020, Vikram Rangnekar
-`,
-		version,
-		lastCommitSHA,
-		lastCommitTime,
-		gitBranch,
-		runtime.Version())
-}

internal/serv/cmd_conf.go

@@ -1,21 +0,0 @@
-package serv
-
-// func cmdConfDump(cmd *cobra.Command, args []string) {
-// 	if len(args) != 1 {
-// 		cmd.Help() //nolint: errcheck
-// 		os.Exit(1)
-// 	}
-
-// 	fname := fmt.Sprintf("%s.%s", config.GetConfigName(), args[0])
-
-// 	conf, err := initConf()
-// 	if err != nil {
-// 		log.Fatalf("ERR failed to read config: %s", err)
-// 	}
-
-// 	if err := conf.WriteConfigAs(fname); err != nil {
-// 		log.Fatalf("ERR failed to write config: %s", err)
-// 	}
-
-// 	log.Printf("INF config dumped to ./%s", fname)
-// }

internal/serv/cmd_serv.go

@@ -1,33 +0,0 @@
-package serv
-
-import (
-	"github.com/dosco/super-graph/core"
-	"github.com/spf13/cobra"
-)
-
-var (
-	sg *core.SuperGraph
-)
-
-func cmdServ(cmd *cobra.Command, args []string) {
-	var err error
-
-	conf, err = initConf()
-	if err != nil {
-		fatalInProd(err, "failed to read config")
-	}
-
-	initWatcher()
-
-	db, err = initDB(conf, true)
-	if err != nil {
-		fatalInProd(err, "failed to connect to database")
-	}
-
-	sg, err = core.NewSuperGraph(&conf.Core, db)
-	if err != nil {
-		fatalInProd(err, "failed to initialize Super Graph")
-	}
-
-	startHTTP()
-}

internal/serv/config.go

@@ -1,120 +0,0 @@
-package serv
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"github.com/spf13/viper"
-)
-
-// ReadInConfig function reads in the config file for the environment specified in the GO_ENV
-// environment variable. This is the best way to create a new Super Graph config.
-func ReadInConfig(configFile string) (*Config, error) {
-	cpath := path.Dir(configFile)
-	cfile := path.Base(configFile)
-	vi := newViper(cpath, cfile)
-
-	if err := vi.ReadInConfig(); err != nil {
-		return nil, err
-	}
-
-	inherits := vi.GetString("inherits")
-
-	if len(inherits) != 0 {
-		vi = newViper(cpath, inherits)
-
-		if err := vi.ReadInConfig(); err != nil {
-			return nil, err
-		}
-
-		if vi.IsSet("inherits") {
-			return nil, fmt.Errorf("inherited config (%s) cannot itself inherit (%s)",
-				inherits,
-				vi.GetString("inherits"))
-		}
-
-		vi.SetConfigName(cfile)
-
-		if err := vi.MergeInConfig(); err != nil {
-			return nil, err
-		}
-	}
-
-	c := &Config{cpath: cpath, vi: vi}
-
-	if err := vi.Unmarshal(&c); err != nil {
-		return nil, fmt.Errorf("failed to decode config, %v", err)
-	}
-
-	return c, nil
-}
-
-func newViper(configPath, configFile string) *viper.Viper {
-	vi := viper.New()
-
-	vi.SetEnvPrefix("SG")
-	vi.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
-	vi.AutomaticEnv()
-
-	vi.AddConfigPath(configPath)
-	vi.SetConfigName(configFile)
-	vi.AddConfigPath("./config")
-
-	vi.SetDefault("host_port", "0.0.0.0:8080")
-	vi.SetDefault("web_ui", false)
-	vi.SetDefault("enable_tracing", false)
-	vi.SetDefault("auth_fail_block", "always")
-	vi.SetDefault("seed_file", "seed.js")
-
-	vi.SetDefault("database.type", "postgres")
-	vi.SetDefault("database.host", "localhost")
-	vi.SetDefault("database.port", 5432)
-	vi.SetDefault("database.user", "postgres")
-	vi.SetDefault("database.schema", "public")
-
-	vi.SetDefault("env", "development")
-
-	vi.BindEnv("env", "GO_ENV") //nolint: errcheck
-	vi.BindEnv("host", "HOST")  //nolint: errcheck
-	vi.BindEnv("port", "PORT")  //nolint: errcheck
-
-	vi.SetDefault("auth.rails.max_idle", 80)
-	vi.SetDefault("auth.rails.max_active", 12000)
-
-	return vi
-}
-
-func GetConfigName() string {
-	if len(os.Getenv("GO_ENV")) == 0 {
-		return "dev"
-	}
-
-	ge := strings.ToLower(os.Getenv("GO_ENV"))
-
-	switch {
-	case strings.HasPrefix(ge, "pro"):
-		return "prod"
-
-	case strings.HasPrefix(ge, "sta"):
-		return "stage"
-
-	case strings.HasPrefix(ge, "tes"):
-		return "test"
-
-	case strings.HasPrefix(ge, "dev"):
-		return "dev"
-	}
-
-	return ge
-}
-
-func (c *Config) relPath(p string) string {
-	if filepath.IsAbs(p) {
-		return p
-	}
-
-	return path.Join(c.cpath, p)
-}