fix: issue with fragments related crash

* Update README.md

* Code review: fix go get again

.chglog/config.yml

@@ -5,18 +5,18 @@ info:
   repository_url: https://github.com/dosco/super-graph
 options:
   commits:
-    # filters:
-    #   Type:
-    #     - feat
-    #     - fix
-    #     - perf
-    #     - refactor
+    filters:
+      Type:
+        - feat
+        - fix
+        - perf
+        - refactor
   commit_groups:
-    # title_maps:
-    #   feat: Features
-    #   fix: Bug Fixes
-    #   perf: Performance Improvements
-    #   refactor: Code Refactoring
+    title_maps:
+      feat: Features
+      fix: Bug Fixes
+      perf: Performance Improvements
+      refactor: Code Refactoring
   header:
     pattern: "^((\\w+)\\s.*)$"
     pattern_maps:

.deepsource.toml

@@ -0,0 +1,8 @@
+version = 1
+
+[[analyzers]]
+name = "go"
+enabled = true
+
+  [analyzers.meta]
+  import_path = "github.com/dosco/super-graph"

.gitignore

@@ -23,17 +23,20 @@
 /tmp/runner-build
 /demo/tmp
 
+.idea
+*.iml
 .vscode
-main
 .DS_Store
 .swp
 .release
 main
 super-graph
-supergraph
 *-fuzz.zip
 crashers
 suppressions
 release
 .gofuzz
 *-fuzz.zip
+*.test
+.firebase
+

CHANGELOG.md

@@ -1,401 +1,371 @@
 <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
+<a name="v0.13.22"></a>
+## [v0.13.22] - 2020-05-01
 
-### Fix
-- Fix bug with remote join example
-- Fix grammer / syntax
+<a name="v0.13.21"></a>
+## [v0.13.21] - 2020-04-24
 
-### Update
-- Update issue templates
-- Update CONTRIBUTING.md
-- Update issue templates
-- Update feature_request.md
+<a name="v0.13.20"></a>
+## [v0.13.20] - 2020-04-24
+
+<a name="v0.13.19"></a>
+## [v0.13.19] - 2020-04-23
+
+<a name="v0.13.18"></a>
+## [v0.13.18] - 2020-04-23
+
+<a name="v0.13.17"></a>
+## [v0.13.17] - 2020-04-22
+
+<a name="v0.13.16"></a>
+## [v0.13.16] - 2020-04-21
+### Features
+- feat : improve the generated introspection schema and avoid the chirino/graphql api leaking through the core api. ([#53](https://github.com/dosco/super-graph/issues/53))
+
+
+<a name="v0.13.15"></a>
+## [v0.13.15] - 2020-04-20
+
+<a name="v0.13.14"></a>
+## [v0.13.14] - 2020-04-19
+
+<a name="v0.13.13"></a>
+## [v0.13.13] - 2020-04-19
+
+<a name="v0.13.12"></a>
+## [v0.13.12] - 2020-04-19
+
+<a name="v0.13.11"></a>
+## [v0.13.11] - 2020-04-18
+
+<a name="v0.13.10"></a>
+## [v0.13.10] - 2020-04-17
+
+<a name="v0.13.9"></a>
+## [v0.13.9] - 2020-04-16
+
+<a name="v0.13.8"></a>
+## [v0.13.8] - 2020-04-16
+
+<a name="v0.13.7"></a>
+## [v0.13.7] - 2020-04-16
+
+<a name="v0.13.6"></a>
+## [v0.13.6] - 2020-04-13
+
+<a name="v0.13.5"></a>
+## [v0.13.5] - 2020-04-13
+
+<a name="v0.13.4"></a>
+## [v0.13.4] - 2020-04-12
+
+<a name="v0.13.3"></a>
+## [v0.13.3] - 2020-04-12
+
+<a name="v0.13.2"></a>
+## [v0.13.2] - 2020-04-11
+
+<a name="v0.13.1"></a>
+## [v0.13.1] - 2020-04-11
+
+<a name="v0.13.0"></a>
+## [v0.13.0] - 2020-04-10
+
+<a name="v0.12.49"></a>
+## [v0.12.49] - 2020-04-01
+
+<a name="v0.12.48"></a>
+## [v0.12.48] - 2020-03-31
+
+<a name="v0.12.47"></a>
+## [v0.12.47] - 2020-03-30
+
+<a name="v0.12.46"></a>
+## [v0.12.46] - 2020-03-21
+
+<a name="v0.12.45"></a>
+## [v0.12.45] - 2020-03-18
+
+<a name="v0.12.44"></a>
+## [v0.12.44] - 2020-03-16
+
+<a name="v0.12.43"></a>
+## [v0.12.43] - 2020-03-16
+
+<a name="v0.12.42"></a>
+## [v0.12.42] - 2020-03-14
+
+<a name="v0.12.41"></a>
+## [v0.12.41] - 2020-03-06
+
+<a name="v0.12.40"></a>
+## [v0.12.40] - 2020-03-06
+
+<a name="v0.12.39"></a>
+## [v0.12.39] - 2020-03-06
+
+<a name="v0.12.38"></a>
+## [v0.12.38] - 2020-03-05
+
+<a name="v0.12.37"></a>
+## [v0.12.37] - 2020-03-04
+
+<a name="v0.12.36"></a>
+## [v0.12.36] - 2020-03-04
+
+<a name="v0.12.35"></a>
+## [v0.12.35] - 2020-03-03
+
+<a name="v0.12.34"></a>
+## [v0.12.34] - 2020-03-03
+
+<a name="v0.12.33"></a>
+## [v0.12.33] - 2020-02-29
+
+<a name="v0.12.32"></a>
+## [v0.12.32] - 2020-02-24
+### Bug Fixes
+- fix "Try the demo app" in docs ([#38](https://github.com/dosco/super-graph/issues/38))
+
+
+<a name="v0.12.31"></a>
+## [v0.12.31] - 2020-02-23
+
+<a name="v0.12.30"></a>
+## [v0.12.30] - 2020-02-23
+
+<a name="v0.12.29"></a>
+## [v0.12.29] - 2020-02-21
+
+<a name="v0.12.28"></a>
+## [v0.12.28] - 2020-02-20
+
+<a name="v0.12.27"></a>
+## [v0.12.27] - 2020-02-19
+
+<a name="v0.12.26"></a>
+## [v0.12.26] - 2020-02-11
+
+<a name="v0.12.25"></a>
+## [v0.12.25] - 2020-02-10
+
+<a name="v0.12.24"></a>
+## [v0.12.24] - 2020-02-03
+
+<a name="v0.12.23"></a>
+## [v0.12.23] - 2020-02-02
+
+<a name="v0.12.22"></a>
+## [v0.12.22] - 2020-02-01
+
+<a name="v0.12.21"></a>
+## [v0.12.21] - 2020-01-31
+
+<a name="v0.12.20"></a>
+## [v0.12.20] - 2020-01-28
+
+<a name="v0.12.19"></a>
+## [v0.12.19] - 2020-01-26
+
+<a name="v0.12.18"></a>
+## [v0.12.18] - 2020-01-20
+
+<a name="v0.12.17"></a>
+## [v0.12.17] - 2020-01-20
+
+<a name="v0.12.16"></a>
+## [v0.12.16] - 2020-01-19
+
+<a name="v0.12.15"></a>
+## [v0.12.15] - 2020-01-17
+
+<a name="v0.12.14"></a>
+## [v0.12.14] - 2020-01-17
+
+<a name="v0.12.13"></a>
+## [v0.12.13] - 2020-01-16
+
+<a name="v0.12.12"></a>
+## [v0.12.12] - 2020-01-15
+
+<a name="v0.12.11"></a>
+## [v0.12.11] - 2020-01-14
+
+<a name="v0.12.10"></a>
+## [v0.12.10] - 2020-01-14
+
+<a name="v0.12.9"></a>
+## [v0.12.9] - 2020-01-14
+
+<a name="v0.12.8"></a>
+## [v0.12.8] - 2020-01-13
+
+<a name="v0.12.7"></a>
+## [v0.12.7] - 2020-01-11
+### Pull Requests
+- Merge pull request [#22](https://github.com/dosco/super-graph/issues/22) from bhaskarmurthy/fix-grammer-syntax
 
 
 <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
-### Move
-- Move license from MIT to Apache 2.0. Add Makefile
-
 
 <a name="v0.12.3"></a>
 ## [v0.12.3] - 2019-11-26
-### Added
-- Added support for query names to the allow.list
-
 
 <a name="v0.12.2"></a>
 ## [v0.12.2] - 2019-11-25
-### Fix
-- Fix bug with compiling anon queries
-
 
 <a name="v0.12.1"></a>
 ## [v0.12.1] - 2019-11-22
-### Move
-- Move sql query logging from info to debug
-
 
 <a name="v0.12.0"></a>
 ## [v0.12.0] - 2019-11-22
-### Use
-- Use logger error instead of panic in goja handlers
-
 
 <a name="v0.11.9"></a>
 ## [v0.11.9] - 2019-11-22
-### Add
-- Add a db:reset command only for dev mode
-
 
 <a name="v0.11.8"></a>
 ## [v0.11.8] - 2019-11-21
-### Optimize
-- Optimize db queries limit use of transactions
-
 
 <a name="v0.11.7"></a>
 ## [v0.11.7] - 2019-11-19
-### Added
-- Added support for multi-root queries
-
 
 <a name="v0.11.6"></a>
 ## [v0.11.6] - 2019-11-15
-### Fix
-- Fix issues with JWT auth
-- Fix bug with migration filename generation
-- Fix bug with migration file name
-
 
 <a name="v0.11.5"></a>
 ## [v0.11.5] - 2019-11-10
-### Fix
-- Fix bug with migration template name
-
 
 <a name="v0.11.4"></a>
 ## [v0.11.4] - 2019-11-10
-### Fix
-- Fix bug with creating new migrations
-
 
 <a name="v0.11.3"></a>
 ## [v0.11.3] - 2019-11-09
-### Fix
-- Fix macro syntax bug in app templates
-
 
 <a name="v0.11.2"></a>
 ## [v0.11.2] - 2019-11-07
-### Fix
-- Fix bugs and add new production mode
-
 
 <a name="v0.11.1"></a>
 ## [v0.11.1] - 2019-11-05
-### Add
-- Add nested where clause to filter based on related tables
-
-### Block
-- Block unauthorized requests when 'anon' role is not defined
-
-### Update
-- Update docs and website with new features
-
 
 <a name="v0.11"></a>
 ## [v0.11] - 2019-11-01
-### Add
-- Add config driven presets for insert, update and upsert
-- Add config driven presets for insert, update and upserta
-- Add RBAC option to disable functions eg. count
-- Add fuzz testing to 'serv' for the GQL hash parser
-- Add fuzz testing to 'jsn' and 'qcode'
-- Add ability to block queries and mutations by role
-- Add built in 'anon' and 'user' roles
-- Add role based access control
-
-### Allow
-- Allow config files to inherit from other config files
-
-### Change
-- Change config key inherit to inherits
-
-### Get
-- Get RBAC working for queries and mutations
-
-### Optimize
-- Optimize prepared statement flow for RBAC
-
-### Preserve
-- Preserve allow.list ordering on save
-
-### Update
-- Update filters section in guide
-
 ### Pull Requests
 - Merge pull request [#11](https://github.com/dosco/super-graph/issues/11) from dosco/rbac
 
 
 <a name="v0.10.1"></a>
 ## [v0.10.1] - 2019-10-06
-### Add
-- Add ability to set filters per operation / action
-- Add upsert mutation
-
 ### Pull Requests
 - Merge pull request [#10](https://github.com/dosco/super-graph/issues/10) from FourSigma/sm-examples-folder
 
 
 <a name="v0.10"></a>
 ## [v0.10] - 2019-10-04
-### Fix
-- Fix return values for bulk mutations and delete
-- Fix issues with mutation SQL
-- Fix broken demo app
-- Fix typo in 'across'
-
-### Remove
-- Remove extra link from README
-
-### Update
-- Update docs, getting started guide and mutations
-
 ### Pull Requests
 - Merge pull request [#6](https://github.com/dosco/super-graph/issues/6) from muesli/typo-fixes
 
 
 <a name="v0.9"></a>
 ## [v0.9] - 2019-10-01
-### Fix
-- Fix demo rails app broken build
-
 
 <a name="v0.8"></a>
 ## [v0.8] - 2019-09-30
-### Fix
-- Fix invalid import bug
-
-### Update
-- Update documentation site
-
 
 <a name="v0.7"></a>
 ## [v0.7] - 2019-09-29
-### Failure
-- Failure to prepare statements should be a warning
-
-### Fix
-- Fix duplicte column bug
-
 
 <a name="v0.6"></a>
 ## [v0.6] - 2019-09-29
-### Add
-- Add database setup commands
-- Add binary compression back to Dockerfile
-- Add initialization command to setup new apps
-- Add migrate command
-- Add database seeding capability
-- Add session variable for user id
-- Add delete mutation
-- Add update mutation
-- Add insert mutation with bulk insert
-- Add GoTO Aug, 19 presentation
-- Add support for prepared statements
-- Add end-to-end benchmaking
-- Add object pooling for parser expressions
-- Add request / response debugging for remote joins
-- Add a presentation about GraphQL
-- Add validation for remote JSON
-- Add tracing for API stitching
-- Add REST API stitching
-- Add SQL query cacheing
-- Add support for GraphQL variables
-- Add fuzz testing to qcode
-- Add test for Rails Redis cookie store integration
-- Add an install guide
-
-### Change
-- Change fuzz test name to qcode
-- Change logo from PNG to SVG
-
-### Enabke
-- Enabke reload on config change
-
-### Fix
-- Fix missing config name bug
-- Fix new app templates
-- Fix help message for migrate
-- Fix session variable bug
-- Fix test failures in `psql` and `serv`
-- Fix demo docker services startup order
-- Fix wrong value for false token bug. Reported by [@ThisIsMissEm](https://github.com/ThisIsMissEm)
-- Fix allow.list file discovery bug
-- Fix bug with allow list path
-- Fix wrong value for use_allow_list in dev config
-- Fix startup bug in demo script
-- Fix url bug in allow list
-- Fix bug [#676](https://github.com/dosco/super-graph/issues/676) found by fuzzer
-- Fix race-condition in remote joins
-- Fix cookie passing in web ui
-- Fix bug with passing cookies in web ui
-- Fix null pointer with invalid argument values
-- Fix infinite loop bug in lexer
-- Fix null pointer issue found by fuzz test
-- Fix issue with fuzzbuzz config
-- Fix demo to run as memory only
-- Fix auth documentation
-- Fix issue with web ui sizing
-- Fix issue preventing docker-compose deploy
-- Fix try demo documentation
-
-### Futher
-- Futher reduce allocations across hot paths
-- Futher reduce allocations on the compiler hot path
-- Futher optimize json parsing and editing performance
-
-### Highlight
-- Highlight top features better on the site
-
-### Improve
-- Improve readability of json parser code
-- Improve the motivation section in the readme
-- Improve the demo experience
-
-### Make
-- Make remote joins use parallel http requests
-
-### Merge
-- Merge branch 'master' into optimize-psql
-
-### New
-- New low allocation fast json parsing and editing library
-
-### Optimize
-- Optimize lexer and fix bugs
-- Optimize the sql generator hot path
-
-### Reduce
-- Reduce alllocations done by the stack
-- Reduce steps to run the demo
-- Reduce allocations and improve perf over 50%
-
-### Remove
-- Remove unused packages
-- Remove the 'hello' test app folder
-- Remove other allocations in psql
-
-### Use
-- Use hash's as ids for table relationships
-
-### Watch
-- Watch and reload on config changes
-
 
 <a name="v0.5"></a>
 ## [v0.5] - 2019-04-10
-### Add
-- Add supprt for new Rails 5.2 aes-256-gcm cookies
-- Add query support for ts_rank and ts_headline
-- Add full text search support using TSV indexes
-- Add missing assets folder
-- Add fetch by ID feature
-- Add documentation
-
-### Cleanup
-- Cleanup and redesign config files
-
-### Fix
-- Fix bug with auth config parsing
-
-### Redesign
-- Redesign config file architecture
-
-### Reduce
-- Reduce realloc of maps and slices
-
-### Update
-- Update docs with full-text search information
-
 
 <a name="v0.4"></a>
 ## [v0.4] - 2019-04-01
 
 <a name="v0.3"></a>
 ## [v0.3] - 2019-04-01
-### Add
-- Add SQL execution timing and tracing
-- Add support for HAVING with aggregate queries
-- Add aggregrate functions to GQL queries
-- Add Auth0 JWT support
-- Add React UI building to the docker build flow
-- Add compiler profiling
-- Add bechmarks for GQL to SQL compile
-- Add tests for gql to sql compile
-
-### Cleanup
-- Cleanup Dockerfile
-
-### Fix
-- Fix recurring packer issue docker hub builds
-- Fix issue with asset packer breaking Docker builds
-- Fix missing git package in Dockerfile
-- Fix docker ignore values
-- Fix image build failure on docker hub
-- Fix build issue in Dockerfile
-- Fix bugs and document the 'where' clause
-- Fix perf issue with inflections
-
-### Optimize
-- Optimize docker image
-
-### Pack
-- Pack web UI with app into a single binary
-
-### Upgrade
-- Upgrade web UI packages
-
 
 <a name="0.3"></a>
 ## 0.3 - 2019-03-24
-### First
-- First commit
 
-### Fix
-- Fix license to MIT
-
-
-[Unreleased]: https://github.com/dosco/super-graph/compare/v0.12.6...HEAD
+[Unreleased]: https://github.com/dosco/super-graph/compare/v0.13.22...HEAD
+[v0.13.22]: https://github.com/dosco/super-graph/compare/v0.13.21...v0.13.22
+[v0.13.21]: https://github.com/dosco/super-graph/compare/v0.13.20...v0.13.21
+[v0.13.20]: https://github.com/dosco/super-graph/compare/v0.13.19...v0.13.20
+[v0.13.19]: https://github.com/dosco/super-graph/compare/v0.13.18...v0.13.19
+[v0.13.18]: https://github.com/dosco/super-graph/compare/v0.13.17...v0.13.18
+[v0.13.17]: https://github.com/dosco/super-graph/compare/v0.13.16...v0.13.17
+[v0.13.16]: https://github.com/dosco/super-graph/compare/v0.13.15...v0.13.16
+[v0.13.15]: https://github.com/dosco/super-graph/compare/v0.13.14...v0.13.15
+[v0.13.14]: https://github.com/dosco/super-graph/compare/v0.13.13...v0.13.14
+[v0.13.13]: https://github.com/dosco/super-graph/compare/v0.13.12...v0.13.13
+[v0.13.12]: https://github.com/dosco/super-graph/compare/v0.13.11...v0.13.12
+[v0.13.11]: https://github.com/dosco/super-graph/compare/v0.13.10...v0.13.11
+[v0.13.10]: https://github.com/dosco/super-graph/compare/v0.13.9...v0.13.10
+[v0.13.9]: https://github.com/dosco/super-graph/compare/v0.13.8...v0.13.9
+[v0.13.8]: https://github.com/dosco/super-graph/compare/v0.13.7...v0.13.8
+[v0.13.7]: https://github.com/dosco/super-graph/compare/v0.13.6...v0.13.7
+[v0.13.6]: https://github.com/dosco/super-graph/compare/v0.13.5...v0.13.6
+[v0.13.5]: https://github.com/dosco/super-graph/compare/v0.13.4...v0.13.5
+[v0.13.4]: https://github.com/dosco/super-graph/compare/v0.13.3...v0.13.4
+[v0.13.3]: https://github.com/dosco/super-graph/compare/v0.13.2...v0.13.3
+[v0.13.2]: https://github.com/dosco/super-graph/compare/v0.13.1...v0.13.2
+[v0.13.1]: https://github.com/dosco/super-graph/compare/v0.13.0...v0.13.1
+[v0.13.0]: https://github.com/dosco/super-graph/compare/v0.12.49...v0.13.0
+[v0.12.49]: https://github.com/dosco/super-graph/compare/v0.12.48...v0.12.49
+[v0.12.48]: https://github.com/dosco/super-graph/compare/v0.12.47...v0.12.48
+[v0.12.47]: https://github.com/dosco/super-graph/compare/v0.12.46...v0.12.47
+[v0.12.46]: https://github.com/dosco/super-graph/compare/v0.12.45...v0.12.46
+[v0.12.45]: https://github.com/dosco/super-graph/compare/v0.12.44...v0.12.45
+[v0.12.44]: https://github.com/dosco/super-graph/compare/v0.12.43...v0.12.44
+[v0.12.43]: https://github.com/dosco/super-graph/compare/v0.12.42...v0.12.43
+[v0.12.42]: https://github.com/dosco/super-graph/compare/v0.12.41...v0.12.42
+[v0.12.41]: https://github.com/dosco/super-graph/compare/v0.12.40...v0.12.41
+[v0.12.40]: https://github.com/dosco/super-graph/compare/v0.12.39...v0.12.40
+[v0.12.39]: https://github.com/dosco/super-graph/compare/v0.12.38...v0.12.39
+[v0.12.38]: https://github.com/dosco/super-graph/compare/v0.12.37...v0.12.38
+[v0.12.37]: https://github.com/dosco/super-graph/compare/v0.12.36...v0.12.37
+[v0.12.36]: https://github.com/dosco/super-graph/compare/v0.12.35...v0.12.36
+[v0.12.35]: https://github.com/dosco/super-graph/compare/v0.12.34...v0.12.35
+[v0.12.34]: https://github.com/dosco/super-graph/compare/v0.12.33...v0.12.34
+[v0.12.33]: https://github.com/dosco/super-graph/compare/v0.12.32...v0.12.33
+[v0.12.32]: https://github.com/dosco/super-graph/compare/v0.12.31...v0.12.32
+[v0.12.31]: https://github.com/dosco/super-graph/compare/v0.12.30...v0.12.31
+[v0.12.30]: https://github.com/dosco/super-graph/compare/v0.12.29...v0.12.30
+[v0.12.29]: https://github.com/dosco/super-graph/compare/v0.12.28...v0.12.29
+[v0.12.28]: https://github.com/dosco/super-graph/compare/v0.12.27...v0.12.28
+[v0.12.27]: https://github.com/dosco/super-graph/compare/v0.12.26...v0.12.27
+[v0.12.26]: https://github.com/dosco/super-graph/compare/v0.12.25...v0.12.26
+[v0.12.25]: https://github.com/dosco/super-graph/compare/v0.12.24...v0.12.25
+[v0.12.24]: https://github.com/dosco/super-graph/compare/v0.12.23...v0.12.24
+[v0.12.23]: https://github.com/dosco/super-graph/compare/v0.12.22...v0.12.23
+[v0.12.22]: https://github.com/dosco/super-graph/compare/v0.12.21...v0.12.22
+[v0.12.21]: https://github.com/dosco/super-graph/compare/v0.12.20...v0.12.21
+[v0.12.20]: https://github.com/dosco/super-graph/compare/v0.12.19...v0.12.20
+[v0.12.19]: https://github.com/dosco/super-graph/compare/v0.12.18...v0.12.19
+[v0.12.18]: https://github.com/dosco/super-graph/compare/v0.12.17...v0.12.18
+[v0.12.17]: https://github.com/dosco/super-graph/compare/v0.12.16...v0.12.17
+[v0.12.16]: https://github.com/dosco/super-graph/compare/v0.12.15...v0.12.16
+[v0.12.15]: https://github.com/dosco/super-graph/compare/v0.12.14...v0.12.15
+[v0.12.14]: https://github.com/dosco/super-graph/compare/v0.12.13...v0.12.14
+[v0.12.13]: https://github.com/dosco/super-graph/compare/v0.12.12...v0.12.13
+[v0.12.12]: https://github.com/dosco/super-graph/compare/v0.12.11...v0.12.12
+[v0.12.11]: https://github.com/dosco/super-graph/compare/v0.12.10...v0.12.11
+[v0.12.10]: https://github.com/dosco/super-graph/compare/v0.12.9...v0.12.10
+[v0.12.9]: https://github.com/dosco/super-graph/compare/v0.12.8...v0.12.9
+[v0.12.8]: https://github.com/dosco/super-graph/compare/v0.12.7...v0.12.8
+[v0.12.7]: https://github.com/dosco/super-graph/compare/v0.12.6...v0.12.7
 [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
 [v0.12.4]: https://github.com/dosco/super-graph/compare/v0.12.3...v0.12.4

Dockerfile

@@ -1,17 +1,18 @@
 # stage: 1
 FROM node:10 as react-build
 WORKDIR /web
-COPY web/ ./
+COPY /internal/serv/web/ ./
 RUN yarn
 RUN yarn build
 
+
+
 # stage: 2
 FROM golang:1.14-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
+    apk add --no-cache jq
 
 RUN GO111MODULE=off go get -u github.com/rafaelsq/wtc
 
@@ -22,14 +23,16 @@ RUN chmod 755 /usr/local/bin/sops
 WORKDIR /app
 COPY . /app
 
-RUN mkdir -p /app/web/build
-COPY --from=react-build /web/build/ ./web/build/
+RUN mkdir -p /app/internal/serv/web/build
+COPY --from=react-build /web/build/ ./internal/serv/web/build
 
 RUN go mod vendor
 RUN make build
-RUN echo "Compressing binary, will take a bit of time..." && \
-  upx --ultra-brute -qq super-graph && \
-  upx -t super-graph
+# 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
@@ -41,7 +44,7 @@ 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/scripts/start.sh .
+COPY --from=go-build /app/internal/scripts/start.sh .
 COPY --from=go-build /usr/local/bin/sops .
 
 RUN chmod +x /super-graph

Makefile

@@ -12,30 +12,30 @@ endif
 export GO111MODULE := on
 
 # Build-time Go variables
-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
+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
 
 BUILD_FLAGS ?= -ldflags '-s -w -X ${lastCommitSHA}=${BUILD} -X "${lastCommitTime}=${BUILD_DATE}" -X "${version}=${BUILD_VERSION}" -X ${gitBranch}=${BUILD_BRANCH}'
 
 .PHONY: all build gen clean test run lint changlog release version help $(PLATFORMS)
 
 test:
-	@go test -v ./...
+	@go test -v -short -race ./...
 
 BIN_DIR := $(GOPATH)/bin
 GORICE := $(BIN_DIR)/rice
 GOLANGCILINT := $(BIN_DIR)/golangci-lint
 GITCHGLOG := $(BIN_DIR)/git-chglog
-WEB_BUILD_DIR := ./web/build/manifest.json
+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 found under ./web"
-	@echo "Command: cd web && yarn && yarn build"
+	@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):
@@ -45,7 +45,7 @@ changelog: $(GITCHGLOG)
 	@git-chglog $(ARGS)
 
 $(GOLANGCILINT):
-	@GO111MODULE=off curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOPATH)/bin v1.21.0
+	@GO111MODULE=off curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOPATH)/bin v1.25.1
 
 lint: $(GOLANGCILINT)
 	@golangci-lint run ./... --skip-dirs-use-default
@@ -57,7 +57,7 @@ os = $(word 1, $@)
 
 $(PLATFORMS): lint test 
 	@mkdir -p release
-	@GOOS=$(os) GOARCH=amd64 go build $(BUILD_FLAGS) -o release/$(BINARY)-$(BUILD_VERSION)-$(os)-amd64
+	@GOOS=$(os) GOARCH=amd64 go build $(BUILD_FLAGS) -o release/$(BINARY)-$(BUILD_VERSION)-$(os)-amd64 main.go
 
 release: windows linux darwin
 
@@ -69,7 +69,7 @@ gen: $(GORICE) $(WEB_BUILD_DIR)
 	@go generate ./...
 
 $(BINARY): clean
-	@go build $(BUILD_FLAGS) -o $(BINARY)
+	@go build $(BUILD_FLAGS) -o $(BINARY) main.go 
 
 clean:
 	@rm -f $(BINARY)
@@ -77,11 +77,10 @@ clean:
 run: clean
 	@go run $(BUILD_FLAGS) main.go $(ARGS)
 
-install: gen
-	@echo $(GOPATH)
+install: clean build
 	@echo "Commit Hash: `git rev-parse HEAD`"
 	@echo "Old Hash: `shasum $(GOPATH)/bin/$(BINARY) 2>/dev/null | cut -c -32`"
-	@go install $(BUILD_FLAGS)
+	@mv $(BINARY) $(GOPATH)/bin/$(BINARY)
 	@echo "New Hash:" `shasum $(GOPATH)/bin/$(BINARY) 2>/dev/null | cut -c -32`
 
 uninstall: clean

README.md

@@ -1,28 +1,71 @@
-<!-- <a href="https://supergraph.dev"><img src="https://supergraph.dev/hologram.svg" width="100" height="100" align="right" /></a> -->
+<img src="docs/website/static/img/super-graph-logo.svg" width="80" />
 
-<img src="docs/.vuepress/public/super-graph.png" width="250" />
+# Super Graph - Fetch data without code!
 
-### Build web products faster. Secure high performance GraphQL
-
-![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)
+[![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)
 [![Discord Chat](https://img.shields.io/discord/628796009539043348.svg)](https://discord.gg/6pSWCTZ)
 
+Super Graph gives you a high performance GraphQL API without you having to write any code. GraphQL is automagically compiled into an efficient SQL query. Use it either as a library or a standalone service.
 
-## What is Super Graph
+## Using it as a service
 
-Is designed to 100x your developer productivity. Super Graph will instantly and without you writing code provide you a high performance and secure GraphQL API for Postgres DB. GraphQL queries are 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
+go get 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, support 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 "")
+```console
+go get github.com/dosco/super-graph/core
+```
 
+```golang
+package main
 
-## The story of Super Graph?
+import (
+  "database/sql"
+  "fmt"
+  "time"
+  "github.com/dosco/super-graph/core"
+  _ "github.com/jackc/pgx/v4/stdlib"
+)
 
-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.
+func main() {
+  db, err := sql.Open("pgx", "postgres://postgrs:@localhost:5432/example_db")
+  if err != nil {
+    log.Fatal(err)
+  }
+
+  sg, err := core.NewSuperGraph(nil, db)
+  if err != nil {
+    log.Fatal(err)
+  }
+
+  query := `
+    query {
+      posts {
+      id
+      title
+    }
+  }`
+
+  ctx = context.WithValue(ctx, core.UserIDKey, 1)
+
+  res, err := sg.GraphQL(ctx, query, nil)
+  if err != nil {
+    log.Fatal(err)
+  }
+
+  fmt.Println(string(res.Data))
+}
+```
+
+## About Super Graph
+
+After working on several products through my career I found that we spend way too much time on building API backends. Most APIs also need constant updating, and this costs time and money.
 
 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.
 
@@ -30,44 +73,35 @@ I didn't want to write this code anymore, I wanted the computer to do it. Enter
 
 Having worked with compilers before I saw this as a compiler problem. Why not build a compiler that converts GraphQL to highly efficient SQL.
 
-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.
+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.
 
 ## Features
 
 - Complex nested queries and mutations
 - Auto learns database tables and relationships
-- Role and Attribute based access control
-- Full text search and aggregations
+- Role and Attribute-based access control
+- Opaque cursor-based efficient pagination
+- 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)
 - A simple config file
-- High performance GO codebase
+- 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>
-```
+- Works with Postgres and Yugabyte DB
+- OpenCensus Support: Zipkin, Prometheus, X-Ray, Stackdriver
 
 ## Documentation
 
 [supergraph.dev](https://supergraph.dev)
 
-## Contact me
+## Reach out
 
-I'm happy to help you deploy Super Graph so feel free to reach out over
-Twitter or Discord.
+We're happy to help you leverage Super Graph reach out if you have questions
 
 [twitter/dosco](https://twitter.com/dosco)
 
@@ -78,5 +112,3 @@ Twitter or Discord.
 [Apache Public License 2.0](https://opensource.org/licenses/Apache-2.0)
 
 Copyright (c) 2019-present Vikram Rangnekar
-
-

allow/allow.go

@@ -1,361 +0,0 @@
-package allow
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"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(cpath string, conf Config) (*List, error) {
-	al := List{}
-
-	if len(cpath) != 0 {
-		fp := path.Join(cpath, "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 := "./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(cpath) == 0 {
-			al.filepath = "./config/allow.list"
-		} else {
-			al.filepath = path.Join(cpath, "allow.list")
-		}
-	}
-
-	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 == '_'
-}

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)
-	}
-}

config/dev.yml

@@ -2,7 +2,7 @@ app_name: "Super Graph Development"
 host_port: 0.0.0.0:8080
 web_ui: true
 
-# debug, info, warn, error, fatal, panic
+# debug, error, warn, info, none
 log_level: "debug"
 
 # enable or disable http compression (uses gzip)
@@ -30,7 +30,7 @@ reload_on_config_change: true
 # seed_file: seed.js
 
 # Path pointing to where the migrations can be found
-migrations_path: ./config/migrations
+migrations_path: ./migrations
 
 # Secret key for general encryption operations like
 # encrypting the cursor data
@@ -45,6 +45,13 @@ cors_allowed_origins: ["*"]
 # Debug Cross Origin Resource Sharing requests
 cors_debug: true
 
+# Default API path prefix is /api you can change it if you like
+# api_path: "/data"
+
+# Cache-Control header can help cache queries if your CDN supports cache-control
+# on POST requests (does not work with not mutations)
+# cache_control: "public, max-age=300, s-maxage=600"
+
 # Postgres related environment Variables
 # SG_DATABASE_HOST
 # SG_DATABASE_PORT
@@ -61,6 +68,18 @@ cors_debug: true
 #   person: people
 #   sheep: sheep
 
+# open opencensus tracing and metrics
+# telemetry:
+#   debug: true
+#   metrics:
+#     exporter: "prometheus"
+#   tracing:
+#     exporter: "zipkin"
+#     endpoint: "http://zipkin:9411/api/v2/spans"
+#     sample: 0.2
+#     include_query: false
+#     include_params: false
+
 auth:
   # Can be 'rails' or 'jwt'
   type: rails
@@ -84,7 +103,6 @@ auth:
     # password: ""
     # max_idle: 80
     # max_active: 12000
-
     # In most cases you don't need these
     # salt: "encrypted cookie"
     # sign_salt: "signed encrypted cookie"
@@ -116,18 +134,18 @@ database:
   # 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
@@ -158,7 +176,6 @@ tables:
       - name: email
         related_to: products.name
 
-
 roles_query: "SELECT * FROM users WHERE id = $user_id"
 
 roles:
@@ -167,7 +184,7 @@ roles:
       - name: products
         query:
           limit: 10
-          columns: ["id", "name", "description" ]
+          columns: ["id", "name", "description"]
           aggregation: false
 
         insert:

config/prod.yml

@@ -6,7 +6,7 @@ app_name: "Super Graph Production"
 host_port: 0.0.0.0:8080
 web_ui: false
 
-# debug, info, warn, error, fatal, panic, disable
+# debug, error, warn, info, none
 log_level: "info"
 
 # enable or disable http compression (uses gzip)
@@ -30,7 +30,7 @@ enable_tracing: true
 # seed_file: seed.js
 
 # Path pointing to where the migrations can be found
-# migrations_path: migrations
+# migrations_path: ./migrations
 
 # Secret key for general encryption operations like
 # encrypting the cursor data
@@ -65,3 +65,12 @@ database:
 
   # database ping timeout is used for db health checking
   ping_timeout: 5m
+# open opencensus tracing and metrics
+# telemetry:
+#   debug: false
+#   metrics:
+#     exporter: "prometheus"
+#   tracing:
+#     exporter: "zipkin"
+#     endpoint: "http://zipkin:9411/api/v2/spans"
+#     sample: 0.6

core/api.go

@@ -0,0 +1,228 @@
+// 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.Fatal(err)
+		}
+
+		sg, err := core.NewSuperGraph(nil, db)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		query := `
+			query {
+				posts {
+				id
+				title
+			}
+		}`
+
+		ctx = context.WithValue(ctx, core.UserIDKey, 1)
+
+		res, err := sg.GraphQL(ctx, query, nil)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		fmt.Println(string(res.Data))
+	}
+*/
+package core
+
+import (
+	"context"
+	"crypto/sha256"
+	"database/sql"
+	"encoding/json"
+	"hash/maphash"
+	_log "log"
+	"os"
+
+	"github.com/chirino/graphql"
+	"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
+	dbinfo      *psql.DBInfo
+	schema      *psql.DBSchema
+	allowList   *allow.List
+	encKey      [32]byte
+	hashSeed    maphash.Seed
+	queries     map[uint64]*query
+	roles       map[string]*Role
+	getRole     *sql.Stmt
+	rmap        map[uint64]resolvFn
+	abacEnabled bool
+	qc          *qcode.Compiler
+	pc          *psql.Compiler
+	ge          *graphql.Engine
+}
+
+// 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) {
+	return newSuperGraph(conf, db, nil)
+}
+
+// newSuperGraph helps with writing tests and benchmarks
+func newSuperGraph(conf *Config, db *sql.DB, dbinfo *psql.DBInfo) (*SuperGraph, error) {
+	if conf == nil {
+		conf = &Config{}
+	}
+
+	sg := &SuperGraph{
+		conf:     conf,
+		db:       db,
+		dbinfo:   dbinfo,
+		log:      _log.New(os.Stdout, "", 0),
+		hashSeed: maphash.MakeSeed(),
+	}
+
+	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 err := sg.initGraphQLEgine(); err != nil {
+		return nil, err
+	}
+
+	if conf.SecretKey != "" {
+		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) {
+	var res Result
+
+	res.op = qcode.GetQType(query)
+	res.name = allow.QueryName(query)
+
+	// use the chirino/graphql library for introspection queries
+	// disabled when allow list is enforced
+	if !sg.conf.UseAllowList && res.name == "IntrospectionQuery" {
+		r := sg.ge.ServeGraphQL(&graphql.Request{Query: query})
+		res.Data = r.Data
+
+		if r.Error() != nil {
+			res.Error = r.Error().Error()
+		}
+		return &res, r.Error()
+	}
+
+	ct := scontext{Context: c, sg: sg, query: query, vars: vars, res: res}
+
+	if len(vars) <= 2 {
+		ct.vars = nil
+	}
+
+	if keyExists(c, UserIDKey) {
+		ct.role = "user"
+	} else {
+		ct.role = "anon"
+	}
+
+	data, err := ct.execQuery()
+	if err != nil {
+		return &ct.res, err
+	}
+
+	ct.res.Data = json.RawMessage(data)
+
+	return &ct.res, nil
+}
+
+// GraphQLSchema function return the GraphQL schema for the underlying database connected
+// to this instance of Super Graph
+func (sg *SuperGraph) GraphQLSchema() (string, error) {
+	return sg.ge.Schema.String(), nil
+}
+
+// Operation function return the operation type from the query. It uses a very fast algorithm to
+// extract the operation without having to parse the query.
+func Operation(query string) OpType {
+	return OpType(qcode.GetQType(query))
+}
+
+// Name function return the operation name from the query. It uses a very fast algorithm to
+// extract the operation name without having to parse the query.
+func Name(query string) string {
+	return allow.QueryName(query)
+}

core/api_test.go

@@ -0,0 +1,62 @@
+package core
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/dosco/super-graph/core/internal/psql"
+)
+
+func BenchmarkGraphQL(b *testing.B) {
+	ct := context.WithValue(context.Background(), UserIDKey, "1")
+
+	db, _, err := sqlmock.New()
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer db.Close()
+
+	// mock.ExpectQuery(`^SELECT jsonb_build_object`).WithArgs()
+	c := &Config{}
+	sg, err := newSuperGraph(c, db, psql.GetTestDBInfo())
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	query := `
+    query {
+      products {
+      id
+			name
+			user {
+				full_name
+				phone
+				email
+			}
+			customers {
+				id
+				email
+			}
+		}
+		users {
+      id
+			name
+    }
+	}`
+
+	b.ResetTimer()
+	b.ReportAllocs()
+
+	b.RunParallel(func(pb *testing.PB) {
+		for pb.Next() {
+			_, err = sg.GraphQL(ct, query, nil)
+		}
+	})
+
+	fmt.Println(err)
+
+	//fmt.Println(mock.ExpectationsWereMet())
+
+}

core/args.go

@@ -0,0 +1,96 @@
+package core
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/dosco/super-graph/core/internal/psql"
+	"github.com/dosco/super-graph/jsn"
+)
+
+// argList function is used to create a list of arguments to pass
+// to a prepared statement.
+
+func (c *scontext) argList(md psql.Metadata) ([]interface{}, error) {
+	params := md.Params()
+	vars := make([]interface{}, len(params))
+
+	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, p := range params {
+		switch p.Name {
+		case "user_id":
+			if v := c.Value(UserIDKey); v != nil {
+				vars[i] = v.(string)
+			} else {
+				return nil, argErr(p)
+			}
+
+		case "user_id_provider":
+			if v := c.Value(UserIDProviderKey); v != nil {
+				vars[i] = v.(string)
+			} else {
+				return nil, argErr(p)
+			}
+
+		case "user_role":
+			if v := c.Value(UserRoleKey); v != nil {
+				vars[i] = v.(string)
+			} else {
+				return nil, argErr(p)
+			}
+
+		case "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(p)
+			}
+
+		default:
+			if v, ok := fields[p.Name]; ok {
+				switch {
+				case p.IsArray && v[0] != '[':
+					return nil, fmt.Errorf("variable '%s' should be an array of type '%s'", p.Name, p.Type)
+
+				case p.Type == "json" && v[0] != '[' && v[0] != '{':
+					return nil, fmt.Errorf("variable '%s' should be an array or object", p.Name)
+				}
+
+				switch v[0] {
+				case '[', '{':
+					vars[i] = v
+
+				default:
+					var val interface{}
+					if err := json.Unmarshal(v, &val); err != nil {
+						return nil, err
+					}
+					vars[i] = val
+				}
+
+			} else {
+				return nil, argErr(p)
+			}
+		}
+	}
+
+	return vars, nil
+}
+
+func argErr(p psql.Param) error {
+	return fmt.Errorf("required variable '%s' of type '%s' must be set", p.Name, p.Type)
+}

core/build.go

@@ -1,4 +1,4 @@
-package serv
+package core
 
 import (
 	"bytes"
@@ -7,42 +7,42 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/dosco/super-graph/psql"
-	"github.com/dosco/super-graph/qcode"
+	"github.com/dosco/super-graph/core/internal/psql"
+	"github.com/dosco/super-graph/core/internal/qcode"
 )
 
 type stmt struct {
-	role    *configRole
-	qc      *qcode.QCode
-	skipped uint32
-	sql     string
+	role *Role
+	qc   *qcode.QCode
+	md   psql.Metadata
+	sql  string
 }
 
-func buildStmt(qt qcode.QType, gql, vars []byte, role string) ([]stmt, error) {
+func (sg *SuperGraph) buildStmt(qt qcode.QType, query, vars []byte, role string) ([]stmt, error) {
 	switch qt {
 	case qcode.QTMutation:
-		return buildRoleStmt(gql, vars, role)
+		return sg.buildRoleStmt(query, vars, role)
 
 	case qcode.QTQuery:
 		if role == "anon" {
-			return buildRoleStmt(gql, vars, "anon")
+			return sg.buildRoleStmt(query, vars, "anon")
 		}
 
-		if conf.isABACEnabled() {
-			return buildMultiStmt(gql, vars)
+		if sg.abacEnabled {
+			return sg.buildMultiStmt(query, vars)
 		}
 
-		return buildRoleStmt(gql, vars, "user")
+		return sg.buildRoleStmt(query, vars, "user")
 
 	default:
 		return nil, fmt.Errorf("unknown query type '%d'", qt)
 	}
 }
 
-func buildRoleStmt(gql, vars []byte, role string) ([]stmt, error) {
-	ro, ok := conf.roles[role]
+func (sg *SuperGraph) buildRoleStmt(query, vars []byte, role string) ([]stmt, error) {
+	ro, ok := sg.roles[role]
 	if !ok {
-		return nil, fmt.Errorf(`roles '%s' not defined in config`, role)
+		return nil, fmt.Errorf(`roles '%s' not defined in c.sg.config`, role)
 	}
 
 	var vm map[string]json.RawMessage
@@ -54,7 +54,7 @@ func buildRoleStmt(gql, vars []byte, role string) ([]stmt, error) {
 		}
 	}
 
-	qc, err := qcompile.Compile(gql, ro.Name)
+	qc, err := sg.qc.Compile(query, ro.Name)
 	if err != nil {
 		return nil, err
 	}
@@ -62,18 +62,17 @@ func buildRoleStmt(gql, vars []byte, role string) ([]stmt, error) {
 	stmts := []stmt{stmt{role: ro, qc: qc}}
 	w := &bytes.Buffer{}
 
-	skipped, err := pcompile.Compile(qc, w, psql.Variables(vm))
+	stmts[0].md, err = sg.pc.Compile(w, qc, psql.Variables(vm))
 	if err != nil {
 		return nil, err
 	}
 
-	stmts[0].skipped = skipped
 	stmts[0].sql = w.String()
 
 	return stmts, nil
 }
 
-func buildMultiStmt(gql, vars []byte) ([]stmt, error) {
+func (sg *SuperGraph) buildMultiStmt(query, vars []byte) ([]stmt, error) {
 	var vm map[string]json.RawMessage
 	var err error
 
@@ -83,40 +82,42 @@ func buildMultiStmt(gql, vars []byte) ([]stmt, error) {
 		}
 	}
 
-	if len(conf.RolesQuery) == 0 {
+	if sg.conf.RolesQuery == "" {
 		return nil, errors.New("roles_query not defined")
 	}
 
-	stmts := make([]stmt, 0, len(conf.Roles))
+	stmts := make([]stmt, 0, len(sg.conf.Roles))
 	w := &bytes.Buffer{}
+	md := psql.Metadata{}
 
-	for i := 0; i < len(conf.Roles); i++ {
-		role := &conf.Roles[i]
+	for i := 0; i < len(sg.conf.Roles); i++ {
+		role := &sg.conf.Roles[i]
 
 		// skip anon as it's not included in the combined multi-statement
 		if role.Name == "anon" {
 			continue
 		}
 
-		qc, err := qcompile.Compile(gql, role.Name)
+		qc, err := sg.qc.Compile(query, role.Name)
 		if err != nil {
 			return nil, err
 		}
 
 		stmts = append(stmts, stmt{role: role, qc: qc})
+		s := &stmts[len(stmts)-1]
 
-		skipped, err := pcompile.Compile(qc, w, psql.Variables(vm))
+		md, err = sg.pc.CompileWithMetadata(w, qc, psql.Variables(vm), md)
 		if err != nil {
 			return nil, err
 		}
 
-		s := &stmts[len(stmts)-1]
-		s.skipped = skipped
 		s.sql = w.String()
+		s.md = md
+
 		w.Reset()
 	}
 
-	sql, err := renderUserQuery(stmts, vm)
+	sql, err := sg.renderUserQuery(md, stmts)
 	if err != nil {
 		return nil, err
 	}
@@ -126,14 +127,13 @@ func buildMultiStmt(gql, vars []byte) ([]stmt, error) {
 }
 
 //nolint: errcheck
-func renderUserQuery(
-	stmts []stmt, vars map[string]json.RawMessage) (string, error) {
+func (sg *SuperGraph) renderUserQuery(md psql.Metadata, stmts []stmt) (string, error) {
 	w := &bytes.Buffer{}
 
 	io.WriteString(w, `SELECT "_sg_auth_info"."role", (CASE "_sg_auth_info"."role" `)
 
 	for _, s := range stmts {
-		if len(s.role.Match) == 0 &&
+		if s.role.Match == "" &&
 			s.role.Name != "user" && s.role.Name != "anon" {
 			continue
 		}
@@ -145,12 +145,12 @@ func renderUserQuery(
 	}
 
 	io.WriteString(w, `END) FROM (SELECT (CASE WHEN EXISTS (`)
-	io.WriteString(w, conf.RolesQuery)
+	md.RenderVar(w, sg.conf.RolesQuery)
 	io.WriteString(w, `) THEN `)
 
 	io.WriteString(w, `(SELECT (CASE`)
 	for _, s := range stmts {
-		if len(s.role.Match) == 0 {
+		if s.role.Match == "" {
 			continue
 		}
 		io.WriteString(w, ` WHEN `)
@@ -161,22 +161,23 @@ func renderUserQuery(
 	}
 
 	io.WriteString(w, ` ELSE 'user' END) FROM (`)
-	io.WriteString(w, conf.RolesQuery)
+	md.RenderVar(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") AS "_sg_auth_info"(role) LIMIT 1; `)
 
 	return w.String(), nil
 }
 
-func hasTablesWithConfig(qc *qcode.QCode, role *configRole) bool {
-	for _, id := range qc.Roots {
-		t, err := schema.GetTable(qc.Selects[id].Name)
-		if err != nil {
-			return false
-		}
-		if _, ok := role.tablesMap[t.Name]; !ok {
-			return false
-		}
-	}
-	return true
-}
+// func (sg *SuperGraph) hasTablesWithConfig(qc *qcode.QCode, role *Role) bool {
+// 	for _, id := range qc.Roots {
+// 		t, err := sg.schema.GetTable(qc.Selects[id].Name)
+// 		if err != nil {
+// 			return false
+// 		}
+
+// 		if r := role.GetTable(t.Name); r == nil {
+// 			return false
+// 		}
+// 	}
+// 	return true
+// }

core/config.go

@@ -0,0 +1,256 @@
+package core
+
+import (
+	"fmt"
+	"path"
+	"path/filepath"
+	"strings"
+
+	"github.com/spf13/viper"
+)
+
+// Core struct contains core specific config value
+type Config struct {
+	// SecretKey is used to encrypt opaque values such as
+	// the cursor. Auto-generated if not set
+	SecretKey string `mapstructure:"secret_key"`
+
+	// UseAllowList (aka production mode) when set to true ensures
+	// only queries lists in the allow.list file can be used. All
+	// queries are pre-prepared so no compiling happens and things are
+	// very fast.
+	UseAllowList bool `mapstructure:"use_allow_list"`
+
+	// AllowListFile if the path to allow list file if not set the
+	// path is assumed to tbe the same as the config path (allow.list)
+	AllowListFile string `mapstructure:"allow_list_file"`
+
+	// SetUserID forces the database session variable `user.id` to
+	// be set to the user id. This variables can be used by triggers
+	// or other database functions
+	SetUserID bool `mapstructure:"set_user_id"`
+
+	// DefaultBlock ensures that in anonymous mode (role 'anon') all tables
+	// are blocked from queries and mutations. To open access to tables in
+	// anonymous mode they have to be added to the 'anon' role config.
+	DefaultBlock bool `mapstructure:"default_block"`
+
+	// Vars is a map of hardcoded variables that can be leveraged in your
+	// queries (eg variable admin_id will be $admin_id in the query)
+	Vars map[string]string `mapstructure:"variables"`
+
+	// Blocklist is a list of tables and columns that should be filtered
+	// out from any and all queries
+	Blocklist []string
+
+	// Tables contains all table specific configuration such as aliased tables
+	// creating relationships between tables, etc
+	Tables []Table
+
+	// RolesQuery if set enabled attributed based access control. This query
+	// is use to fetch the user attributes that then dynamically define the users
+	// role.
+	RolesQuery string `mapstructure:"roles_query"`
+
+	// Roles contains all the configuration for all the roles you want to support
+	// `user` and `anon` are two default roles. User role is for when a user ID is
+	// available and Anon when it's not.
+	//
+	// If you're using the RolesQuery config to enable atribute based acess control then
+	// you can add more custom roles.
+	Roles []Role
+
+	// Inflections is to add additionally singular to plural mappings
+	// to the engine (eg. sheep: sheep)
+	Inflections map[string]string `mapstructure:"inflections"`
+
+	// Database schema name. Defaults to 'public'
+	DBSchema string `mapstructure:"db_schema"`
+}
+
+// Table struct defines a database table
+type Table struct {
+	Name      string
+	Table     string
+	Type      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
+	ReadOnly bool `mapstructure:"read_only"`
+
+	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
+}
+
+// AddRoleTable function is a helper function to make it easy to add per-table
+// row-level config
+func (c *Config) AddRoleTable(role, table string, conf interface{}) error {
+	var r *Role
+
+	for i := range c.Roles {
+		if strings.EqualFold(c.Roles[i].Name, role) {
+			r = &c.Roles[i]
+			break
+		}
+	}
+	if r == nil {
+		nr := Role{Name: role}
+		c.Roles = append(c.Roles, nr)
+		r = &nr
+	}
+
+	var t *RoleTable
+	for i := range r.Tables {
+		if strings.EqualFold(r.Tables[i].Name, table) {
+			t = &r.Tables[i]
+			break
+		}
+	}
+	if t == nil {
+		nt := RoleTable{Name: table}
+		r.Tables = append(r.Tables, nt)
+		t = &nt
+	}
+
+	switch v := conf.(type) {
+	case Query:
+		t.Query = &v
+	case Insert:
+		t.Insert = &v
+	case Update:
+		t.Update = &v
+	case Delete:
+		t.Delete = &v
+	default:
+		return fmt.Errorf("unsupported object type: %t", v)
+	}
+	return nil
+}
+
+// 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) {
+	cp := path.Dir(configFile)
+	vi := newViper(cp, path.Base(configFile))
+
+	if err := vi.ReadInConfig(); err != nil {
+		return nil, err
+	}
+
+	if pcf := vi.GetString("inherits"); pcf != "" {
+		cf := vi.ConfigFileUsed()
+		vi = newViper(cp, pcf)
+
+		if err := vi.ReadInConfig(); err != nil {
+			return nil, err
+		}
+
+		if v := vi.GetString("inherits"); v != "" {
+			return nil, fmt.Errorf("inherited config (%s) cannot itself inherit (%s)", pcf, v)
+		}
+
+		vi.SetConfigFile(cf)
+
+		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 c.AllowListFile == "" {
+		c.AllowListFile = path.Join(cp, "allow.list")
+	}
+
+	return c, nil
+}
+
+func newViper(configPath, configFile string) *viper.Viper {
+	vi := viper.New()
+
+	vi.SetEnvPrefix("SG")
+	vi.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+	vi.AutomaticEnv()
+
+	if filepath.Ext(configFile) != "" {
+		vi.SetConfigFile(path.Join(configPath, configFile))
+	} else {
+		vi.SetConfigName(configFile)
+		vi.AddConfigPath(configPath)
+		vi.AddConfigPath("./config")
+	}
+
+	return vi
+}

core/consts.go

@@ -0,0 +1,14 @@
+package core
+
+import (
+	"context"
+	"errors"
+)
+
+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

@@ -0,0 +1,446 @@
+package core
+
+import (
+	"context"
+	"database/sql"
+	"encoding/json"
+	"fmt"
+	"hash/maphash"
+	"time"
+
+	"github.com/dosco/super-graph/core/internal/psql"
+	"github.com/dosco/super-graph/core/internal/qcode"
+)
+
+type OpType int
+
+const (
+	OpQuery OpType = iota
+	OpMutation
+)
+
+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 {
+	var err error
+	var schema string
+
+	if sg.conf.DBSchema == "" {
+		schema = "public"
+	} else {
+		schema = sg.conf.DBSchema
+	}
+
+	// If sg.di is not null then it's probably set
+	// for tests
+	if sg.dbinfo == nil {
+		sg.dbinfo, err = psql.GetDBInfo(sg.db, schema)
+		if err != nil {
+			return err
+		}
+	}
+
+	if len(sg.dbinfo.Tables) == 0 {
+		return fmt.Errorf("no tables found in database (schema: %s)", schema)
+	}
+
+	if err = addTables(sg.conf, sg.dbinfo); err != nil {
+		return err
+	}
+
+	if err = addForeignKeys(sg.conf, sg.dbinfo); err != nil {
+		return err
+	}
+
+	sg.schema, err = psql.NewDBSchema(sg.dbinfo, getDBTableAliases(sg.conf))
+	if err != nil {
+		return err
+	}
+
+	sg.qc, err = qcode.NewCompiler(qcode.Config{
+		DefaultBlock: sg.conf.DefaultBlock,
+		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.md.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
+
+	h := maphash.Hash{}
+	h.SetSeed(c.sg.hashSeed)
+	id := queryID(&h, c.res.name, role)
+
+	q, ok := c.sg.queries[id]
+	if !ok {
+		return nil, nil, errNotFound
+	}
+
+	if q.sd == nil {
+		q.Do(func() { c.sg.prepare(q, role) })
+
+		if q.err != nil {
+			return nil, nil, err
+		}
+	}
+
+	c.res.sql = q.st.sql
+
+	var root []byte
+	var row *sql.Row
+
+	varsList, err := c.argList(q.st.md)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if useTx {
+		row = tx.Stmt(q.sd).QueryRow(varsList...)
+	} else {
+		row = q.sd.QueryRow(varsList...)
+	}
+
+	if q.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, q.err
+		}
+	}
+
+	if root, err = c.sg.encryptCursor(q.st.qc, root); err != nil {
+		return nil, nil, err
+	}
+
+	return root, &q.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]
+	c.res.sql = st.sql
+
+	varList, err := c.argList(st.md)
+	if err != nil {
+		return nil, nil, err
+	}
+	// finalSQL := buf.String()
+
+	////
+
+	// _, err = t.ExecuteFunc(buf, c.argMap(st.md))
+	// 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.QueryRowContext(c, st.sql, varList...)
+	} else {
+		row = c.sg.db.QueryRowContext(c, st.sql, varList...)
+	}
+
+	if len(stmts) > 1 {
+		err = row.Scan(&role, &root)
+	} else {
+		err = row.Scan(&root)
+	}
+
+	if role == "" {
+		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() OpType {
+	switch r.op {
+	case qcode.QTQuery:
+		return OpQuery
+
+	case qcode.QTMutation, qcode.QTInsert, qcode.QTUpdate, qcode.QTUpsert, qcode.QTDelete:
+		return OpMutation
+
+	default:
+		return -1
+	}
+}
+
+func (r *Result) OperationName() 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/core_test.go

@@ -1,4 +1,4 @@
-package serv
+package core
 
 /*
 

core/cursor.go

@@ -1,15 +1,15 @@
-package serv
+package core
 
 import (
 	"bytes"
 	"encoding/base64"
 
-	"github.com/dosco/super-graph/crypto"
+	"github.com/dosco/super-graph/core/internal/crypto"
+	"github.com/dosco/super-graph/core/internal/qcode"
 	"github.com/dosco/super-graph/jsn"
-	"github.com/dosco/super-graph/qcode"
 )
 
-func encryptCursor(qc *qcode.QCode, data []byte) ([]byte, error) {
+func (sg *SuperGraph) encryptCursor(qc *qcode.QCode, data []byte) ([]byte, error) {
 	var keys [][]byte
 
 	for _, s := range qc.Selects {
@@ -39,7 +39,7 @@ func encryptCursor(qc *qcode.QCode, data []byte) ([]byte, error) {
 		var buf bytes.Buffer
 
 		if len(f.Value) > 2 {
-			v, err := crypto.Encrypt(f.Value[1:len(f.Value)-1], &internalKey)
+			v, err := crypto.Encrypt(f.Value[1:len(f.Value)-1], &sg.encKey)
 			if err != nil {
 				return nil, err
 			}
@@ -63,10 +63,10 @@ func encryptCursor(qc *qcode.QCode, data []byte) ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-func decrypt(data string) ([]byte, error) {
+func (sg *SuperGraph) decrypt(data string) ([]byte, error) {
 	v, err := base64.StdEncoding.DecodeString(data)
 	if err != nil {
 		return nil, err
 	}
-	return crypto.Decrypt(v, &internalKey)
+	return crypto.Decrypt(v, &sg.encKey)
 }

core/db.go

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,341 @@
+package core
+
+import (
+	"fmt"
+	"strings"
+
+	"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)
+	}
+
+	// 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
+	}
+
+	// If anon role is not defined then create it
+	if _, ok := sg.roles["anon"]; !ok {
+		ur := Role{
+			Name: "anon",
+			tm:   make(map[string]*RoleTable),
+		}
+		c.Roles = append(c.Roles, ur)
+		sg.roles["anon"] = &ur
+	}
+
+	if c.RolesQuery == "" {
+		sg.log.Printf("INF roles_query not defined: attribute based access control disabled")
+	} else {
+		n := 0
+		for k, v := range sg.roles {
+			if k == "user" || k == "anon" {
+				n++
+			} else if v.Match != "" {
+				n++
+			}
+		}
+		sg.abacEnabled = (n > 2)
+
+		if !sg.abacEnabled {
+			sg.log.Printf("WRN attribute based access control disabled: no custom roles found (with 'match' defined)")
+		}
+	}
+
+	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 t.Table != "" && t.Type == "" {
+			m[t.Table] = append(m[t.Table], t.Name)
+		}
+	}
+	return m
+}
+
+func addTables(c *Config, di *psql.DBInfo) error {
+	var err error
+
+	for _, t := range c.Tables {
+		switch t.Type {
+		case "json", "jsonb":
+			err = addJsonTable(di, t.Columns, t)
+
+		case "polymorphic":
+			err = addVirtualTable(di, t.Columns, t)
+		}
+
+		if err != nil {
+			return err
+		}
+
+	}
+	return nil
+}
+
+func addJsonTable(di *psql.DBInfo, cols []Column, t Table) error {
+	// This is for jsonb columns that want to be tables.
+	bc, ok := di.GetColumn(t.Table, t.Name)
+	if !ok {
+		return fmt.Errorf(
+			"json table: column '%s' not found on table '%s'",
+			t.Name, t.Table)
+	}
+
+	if bc.Type != "json" && bc.Type != "jsonb" {
+		return fmt.Errorf(
+			"json table: 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 addVirtualTable(di *psql.DBInfo, cols []Column, t Table) error {
+	if len(cols) == 0 {
+		return fmt.Errorf("polymorphic table: no id column specified")
+	}
+
+	c := cols[0]
+
+	if c.ForeignKey == "" {
+		return fmt.Errorf("polymorphic table: no 'related_to' specified on id column")
+	}
+
+	s := strings.SplitN(c.ForeignKey, ".", 2)
+
+	if len(s) != 2 {
+		return fmt.Errorf("polymorphic table: foreign key must be <type column>.<foreign key column>")
+	}
+
+	di.VTables = append(di.VTables, psql.VirtualTable{
+		Name:       t.Name,
+		IDColumn:   c.Name,
+		TypeColumn: s[0],
+		FKeyColumn: s[1],
+	})
+
+	return nil
+}
+
+func addForeignKeys(c *Config, di *psql.DBInfo) error {
+	for _, t := range c.Tables {
+		if t.Type != "" {
+			continue
+		}
+		for _, c := range t.Columns {
+			if c.ForeignKey == "" {
+				continue
+			}
+			if err := addForeignKey(di, c, t); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func addForeignKey(di *psql.DBInfo, c Column, t Table) error {
+	var tn string
+
+	if t.Type == "polymorphic" {
+		tn = t.Table
+	} else {
+		tn = t.Name
+	}
+
+	c1, ok := di.GetColumn(tn, c.Name)
+	if !ok {
+		return fmt.Errorf(
+			"config: invalid table '%s' or column '%s' defined",
+			tn, c.Name)
+	}
+
+	v := strings.SplitN(c.ForeignKey, ".", 2)
+	if len(v) != 2 {
+		return fmt.Errorf(
+			"config: invalid foreign_key defined for table '%s' and column '%s': %s",
+			tn, c.Name, c.ForeignKey)
+	}
+
+	// check if it's a polymorphic foreign key
+	if _, ok := di.GetColumn(tn, v[0]); ok {
+		c2, ok := di.GetColumn(tn, v[1])
+		if !ok {
+			return fmt.Errorf(
+				"config: invalid column '%s' for polymorphic relationship on table '%s' and column '%s'",
+				v[1], tn, c.Name)
+		}
+
+		c1.FKeyTable = v[0]
+		c1.FKeyColID = []int16{c2.ID}
+		return nil
+	}
+
+	fkt, fkc := v[0], v[1]
+	c3, ok := di.GetColumn(fkt, fkc)
+	if !ok {
+		return fmt.Errorf(
+			"config: foreign_key for table '%s' and column '%s' points to unknown table '%s' and column '%s'",
+			t.Name, c.Name, v[0], v[1])
+	}
+
+	c1.FKeyTable = fkt
+	c1.FKeyColID = []int16{c3.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, c.DefaultBlock); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func addRole(qc *qcode.Compiler, r Role, t RoleTable, defaultBlock bool) error {
+	ro := false // read-only
+
+	if defaultBlock && r.Name == "anon" {
+		ro = true
+	}
+
+	if t.ReadOnly {
+		ro = true
+	}
+
+	query := qcode.QueryConfig{Block: false}
+	insert := qcode.InsertConfig{Block: ro}
+	update := qcode.UpdateConfig{Block: ro}
+	del := qcode.DeleteConfig{Block: ro}
+
+	if t.Query != nil {
+		query = qcode.QueryConfig{
+			Limit:            t.Query.Limit,
+			Filters:          t.Query.Filters,
+			Columns:          t.Query.Columns,
+			DisableFunctions: t.Query.DisableFunctions,
+			Block:            t.Query.Block,
+		}
+	}
+
+	if t.Insert != nil {
+		insert = qcode.InsertConfig{
+			Filters: t.Insert.Filters,
+			Columns: t.Insert.Columns,
+			Presets: t.Insert.Presets,
+			Block:   t.Insert.Block,
+		}
+	}
+
+	if t.Update != nil {
+		update = qcode.UpdateConfig{
+			Filters: t.Update.Filters,
+			Columns: t.Update.Columns,
+			Presets: t.Update.Presets,
+			Block:   t.Update.Block,
+		}
+	}
+
+	if t.Delete != nil {
+		del = qcode.DeleteConfig{
+			Filters: t.Delete.Filters,
+			Columns: t.Delete.Columns,
+			Block:   t.Delete.Block,
+		}
+	}
+
+	return qc.AddRole(r.Name, t.Name, qcode.TRConfig{
+		Query:  query,
+		Insert: insert,
+		Update: update,
+		Delete: del,
+	})
+}
+
+func (r *Role) GetTable(name string) *RoleTable {
+	return r.tm[name]
+}
+
+func sanitize(value string) string {
+	return strings.ToLower(strings.TrimSpace(value))
+}

core/internal/allow/allow.go

@@ -0,0 +1,349 @@
+package allow
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"sort"
+	"strings"
+	"text/scanner"
+
+	"github.com/chirino/graphql/schema"
+	"github.com/dosco/super-graph/jsn"
+)
+
+const (
+	expComment = iota + 1
+	expVar
+	expQuery
+)
+
+type Item struct {
+	Name    string
+	key     string
+	Query   string
+	Vars    string
+	Comment string
+}
+
+type List struct {
+	filepath string
+	saveChan chan Item
+}
+
+type Config struct {
+	CreateIfNotExists bool
+	Persist           bool
+	Log               *log.Logger
+}
+
+func New(filename string, conf Config) (*List, error) {
+	al := List{}
+
+	if filename != "" {
+		fp := filename
+
+		if _, err := os.Stat(fp); err == nil {
+			al.filepath = fp
+		} else if !os.IsNotExist(err) {
+			return nil, err
+		}
+	}
+
+	if al.filepath == "" {
+		fp := "./allow.list"
+
+		if _, err := os.Stat(fp); err == nil {
+			al.filepath = fp
+		} else if !os.IsNotExist(err) {
+			return nil, err
+		}
+	}
+
+	if al.filepath == "" {
+		fp := "./config/allow.list"
+
+		if _, err := os.Stat(fp); err == nil {
+			al.filepath = fp
+		} else if !os.IsNotExist(err) {
+			return nil, err
+		}
+	}
+
+	if al.filepath == "" {
+		if !conf.CreateIfNotExists {
+			return nil, errors.New("allow.list not found")
+		}
+
+		if filename == "" {
+			al.filepath = "./config/allow.list"
+		} else {
+			al.filepath = filename
+		}
+
+		if file, err := os.OpenFile(al.filepath, os.O_RDONLY|os.O_CREATE, 0644); err != nil {
+			return nil, err
+		} else {
+			file.Close()
+		}
+	}
+
+	var err error
+
+	if conf.Persist {
+		al.saveChan = make(chan Item)
+
+		go func() {
+			for v := range al.saveChan {
+				err := al.save(v)
+
+				if err != nil && conf.Log != nil {
+					conf.Log.Println("WRN allow list save:", err)
+				}
+			}
+		}()
+	}
+
+	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 query == "" {
+		return errors.New("empty query")
+	}
+
+	al.saveChan <- Item{
+		Comment: comment,
+		Query:   query,
+		Vars:    string(vars),
+	}
+
+	return nil
+}
+
+func (al *List) Load() ([]Item, error) {
+	b, err := ioutil.ReadFile(al.filepath)
+	if err != nil {
+		return nil, err
+	}
+
+	return parse(string(b), al.filepath)
+}
+
+func parse(b, filename string) ([]Item, error) {
+	var items []Item
+
+	var s scanner.Scanner
+	s.Init(strings.NewReader(b))
+	s.Filename = filename
+	s.Mode ^= scanner.SkipComments
+
+	var op, sp scanner.Position
+	var item Item
+
+	newComment := false
+	st := expComment
+
+	for tok := s.Scan(); tok != scanner.EOF; tok = s.Scan() {
+		txt := s.TokenText()
+
+		switch {
+		case strings.HasPrefix(txt, "/*"):
+			if st == expQuery {
+				v := b[sp.Offset:s.Pos().Offset]
+				item.Query = strings.TrimSpace(v[:strings.LastIndexByte(v, '}')+1])
+				items = append(items, item)
+			}
+			item = Item{Comment: strings.TrimSpace(txt[2 : len(txt)-2])}
+			sp = s.Pos()
+			st = expComment
+			newComment = true
+
+		case !newComment && strings.HasPrefix(txt, "#"):
+			if st == expQuery {
+				v := b[sp.Offset:s.Pos().Offset]
+				item.Query = strings.TrimSpace(v[:strings.LastIndexByte(v, '}')+1])
+				items = append(items, item)
+			}
+			item = Item{}
+			sp = s.Pos()
+			st = expComment
+
+		case strings.HasPrefix(txt, "variables"):
+			if st == expComment {
+				v := b[sp.Offset:s.Pos().Offset]
+				item.Comment = strings.TrimSpace(v[:strings.IndexByte(v, '\n')])
+			}
+			sp = s.Pos()
+			st = expVar
+
+		case isGraphQL(txt):
+			if st == expVar {
+				v := b[sp.Offset:s.Pos().Offset]
+				item.Vars = strings.TrimSpace(v[:strings.LastIndexByte(v, '}')+1])
+			}
+			sp = op
+			st = expQuery
+
+		}
+		op = s.Pos()
+	}
+
+	if st == expQuery {
+		v := b[sp.Offset:s.Pos().Offset]
+		item.Query = strings.TrimSpace(v[:strings.LastIndexByte(v, '}')+1])
+		items = append(items, item)
+	}
+
+	for i := range items {
+		items[i].Name = QueryName(items[i].Query)
+		items[i].key = strings.ToLower(items[i].Name)
+	}
+
+	return items, nil
+}
+
+func isGraphQL(s string) bool {
+	return strings.HasPrefix(s, "query") ||
+		strings.HasPrefix(s, "mutation") ||
+		strings.HasPrefix(s, "subscription")
+}
+
+func (al *List) save(item Item) error {
+	var buf bytes.Buffer
+
+	qd := &schema.QueryDocument{}
+
+	if err := qd.Parse(item.Query); err != nil {
+		return err
+	}
+
+	qd.WriteTo(&buf)
+	query := buf.String()
+	buf.Reset()
+
+	item.Name = QueryName(query)
+	item.key = strings.ToLower(item.Name)
+
+	if item.Name == "" {
+		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 list[index].Comment != "" {
+			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 i, v := range list {
+		var vars string
+		if v.Vars != "" {
+			buf.Reset()
+			if err := jsn.Clear(&buf, []byte(v.Vars)); err != nil {
+				continue
+			}
+			vj := json.RawMessage(buf.Bytes())
+
+			if vj, err = json.MarshalIndent(vj, "", "  "); err != nil {
+				continue
+			}
+			vars = string(vj)
+		}
+		list[i].Vars = vars
+		list[i].Comment = strings.TrimSpace(v.Comment)
+	}
+
+	for _, v := range list {
+		if v.Comment != "" {
+			_, err = f.WriteString(fmt.Sprintf("/* %s */\n\n", v.Comment))
+		} else {
+			_, err = f.WriteString(fmt.Sprintf("/* %s */\n\n", v.Name))
+		}
+
+		if err != nil {
+			return err
+		}
+
+		if v.Vars != "" {
+			_, err = f.WriteString(fmt.Sprintf("variables %s\n\n", v.Vars))
+			if err != nil {
+				return err
+			}
+		}
+
+		_, err = f.WriteString(fmt.Sprintf("%s\n\n", v.Query))
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+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

@@ -0,0 +1,241 @@
+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 name != "" {
+		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)
+	}
+}
+
+func TestParse1(t *testing.T) {
+	var al = `
+ # Hello world
+
+	variables {
+		"data": {
+			"slug": "",
+			"body": "",
+			"post": {
+				"connect": {
+					"slug": ""
+				}
+			}
+		}
+	}
+	
+	mutation createComment {
+		comment(insert: $data) {
+			slug
+			body
+			createdAt: created_at
+			totalVotes: cached_votes_total
+			totalReplies: cached_replies_total
+			vote: comment_vote(where: {user_id: {eq: $user_id}}) {
+				created_at
+				__typename
+			}
+			author: user {
+				slug
+				firstName: first_name
+				lastName: last_name
+				pictureURL: picture_url
+				bio
+				__typename
+			}
+			__typename
+		}
+	}
+	
+	# Query named createPost
+	
+	query createPost {
+		post(insert: $data) {
+			slug
+			body
+			published
+			createdAt: created_at
+			totalVotes: cached_votes_total
+			totalComments: cached_comments_total
+			vote: post_vote(where: {user_id: {eq: $user_id}}) {
+				created_at
+				__typename
+			}
+			author: user {
+				slug
+				firstName: first_name
+				lastName: last_name
+				pictureURL: picture_url
+				bio
+				__typename
+			}
+			__typename
+		}
+	}`
+
+	_, err := parse(al, "allow.list")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestParse2(t *testing.T) {
+	var al = `
+ /* Hello world */
+
+	variables {
+		"data": {
+			"slug": "",
+			"body": "",
+			"post": {
+				"connect": {
+					"slug": ""
+				}
+			}
+		}
+	}
+	
+	mutation createComment {
+		comment(insert: $data) {
+			slug
+			body
+			createdAt: created_at
+			totalVotes: cached_votes_total
+			totalReplies: cached_replies_total
+			vote: comment_vote(where: {user_id: {eq: $user_id}}) {
+				created_at
+				__typename
+			}
+			author: user {
+				slug
+				firstName: first_name
+				lastName: last_name
+				pictureURL: picture_url
+				bio
+				__typename
+			}
+			__typename
+		}
+	}
+	
+	/* 
+	Query named createPost 
+	*/
+	
+	variables {
+		"data": {
+			"thread": {
+				"connect": {
+					"slug": ""
+				}
+			},
+			"slug": "",
+			"published": false,
+			"body": ""
+		}
+	}
+	
+	query createPost {
+		post(insert: $data) {
+			slug
+			body
+			published
+			createdAt: created_at
+			totalVotes: cached_votes_total
+			totalComments: cached_comments_total
+			vote: post_vote(where: {user_id: {eq: $user_id}}) {
+				created_at
+				__typename
+			}
+			author: user {
+				slug
+				firstName: first_name
+				lastName: last_name
+				pictureURL: picture_url
+				bio
+				__typename
+			}
+			__typename
+		}
+	}`
+
+	_, err := parse(al, "allow.list")
+	if err != nil {
+		t.Fatal(err)
+	}
+}

core/internal/integration_tests/cockroachdb/cockroachdb_test.go

@@ -0,0 +1,88 @@
+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())
+		return
+	}
+	fmt.Println("started temporary cockroach db")
+
+	stopped := int32(0)
+	stopDatabase := func() {
+		fmt.Println("stopping temporary cockroach db")
+		if atomic.CompareAndSwapInt32(&stopped, 0, 1) {
+			if err := cmd.Process.Kill(); err != nil {
+				log.Fatal(err)
+			}
+			if _, err := cmd.Process.Wait(); err != nil {
+				log.Fatal(err)
+			}
+			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

@@ -0,0 +1,249 @@
+package integration_tests
+
+import (
+	"context"
+	"database/sql"
+	"encoding/json"
+	"io/ioutil"
+	"testing"
+
+	"github.com/dosco/super-graph/core"
+	"github.com/stretchr/testify/assert"
+	"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`
+
+	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 item", func(t *testing.T) {
+		before(t)
+		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": 10}}`, 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))
+	})
+
+	t.Run("schema introspection", func(t *testing.T) {
+		before(t)
+		schema, err := sg.GraphQLSchema()
+		require.NoError(t, err)
+		// Uncomment the following line if you need to regenerate the expected schema.
+		//ioutil.WriteFile("../introspection.graphql", []byte(schema), 0644)
+		expected, err := ioutil.ReadFile("../introspection.graphql")
+		require.NoError(t, err)
+		assert.Equal(t, string(expected), schema)
+	})
+
+	res, err := sg.GraphQL(ctx, introspectionQuery, json.RawMessage(``))
+	assert.NoError(t, err)
+	assert.Contains(t, string(res.Data),
+		`{"queryType":{"name":"Query"},"mutationType":{"name":"Mutation"},"subscriptionType":null,"types":`)
+}
+
+const introspectionQuery = `
+ query IntrospectionQuery {
+   __schema {
+     queryType { name }
+     mutationType { name }
+     subscriptionType { name }
+     types {
+       ...FullType
+     }
+     directives {
+       name
+       description
+       locations
+       args {
+         ...InputValue
+       }
+     }
+   }
+ }
+ fragment FullType on __Type {
+   kind
+   name
+   description
+   fields(includeDeprecated: true) {
+     name
+     description
+     args {
+       ...InputValue
+     }
+     type {
+       ...TypeRef
+     }
+     isDeprecated
+     deprecationReason
+   }
+   inputFields {
+     ...InputValue
+   }
+   interfaces {
+     ...TypeRef
+   }
+   enumValues(includeDeprecated: true) {
+     name
+     description
+     isDeprecated
+     deprecationReason
+   }
+   possibleTypes {
+     ...TypeRef
+   }
+ }
+ fragment InputValue on __InputValue {
+   name
+   description
+   type { ...TypeRef }
+   defaultValue
+ }
+ fragment TypeRef on __Type {
+   kind
+   name
+   ofType {
+     kind
+     name
+     ofType {
+       kind
+       name
+       ofType {
+         kind
+         name
+         ofType {
+           kind
+           name
+           ofType {
+             kind
+             name
+             ofType {
+               kind
+               name
+               ofType {
+                 kind
+                 name
+               }
+             }
+           }
+         }
+       }
+     }
+   }
+ }
+`

core/internal/integration_tests/introspection.graphql

@@ -0,0 +1,319 @@
+input FloatExpression {
+  contained_in:String!
+  contains:[Float!]!
+  eq:Float!
+  equals:Float!
+  greater_or_equals:Float!
+  greater_than:Float!
+  gt:Float!
+  gte:Float!
+  has_key:Float!
+  has_key_all:[Float!]!
+  has_key_any:[Float!]!
+  ilike:String!
+  in:[Float!]!
+  is_null:Boolean!
+  lesser_or_equals:Float!
+  lesser_than:Float!
+  like:String!
+  lt:Float!
+  lte:Float!
+  neq:Float!
+  nilike:String!
+  nin:[Float!]!
+  nlike:String!
+  not_equals:Float!
+  not_ilike:String!
+  not_in:[Float!]!
+  not_like:String!
+  not_similar:String!
+  nsimilar:String!
+  similar:String!
+}
+input IntExpression {
+  contained_in:String!
+  contains:[Int!]!
+  eq:Int!
+  equals:Int!
+  greater_or_equals:Int!
+  greater_than:Int!
+  gt:Int!
+  gte:Int!
+  has_key:Int!
+  has_key_all:[Int!]!
+  has_key_any:[Int!]!
+  ilike:String!
+  in:[Int!]!
+  is_null:Boolean!
+  lesser_or_equals:Int!
+  lesser_than:Int!
+  like:String!
+  lt:Int!
+  lte:Int!
+  neq:Int!
+  nilike:String!
+  nin:[Int!]!
+  nlike:String!
+  not_equals:Int!
+  not_ilike:String!
+  not_in:[Int!]!
+  not_like:String!
+  not_similar:String!
+  nsimilar:String!
+  similar:String!
+}
+type Mutation {
+  line_item(  
+    "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."
+    order_by:line_itemOrderBy!, where:line_itemExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!, insert:line_itemInput, update:line_itemInput, upsert:line_itemInput
+  ):line_itemOutput
+  line_items(  
+    "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."
+    order_by:line_itemOrderBy!, where:line_itemExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!, insert:line_itemInput, update:line_itemInput, upsert:line_itemInput, inserts:[line_itemInput!]!, updates:[line_itemInput!]!, upserts:[line_itemInput!]!
+  ):line_itemOutput
+  product(  
+    "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."
+    order_by:productOrderBy!, where:productExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!, insert:productInput, update:productInput, upsert:productInput
+  ):productOutput
+  products(  
+    "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."
+    order_by:productOrderBy!, where:productExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!, insert:productInput, update:productInput, upsert:productInput, inserts:[productInput!]!, updates:[productInput!]!, upserts:[productInput!]!
+  ):productOutput
+  user(  
+    "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."
+    order_by:userOrderBy!, where:userExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!, insert:userInput, update:userInput, upsert:userInput
+  ):userOutput
+  users(  
+    "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."
+    order_by:userOrderBy!, where:userExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!, insert:userInput, update:userInput, upsert:userInput, inserts:[userInput!]!, updates:[userInput!]!, upserts:[userInput!]!
+  ):userOutput
+}
+enum OrderDirection {
+  asc
+  desc
+}
+type Query {
+  line_item(  
+    "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."
+    order_by:line_itemOrderBy!, where:line_itemExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!
+  ):line_itemOutput
+  line_items(  
+    "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."
+    order_by:line_itemOrderBy!, where:line_itemExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!
+  ):[line_itemOutput!]!
+  product(  
+    "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."
+    order_by:productOrderBy!, where:productExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!
+  ):productOutput
+  products(  
+    "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."
+    order_by:productOrderBy!, where:productExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!
+  ):[productOutput!]!
+  user(  
+    "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."
+    order_by:userOrderBy!, where:userExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!
+  ):userOutput
+  users(  
+    "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."
+    order_by:userOrderBy!, where:userExpression!, limit:Int!, offset:Int!, first:Int!, last:Int!, before:String, after:String,   
+    "Finds the record by the primary key"
+    id:Int!
+  ):[userOutput!]!
+}
+input StringExpression {
+  contained_in:String!
+  contains:[String!]!
+  eq:String!
+  equals:String!
+  greater_or_equals:String!
+  greater_than:String!
+  gt:String!
+  gte:String!
+  has_key:String!
+  has_key_all:[String!]!
+  has_key_any:[String!]!
+  ilike:String!
+  in:[String!]!
+  is_null:Boolean!
+  lesser_or_equals:String!
+  lesser_than:String!
+  like:String!
+  lt:String!
+  lte:String!
+  neq:String!
+  nilike:String!
+  nin:[String!]!
+  nlike:String!
+  not_equals:String!
+  not_ilike:String!
+  not_in:[String!]!
+  not_like:String!
+  not_similar:String!
+  nsimilar:String!
+  similar:String!
+}
+input line_itemExpression {
+  and:line_itemExpression!
+  id:IntExpression!
+  not:line_itemExpression!
+  or:line_itemExpression!
+  price:FloatExpression!
+  product:IntExpression!
+  quantity:IntExpression!
+}
+input line_itemInput {
+  id:Int!
+  price:Float
+  product:Int
+  quantity:Int
+}
+input line_itemOrderBy {
+  id:OrderDirection!
+  price:OrderDirection!
+  product:OrderDirection!
+  quantity:OrderDirection!
+}
+type line_itemOutput {
+  avg_id:Int!
+  avg_price:Float
+  avg_product:Int
+  avg_quantity:Int
+  count_id:Int!
+  count_price:Float
+  count_product:Int
+  count_quantity:Int
+  id:Int!
+  max_id:Int!
+  max_price:Float
+  max_product:Int
+  max_quantity:Int
+  min_id:Int!
+  min_price:Float
+  min_product:Int
+  min_quantity:Int
+  price:Float
+  product:Int
+  quantity:Int
+  stddev_id:Int!
+  stddev_pop_id:Int!
+  stddev_pop_price:Float
+  stddev_pop_product:Int
+  stddev_pop_quantity:Int
+  stddev_price:Float
+  stddev_product:Int
+  stddev_quantity:Int
+  stddev_samp_id:Int!
+  stddev_samp_price:Float
+  stddev_samp_product:Int
+  stddev_samp_quantity:Int
+  var_pop_id:Int!
+  var_pop_price:Float
+  var_pop_product:Int
+  var_pop_quantity:Int
+  var_samp_id:Int!
+  var_samp_price:Float
+  var_samp_product:Int
+  var_samp_quantity:Int
+  variance_id:Int!
+  variance_price:Float
+  variance_product:Int
+  variance_quantity:Int
+}
+input productExpression {
+  and:productExpression!
+  id:IntExpression!
+  name:StringExpression!
+  not:productExpression!
+  or:productExpression!
+  weight:FloatExpression!
+}
+input productInput {
+  id:Int!
+  name:String
+  weight:Float
+}
+input productOrderBy {
+  id:OrderDirection!
+  name:OrderDirection!
+  weight:OrderDirection!
+}
+type productOutput {
+  avg_id:Int!
+  avg_weight:Float
+  count_id:Int!
+  count_weight:Float
+  id:Int!
+  max_id:Int!
+  max_weight:Float
+  min_id:Int!
+  min_weight:Float
+  name:String
+  stddev_id:Int!
+  stddev_pop_id:Int!
+  stddev_pop_weight:Float
+  stddev_samp_id:Int!
+  stddev_samp_weight:Float
+  stddev_weight:Float
+  var_pop_id:Int!
+  var_pop_weight:Float
+  var_samp_id:Int!
+  var_samp_weight:Float
+  variance_id:Int!
+  variance_weight:Float
+  weight:Float
+}
+input userExpression {
+  and:userExpression!
+  full_name:StringExpression!
+  id:IntExpression!
+  not:userExpression!
+  or:userExpression!
+}
+input userInput {
+  full_name:String
+  id:Int!
+}
+input userOrderBy {
+  full_name:OrderDirection!
+  id:OrderDirection!
+}
+type userOutput {
+  avg_id:Int!
+  count_id:Int!
+  full_name:String
+  id:Int!
+  max_id:Int!
+  min_id:Int!
+  stddev_id:Int!
+  stddev_pop_id:Int!
+  stddev_samp_id:Int!
+  var_pop_id:Int!
+  var_samp_id:Int!
+  variance_id:Int!
+}
+schema {
+  mutation: Mutation
+  query: Query
+}

core/internal/integration_tests/postgresql/postgresql_test.go

@@ -0,0 +1,27 @@
+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")
+	} else {
+		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,4 +1,3 @@
-//nolint:errcheck
 package psql
 
 import (
@@ -6,14 +5,13 @@ import (
 	"io"
 	"strings"
 
-	"github.com/dosco/super-graph/qcode"
+	"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) {
+	childCols []*qcode.Column) ([]int, bool, error) {
 
 	var realColsRendered []int
 
@@ -113,15 +111,15 @@ func (c *compilerContext) renderColumnSearchRank(sel *qcode.Select, ti *DBTableI
 	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(`)
+	_, _ = io.WriteString(c.w, `ts_rank(`)
 	colWithTable(c.w, ti.Name, cn)
 	if c.schema.ver >= 110000 {
-		io.WriteString(c.w, `, websearch_to_tsquery('{{`)
+		_, _ = io.WriteString(c.w, `, websearch_to_tsquery(`)
 	} else {
-		io.WriteString(c.w, `, to_tsquery('{{`)
+		_, _ = io.WriteString(c.w, `, to_tsquery(`)
 	}
-	io.WriteString(c.w, arg.Val)
-	io.WriteString(c.w, `}}'))`)
+	c.md.renderValueExp(c.w, Param{Name: arg.Val, Type: "string"})
+	_, _ = io.WriteString(c.w, `))`)
 	alias(c.w, col.Name)
 
 	return nil
@@ -138,15 +136,15 @@ func (c *compilerContext) renderColumnSearchHeadline(sel *qcode.Select, ti *DBTa
 	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(`)
+	_, _ = io.WriteString(c.w, `ts_headline(`)
 	colWithTable(c.w, ti.Name, cn)
 	if c.schema.ver >= 110000 {
-		io.WriteString(c.w, `, websearch_to_tsquery('{{`)
+		_, _ = io.WriteString(c.w, `, websearch_to_tsquery(`)
 	} else {
-		io.WriteString(c.w, `, to_tsquery('{{`)
+		_, _ = io.WriteString(c.w, `, to_tsquery(`)
 	}
-	io.WriteString(c.w, arg.Val)
-	io.WriteString(c.w, `}}'))`)
+	c.md.renderValueExp(c.w, Param{Name: arg.Val, Type: "string"})
+	_, _ = io.WriteString(c.w, `))`)
 	alias(c.w, col.Name)
 
 	return nil
@@ -158,21 +156,21 @@ func (c *compilerContext) renderColumnTypename(sel *qcode.Select, ti *DBTableInf
 	}
 
 	c.renderComma(columnsRendered)
-	io.WriteString(c.w, `(`)
+	_, _ = io.WriteString(c.w, `(`)
 	squoted(c.w, ti.Name)
-	io.WriteString(c.w, ` :: text)`)
+	_, _ = 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)
+	pl := funcPrefixLen(c.schema.fm, 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'`)
+	// 	_, _ = io.WriteString(c.w, `'`)
+	// 	_, _ = io.WriteString(c.w, col.Name)
+	// 	_, _ = io.WriteString(c.w, ` not defined'`)
 	// 	alias(c.w, col.Name)
 	// }
 
@@ -191,10 +189,10 @@ func (c *compilerContext) renderColumnFunction(sel *qcode.Select, ti *DBTableInf
 	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, `(`)
+	_, _ = io.WriteString(c.w, fn)
+	_, _ = io.WriteString(c.w, `(`)
 	colWithTable(c.w, ti.Name, cn)
-	io.WriteString(c.w, `)`)
+	_, _ = io.WriteString(c.w, `)`)
 	alias(c.w, col.Name)
 
 	return nil
@@ -202,7 +200,7 @@ func (c *compilerContext) renderColumnFunction(sel *qcode.Select, ti *DBTableInf
 
 func (c *compilerContext) renderComma(columnsRendered int) {
 	if columnsRendered != 0 {
-		io.WriteString(c.w, `, `)
+		_, _ = io.WriteString(c.w, `, `)
 	}
 }
 

core/internal/psql/fuzz.go

@@ -0,0 +1,134 @@
+// +build gofuzz
+
+package psql
+
+import (
+	"encoding/json"
+
+	"github.com/dosco/super-graph/core/internal/qcode"
+)
+
+var (
+	qcompileTest, _ = qcode.NewCompiler(qcode.Config{})
+
+	schema, _ = GetTestSchema()
+
+	vars = map[string]string{
+		"admin_account_id": "5",
+	}
+
+	pcompileTest = NewCompiler(Config{
+		Schema: schema,
+		Vars:   vars,
+	})
+)
+
+// FuzzerEntrypoint for Fuzzbuzz
+func Fuzz(data []byte) int {
+	err1 := query(data)
+	err2 := insert(data)
+	err3 := update(data)
+	err4 := delete(data)
+
+	if err1 != nil || err2 != nil || err3 != nil || err4 != nil {
+		return 0
+	}
+
+	return 1
+}
+
+func query(data []byte) error {
+	gql := data
+
+	qc, err1 := qcompileTest.Compile(gql, "user")
+
+	vars := map[string]json.RawMessage{
+		"data": json.RawMessage(data),
+	}
+
+	_, _, err2 := pcompileTest.CompileEx(qc, vars)
+
+	if err1 != nil {
+		return err1
+	} else {
+		return err2
+	}
+}
+
+func insert(data []byte) error {
+	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)
+	return err
+}
+
+func update(data []byte) error {
+	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)
+	return err
+}
+
+func delete(data []byte) error {
+	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)
+	return err
+}

core/internal/psql/fuzz_test.go

@@ -0,0 +1,20 @@
+// +build gofuzz
+
+package psql
+
+import (
+	"testing"
+)
+
+var ret int
+
+func TestFuzzCrashers(t *testing.T) {
+	var crashers = []string{
+		"{\"connect\":{}}",
+		"q(q{q{q{q{q{q{q{q{",
+	}
+
+	for _, f := range crashers {
+		ret = Fuzz([]byte(f))
+	}
+}

core/internal/psql/insert.go

@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/dosco/super-graph/qcode"
-	"github.com/dosco/super-graph/util"
+	"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) {
+func (c *compilerContext) renderInsert(
+	w io.Writer, qc *qcode.QCode, vars Variables, ti *DBTableInfo) (uint32, error) {
 
 	insert, ok := vars[qc.ActionVar]
 	if !ok {
@@ -21,9 +21,16 @@ func (c *compilerContext) renderInsert(qc *qcode.QCode, w io.Writer,
 		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)`)
+	io.WriteString(c.w, `WITH "_sg_input" AS (SELECT `)
+	if insert[0] == '[' {
+		io.WriteString(c.w, `json_array_elements(`)
+	}
+	c.md.renderValueExp(c.w, Param{Name: qc.ActionVar, Type: "json"})
+	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})
@@ -82,34 +89,17 @@ func (c *compilerContext) renderInsertStmt(qc *qcode.QCode, w io.Writer, item re
 	io.WriteString(w, `INSERT INTO `)
 	quoted(w, ti.Name)
 	io.WriteString(w, ` (`)
-	renderInsertUpdateColumns(w, qc, jt, ti, sk, false)
+	c.renderInsertUpdateColumns(qc, jt, ti, sk, false)
 	renderNestedInsertRelColumns(w, item.kvitem, false)
 	io.WriteString(w, `)`)
 
 	io.WriteString(w, ` SELECT `)
-	renderInsertUpdateColumns(w, qc, jt, ti, sk, true)
+	c.renderInsertUpdateColumns(qc, jt, ti, sk, true)
 	renderNestedInsertRelColumns(w, item.kvitem, true)
 
-	io.WriteString(w, ` FROM "_sg_input" i, `)
+	io.WriteString(w, ` FROM "_sg_input" i`)
 	renderNestedInsertRelTables(w, item.kvitem)
-
-	if item.array {
-		io.WriteString(w, `json_populate_recordset`)
-	} else {
-		io.WriteString(w, `json_populate_record`)
-	}
-
-	io.WriteString(w, `(NULL::`)
-	io.WriteString(w, ti.Name)
-
-	if len(item.path) == 0 {
-		io.WriteString(w, `, i.j) t RETURNING *)`)
-	} else {
-		io.WriteString(w, `, i.j->`)
-		joinPath(w, item.path)
-		io.WriteString(w, `) t RETURNING *)`)
-	}
-
+	io.WriteString(w, ` RETURNING *)`)
 	return nil
 }
 
@@ -172,21 +162,21 @@ func renderNestedInsertRelColumns(w io.Writer, item kvitem, values bool) error {
 func renderNestedInsertRelTables(w io.Writer, item kvitem) error {
 	if len(item.items) == 0 {
 		if item.relPC != nil && item.relPC.Type == RelOneToMany {
-			quoted(w, item.relPC.Left.Table)
 			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, `", `)
+					io.WriteString(w, `"`)
 				} else {
 					quoted(w, v.relCP.Left.Table)
-					io.WriteString(w, `, `)
 				}
 			}
 		}

core/internal/psql/insert_test.go

@@ -1,4 +1,4 @@
-package psql
+package psql_test
 
 import (
 	"encoding/json"

core/internal/psql/metadata.go

@@ -0,0 +1,61 @@
+package psql
+
+import (
+	"io"
+)
+
+func (md *Metadata) RenderVar(w io.Writer, vv string) {
+	f, s := -1, 0
+
+	for i := range vv {
+		v := vv[i]
+		switch {
+		case (i > 0 && vv[i-1] != '\\' && v == '$') || v == '$':
+			if (i - s) > 0 {
+				_, _ = io.WriteString(w, vv[s:i])
+			}
+			f = i
+
+		case (v < 'a' && v > 'z') &&
+			(v < 'A' && v > 'Z') &&
+			(v < '0' && v > '9') &&
+			v != '_' &&
+			f != -1 &&
+			(i-f) > 1:
+			md.renderValueExp(w, Param{Name: vv[f+1 : i]})
+			s = i
+			f = -1
+		}
+	}
+
+	if f != -1 && (len(vv)-f) > 1 {
+		md.renderValueExp(w, Param{Name: vv[f+1:]})
+	} else {
+		_, _ = io.WriteString(w, vv[s:])
+	}
+}
+
+func (md *Metadata) renderValueExp(w io.Writer, p Param) {
+	_, _ = io.WriteString(w, `$`)
+	if v, ok := md.pindex[p.Name]; ok {
+		int32String(w, int32(v))
+
+	} else {
+		md.params = append(md.params, p)
+		n := len(md.params)
+
+		if md.pindex == nil {
+			md.pindex = make(map[string]int)
+		}
+		md.pindex[p.Name] = n
+		int32String(w, int32(n))
+	}
+}
+
+func (md Metadata) Skipped() uint32 {
+	return md.skipped
+}
+
+func (md Metadata) Params() []Param {
+	return md.params
+}

core/internal/psql/mutate.go

@@ -6,10 +6,11 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"strings"
 
+	"github.com/dosco/super-graph/core/internal/qcode"
+	"github.com/dosco/super-graph/core/internal/util"
 	"github.com/dosco/super-graph/jsn"
-	"github.com/dosco/super-graph/qcode"
-	"github.com/dosco/super-graph/util"
 )
 
 type itemType int
@@ -33,42 +34,44 @@ var updateTypes = map[string]itemType{
 
 var noLimit = qcode.Paging{NoLimit: true}
 
-func (co *Compiler) compileMutation(qc *qcode.QCode, w io.Writer, vars Variables) (uint32, error) {
+func (co *Compiler) compileMutation(w io.Writer, qc *qcode.QCode, vars Variables) (Metadata, error) {
+	md := Metadata{}
+
 	if len(qc.Selects) == 0 {
-		return 0, errors.New("empty query")
+		return md, errors.New("empty query")
 	}
 
-	c := &compilerContext{w, qc.Selects, co}
+	c := &compilerContext{md, w, qc.Selects, co}
 	root := &qc.Selects[0]
 
 	ti, err := c.schema.GetTable(root.Name)
 	if err != nil {
-		return 0, err
+		return c.md, err
 	}
 
 	switch qc.Type {
 	case qcode.QTInsert:
-		if _, err := c.renderInsert(qc, w, vars, ti); err != nil {
-			return 0, err
+		if _, err := c.renderInsert(w, qc, vars, ti); err != nil {
+			return c.md, err
 		}
 
 	case qcode.QTUpdate:
-		if _, err := c.renderUpdate(qc, w, vars, ti); err != nil {
-			return 0, err
+		if _, err := c.renderUpdate(w, qc, vars, ti); err != nil {
+			return c.md, err
 		}
 
 	case qcode.QTUpsert:
-		if _, err := c.renderUpsert(qc, w, vars, ti); err != nil {
-			return 0, err
+		if _, err := c.renderUpsert(w, qc, vars, ti); err != nil {
+			return c.md, err
 		}
 
 	case qcode.QTDelete:
-		if _, err := c.renderDelete(qc, w, vars, ti); err != nil {
-			return 0, err
+		if _, err := c.renderDelete(w, qc, vars, ti); err != nil {
+			return c.md, err
 		}
 
 	default:
-		return 0, errors.New("valid mutations are 'insert', 'update', 'upsert' and 'delete'")
+		return c.md, errors.New("valid mutations are 'insert', 'update', 'upsert' and 'delete'")
 	}
 
 	root.Paging = noLimit
@@ -77,7 +80,7 @@ func (co *Compiler) compileMutation(qc *qcode.QCode, w io.Writer, vars Variables
 	root.Where = nil
 	root.Args = nil
 
-	return c.compileQuery(qc, w, vars)
+	return co.compileQueryWithMetadata(w, qc, vars, c.md)
 }
 
 type kvitem struct {
@@ -365,12 +368,12 @@ func (c *compilerContext) renderUnionStmt(w io.Writer, item renitem) error {
 	return nil
 }
 
-func renderInsertUpdateColumns(w io.Writer,
+func (c *compilerContext) renderInsertUpdateColumns(
 	qc *qcode.QCode,
 	jt map[string]json.RawMessage,
 	ti *DBTableInfo,
 	skipcols map[string]struct{},
-	values bool) (uint32, error) {
+	isValues bool) (uint32, error) {
 
 	root := &qc.Selects[0]
 	renderedCol := false
@@ -392,13 +395,18 @@ func renderInsertUpdateColumns(w io.Writer,
 			}
 		}
 		if n != 0 {
-			io.WriteString(w, `, `)
+			io.WriteString(c.w, `, `)
 		}
 
-		if values {
-			colWithTable(w, "t", cn.Name)
+		if isValues {
+			io.WriteString(c.w, `CAST( i.j ->>`)
+			io.WriteString(c.w, `'`)
+			io.WriteString(c.w, cn.Name)
+			io.WriteString(c.w, `' AS `)
+			io.WriteString(c.w, cn.Type)
+			io.WriteString(c.w, `)`)
 		} else {
-			quoted(w, cn.Name)
+			quoted(c.w, cn.Name)
 		}
 
 		if !renderedCol {
@@ -417,16 +425,28 @@ func renderInsertUpdateColumns(w io.Writer,
 			continue
 		}
 		if i != 0 || n != 0 {
-			io.WriteString(w, `, `)
+			io.WriteString(c.w, `, `)
 		}
 
-		if values {
-			io.WriteString(w, `'`)
-			io.WriteString(w, root.PresetMap[cn])
-			io.WriteString(w, `' :: `)
-			io.WriteString(w, col.Type)
+		if isValues {
+			val := root.PresetMap[cn]
+			switch {
+			case ok && len(val) > 1 && val[0] == '$':
+				c.md.renderValueExp(c.w, Param{Name: val[1:], Type: col.Type})
+
+			case ok && strings.HasPrefix(val, "sql:"):
+				io.WriteString(c.w, `(`)
+				c.md.RenderVar(c.w, val[4:])
+				io.WriteString(c.w, `)`)
+
+			case ok:
+				squoted(c.w, val)
+			}
+
+			io.WriteString(c.w, ` :: `)
+			io.WriteString(c.w, col.Type)
 		} else {
-			quoted(w, cn)
+			quoted(c.w, cn)
 		}
 
 		if !renderedCol {
@@ -435,15 +455,15 @@ func renderInsertUpdateColumns(w io.Writer,
 	}
 
 	if len(skipcols) != 0 && renderedCol {
-		io.WriteString(w, `, `)
+		io.WriteString(c.w, `, `)
 	}
 	return 0, nil
 }
 
-func (c *compilerContext) renderUpsert(qc *qcode.QCode, w io.Writer,
-	vars Variables, ti *DBTableInfo) (uint32, error) {
-	root := &qc.Selects[0]
+func (c *compilerContext) renderUpsert(
+	w io.Writer, qc *qcode.QCode, 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)
@@ -461,7 +481,7 @@ func (c *compilerContext) renderUpsert(qc *qcode.QCode, w io.Writer,
 		return 0, err
 	}
 
-	if _, err := c.renderInsert(qc, w, vars, ti); err != nil {
+	if _, err := c.renderInsert(w, qc, vars, ti); err != nil {
 		return 0, err
 	}
 
@@ -522,6 +542,10 @@ func (c *compilerContext) renderConnectStmt(qc *qcode.QCode, w io.Writer,
 
 	rel := item.relPC
 
+	if rel == nil {
+		return errors.New("invalid connect value")
+	}
+
 	// 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.
@@ -667,7 +691,7 @@ func renderCteName(w io.Writer, item kvitem) error {
 	io.WriteString(w, item.ti.Name)
 	if item._type == itemConnect || item._type == itemDisconnect {
 		io.WriteString(w, `_`)
-		int2string(w, item.id)
+		int32String(w, item.id)
 	}
 	io.WriteString(w, `"`)
 	return nil

core/internal/psql/mutate_test.go

@@ -1,4 +1,4 @@
-package psql
+package psql_test
 
 import (
 	"encoding/json"
@@ -72,7 +72,7 @@ func delete(t *testing.T) {
 // 		}
 // 	}`
 
-// 	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"`
+// 	sql := `WITH "users" AS (WITH "input" AS (SELECT '$1' :: 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"}`),
@@ -97,7 +97,7 @@ func delete(t *testing.T) {
 // 		}
 // 	}`
 
-// 	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"`
+// 	sql := `WITH "users" AS (WITH "input" AS (SELECT '$1' :: 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"}`),

core/internal/psql/psql_test.go

@@ -1,4 +1,4 @@
-package psql
+package psql_test
 
 import (
 	"fmt"
@@ -8,7 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/dosco/super-graph/qcode"
+	"github.com/dosco/super-graph/core/internal/psql"
+	"github.com/dosco/super-graph/core/internal/qcode"
 )
 
 const (
@@ -19,7 +20,7 @@ const (
 
 var (
 	qcompile *qcode.Compiler
-	pcompile *Compiler
+	pcompile *psql.Compiler
 	expected map[string][]string
 )
 
@@ -133,13 +134,16 @@ func TestMain(m *testing.M) {
 		log.Fatal(err)
 	}
 
-	schema := getTestSchema()
+	schema, err := psql.GetTestSchema()
+	if err != nil {
+		log.Fatal(err)
+	}
 
-	vars := NewVariables(map[string]string{
+	vars := map[string]string{
 		"admin_account_id": "5",
-	})
+	}
 
-	pcompile = NewCompiler(Config{
+	pcompile = psql.NewCompiler(psql.Config{
 		Schema: schema,
 		Vars:   vars,
 	})
@@ -173,7 +177,7 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
-func compileGQLToPSQL(t *testing.T, gql string, vars Variables, role string) {
+func compileGQLToPSQL(t *testing.T, gql string, vars psql.Variables, role string) {
 	generateTestFile := false
 
 	if generateTestFile {

core/internal/psql/query.go

@@ -7,19 +7,35 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"strconv"
 	"strings"
 
-	"github.com/dosco/super-graph/qcode"
-	"github.com/dosco/super-graph/util"
+	"github.com/dosco/super-graph/core/internal/qcode"
+	"github.com/dosco/super-graph/core/internal/util"
 )
 
 const (
 	closeBlock = 500
 )
 
-var (
-	ErrAllTablesSkipped = errors.New("all tables skipped. cannot render query")
-)
+type Param struct {
+	Name    string
+	Type    string
+	IsArray bool
+}
+
+type Metadata struct {
+	skipped uint32
+	params  []Param
+	pindex  map[string]int
+}
+
+type compilerContext struct {
+	md Metadata
+	w  io.Writer
+	s  []qcode.Select
+	*Compiler
+}
 
 type Variables map[string]json.RawMessage
 
@@ -40,12 +56,12 @@ func NewCompiler(conf Config) *Compiler {
 	}
 }
 
-func (c *Compiler) AddRelationship(child, parent string, rel *DBRel) error {
-	return c.schema.SetRel(child, parent, rel)
+func (co *Compiler) AddRelationship(child, parent string, rel *DBRel) error {
+	return co.schema.SetRel(child, parent, rel)
 }
 
-func (c *Compiler) IDColumn(table string) (*DBColumn, error) {
-	ti, err := c.schema.GetTable(table)
+func (co *Compiler) IDColumn(table string) (*DBColumn, error) {
+	ti, err := co.schema.GetTable(table)
 	if err != nil {
 		return nil, err
 	}
@@ -57,65 +73,79 @@ func (c *Compiler) IDColumn(table string) (*DBColumn, error) {
 	return ti.PrimaryCol, nil
 }
 
-type compilerContext struct {
-	w io.Writer
-	s []qcode.Select
-	*Compiler
-}
-
-func (co *Compiler) CompileEx(qc *qcode.QCode, vars Variables) (uint32, []byte, error) {
+func (co *Compiler) CompileEx(qc *qcode.QCode, vars Variables) (Metadata, []byte, error) {
 	w := &bytes.Buffer{}
-	skipped, err := co.Compile(qc, w, vars)
-	return skipped, w.Bytes(), err
+	metad, err := co.Compile(w, qc, vars)
+	return metad, w.Bytes(), err
 }
 
-func (co *Compiler) Compile(qc *qcode.QCode, w io.Writer, vars Variables) (uint32, error) {
+func (co *Compiler) Compile(w io.Writer, qc *qcode.QCode, vars Variables) (Metadata, error) {
+	return co.CompileWithMetadata(w, qc, vars, Metadata{})
+}
+
+func (co *Compiler) CompileWithMetadata(w io.Writer, qc *qcode.QCode, vars Variables, md Metadata) (Metadata, error) {
+	md.skipped = 0
+
+	if qc == nil {
+		return md, fmt.Errorf("qcode is nil")
+	}
+
 	switch qc.Type {
 	case qcode.QTQuery:
-		return co.compileQuery(qc, w, vars)
-	case qcode.QTInsert, qcode.QTUpdate, qcode.QTDelete, qcode.QTUpsert:
-		return co.compileMutation(qc, w, vars)
+		return co.compileQueryWithMetadata(w, qc, vars, md)
+
+	case qcode.QTInsert,
+		qcode.QTUpdate,
+		qcode.QTDelete,
+		qcode.QTUpsert:
+		return co.compileMutation(w, qc, vars)
+
+	default:
+		return Metadata{}, fmt.Errorf("Unknown operation type %d", qc.Type)
 	}
 
-	return 0, fmt.Errorf("Unknown operation type %d", qc.Type)
 }
 
-func (co *Compiler) compileQuery(qc *qcode.QCode, w io.Writer, vars Variables) (uint32, error) {
+func (co *Compiler) compileQueryWithMetadata(
+	w io.Writer, qc *qcode.QCode, vars Variables, md Metadata) (Metadata, error) {
+
 	if len(qc.Selects) == 0 {
-		return 0, errors.New("empty query")
+		return md, errors.New("empty query")
 	}
 
-	c := &compilerContext{w, qc.Selects, co}
-
+	c := &compilerContext{md, w, qc.Selects, co}
 	st := NewIntStack()
 	i := 0
 
-	io.WriteString(c.w, `SELECT json_build_object(`)
+	io.WriteString(c.w, `SELECT jsonb_build_object(`)
 	for _, id := range qc.Roots {
-		root := &qc.Selects[id]
-		if root.SkipRender || len(root.Cols) == 0 {
-			continue
-		}
-
-		st.Push(root.ID + closeBlock)
-		st.Push(root.ID)
-
 		if i != 0 {
 			io.WriteString(c.w, `, `)
 		}
 
-		c.renderRootSelect(root)
+		root := &qc.Selects[id]
+
+		if root.SkipRender || len(root.Cols) == 0 {
+			squoted(c.w, root.FieldName)
+			io.WriteString(c.w, `, `)
+			io.WriteString(c.w, `NULL`)
+
+		} else {
+			st.Push(root.ID + closeBlock)
+			st.Push(root.ID)
+			c.renderRootSelect(root)
+		}
+
 		i++
 	}
 
-	io.WriteString(c.w, `) as "__root" FROM `)
-
-	if i == 0 {
-		return 0, ErrAllTablesSkipped
+	if st.Len() != 0 {
+		io.WriteString(c.w, `) as "__root" FROM `)
+	} else {
+		io.WriteString(c.w, `) as "__root"`)
+		return c.md, nil
 	}
 
-	var ignored uint32
-
 	for {
 		if st.Len() == 0 {
 			break
@@ -126,40 +156,40 @@ func (co *Compiler) compileQuery(qc *qcode.QCode, w io.Writer, vars Variables) (
 		if id < closeBlock {
 			sel := &c.s[id]
 
-			if len(sel.Cols) == 0 {
-				continue
-			}
-
 			ti, err := c.schema.GetTable(sel.Name)
 			if err != nil {
-				return 0, err
+				return c.md, err
 			}
 
-			if sel.ParentID == -1 {
-				io.WriteString(c.w, `(`)
-			} else {
-				c.renderLateralJoin(sel)
-			}
+			if sel.Type != qcode.STUnion {
+				if len(sel.Cols) == 0 {
+					continue
+				}
 
-			if !ti.Singular {
-				c.renderPluralSelect(sel, ti)
-			}
+				if sel.ParentID == -1 {
+					io.WriteString(c.w, `(`)
+				} else {
+					c.renderLateralJoin(sel)
+				}
 
-			skipped, err := c.renderSelect(sel, ti, vars)
-			if err != nil {
-				return 0, err
+				if !ti.IsSingular {
+					c.renderPluralSelect(sel, ti)
+				}
+
+				if err := c.renderSelect(sel, ti, vars); err != nil {
+					return c.md, err
+				}
 			}
-			ignored |= skipped
 
 			for _, cid := range sel.Children {
-				if hasBit(skipped, uint32(cid)) {
+				if hasBit(c.md.skipped, uint32(cid)) {
 					continue
 				}
 				child := &c.s[cid]
+
 				if child.SkipRender {
 					continue
 				}
-
 				st.Push(child.ID + closeBlock)
 				st.Push(child.ID)
 			}
@@ -167,43 +197,48 @@ func (co *Compiler) compileQuery(qc *qcode.QCode, w io.Writer, vars Variables) (
 		} else {
 			sel := &c.s[(id - closeBlock)]
 
-			ti, err := c.schema.GetTable(sel.Name)
-			if err != nil {
-				return 0, err
-			}
-
-			if !ti.Singular {
-				io.WriteString(c.w, `)`)
-				aliasWithID(c.w, "__sel", sel.ID)
-			}
-
-			if sel.ParentID == -1 {
-				io.WriteString(c.w, `)`)
-				aliasWithID(c.w, "__sel", sel.ID)
-
-				if st.Len() != 0 {
-					io.WriteString(c.w, `, `)
+			if sel.Type != qcode.STUnion {
+				ti, err := c.schema.GetTable(sel.Name)
+				if err != nil {
+					return c.md, err
+				}
+
+				io.WriteString(c.w, `)`)
+				aliasWithID(c.w, "__sr", sel.ID)
+
+				io.WriteString(c.w, `)`)
+				aliasWithID(c.w, "__sj", sel.ID)
+
+				if !ti.IsSingular {
+					io.WriteString(c.w, `)`)
+					aliasWithID(c.w, "__sj", sel.ID)
+				}
+
+				if sel.ParentID == -1 {
+					if st.Len() != 0 {
+						io.WriteString(c.w, `, `)
+					}
+				} else {
+					c.renderLateralJoinClose(sel)
 				}
-			} else {
-				c.renderLateralJoinClose(sel)
 			}
 
-			if len(sel.Args) != 0 {
-				i := 0
-				for _, v := range sel.Args {
-					qcode.FreeNode(v, 500)
-					i++
+			if sel.Type != qcode.STMember {
+				if len(sel.Args) != 0 {
+					for _, v := range sel.Args {
+						qcode.FreeNode(v)
+					}
 				}
 			}
 		}
 	}
 
-	return ignored, nil
+	return c.md, nil
 }
 
 func (c *compilerContext) renderPluralSelect(sel *qcode.Select, ti *DBTableInfo) error {
-	io.WriteString(c.w, `SELECT coalesce(json_agg("__sel_`)
-	int2string(c.w, sel.ID)
+	io.WriteString(c.w, `SELECT coalesce(jsonb_agg("__sj_`)
+	int32String(c.w, sel.ID)
 	io.WriteString(c.w, `"."json"), '[]') as "json"`)
 
 	if sel.Paging.Type != qcode.PtOffset {
@@ -227,7 +262,7 @@ func (c *compilerContext) renderPluralSelect(sel *qcode.Select, ti *DBTableInfo)
 		io.WriteString(c.w, `, CONCAT_WS(','`)
 		for i := 0; i < n; i++ {
 			io.WriteString(c.w, `, max("__cur_`)
-			int2string(c.w, int32(i))
+			int32String(c.w, int32(i))
 			io.WriteString(c.w, `")`)
 		}
 		io.WriteString(c.w, `) as "cursor"`)
@@ -242,8 +277,8 @@ func (c *compilerContext) renderRootSelect(sel *qcode.Select) error {
 	io.WriteString(c.w, sel.FieldName)
 	io.WriteString(c.w, `', `)
 
-	io.WriteString(c.w, `"__sel_`)
-	int2string(c.w, sel.ID)
+	io.WriteString(c.w, `"__sj_`)
+	int32String(c.w, sel.ID)
 	io.WriteString(c.w, `"."json"`)
 
 	if sel.Paging.Type != qcode.PtOffset {
@@ -251,17 +286,15 @@ func (c *compilerContext) renderRootSelect(sel *qcode.Select) error {
 		io.WriteString(c.w, sel.FieldName)
 		io.WriteString(c.w, `_cursor', `)
 
-		io.WriteString(c.w, `"__sel_`)
-		int2string(c.w, sel.ID)
+		io.WriteString(c.w, `"__sj_`)
+		int32String(c.w, sel.ID)
 		io.WriteString(c.w, `"."cursor"`)
 	}
 
 	return nil
 }
 
-func (c *compilerContext) initSelect(sel *qcode.Select, ti *DBTableInfo, vars Variables) (uint32, []*qcode.Column, error) {
-	var skipped uint32
-
+func (c *compilerContext) initSelect(sel *qcode.Select, ti *DBTableInfo, vars Variables) ([]*qcode.Column, error) {
 	cols := make([]*qcode.Column, 0, len(sel.Cols))
 	colmap := make(map[string]struct{}, len(sel.Cols))
 
@@ -303,9 +336,7 @@ func (c *compilerContext) initSelect(sel *qcode.Select, ti *DBTableInfo, vars Va
 
 		rel, err := c.schema.GetRel(child.Name, ti.Name)
 		if err != nil {
-			return 0, nil, err
-			//skipped |= (1 << uint(id))
-			//continue
+			return nil, err
 		}
 
 		switch rel.Type {
@@ -331,16 +362,25 @@ func (c *compilerContext) initSelect(sel *qcode.Select, ti *DBTableInfo, vars Va
 			if _, ok := colmap[rel.Left.Col]; !ok {
 				cols = append(cols, &qcode.Column{Table: ti.Name, Name: rel.Left.Col, FieldName: rel.Right.Col})
 				colmap[rel.Left.Col] = struct{}{}
-				skipped |= (1 << uint(id))
+				c.md.skipped |= (1 << uint(id))
+			}
+
+		case RelPolymorphic:
+			if _, ok := colmap[rel.Left.Col]; !ok {
+				cols = append(cols, &qcode.Column{Table: ti.Name, Name: rel.Left.Col, FieldName: rel.Left.Col})
+				colmap[rel.Left.Col] = struct{}{}
+			}
+			if _, ok := colmap[rel.Right.Table]; !ok {
+				cols = append(cols, &qcode.Column{Table: ti.Name, Name: rel.Right.Table, FieldName: rel.Right.Table})
+				colmap[rel.Right.Table] = struct{}{}
 			}
 
 		default:
-			return 0, nil, fmt.Errorf("unknown relationship %s", rel)
-			//skipped |= (1 << uint(id))
+			return nil, fmt.Errorf("unknown relationship %s", rel)
 		}
 	}
 
-	return skipped, cols, nil
+	return cols, nil
 }
 
 // This
@@ -409,37 +449,72 @@ func (c *compilerContext) addSeekPredicate(sel *qcode.Select) error {
 	return nil
 }
 
-func (c *compilerContext) renderSelect(sel *qcode.Select, ti *DBTableInfo, vars Variables) (uint32, error) {
+func (c *compilerContext) renderSelect(sel *qcode.Select, ti *DBTableInfo, vars Variables) error {
 	var rel *DBRel
 	var err error
 
+	// Relationships must be between union parents and their parents
 	if sel.ParentID != -1 {
-		parent := c.s[sel.ParentID]
+		if sel.Type == qcode.STMember && sel.UParentID != -1 {
+			cn := c.s[sel.ParentID].Name
+			pn := c.s[sel.UParentID].Name
+			rel, err = c.schema.GetRel(cn, pn)
 
-		rel, err = c.schema.GetRel(ti.Name, parent.Name)
-		if err != nil {
-			return 0, err
+		} else {
+			pn := c.s[sel.ParentID].Name
+			rel, err = c.schema.GetRel(ti.Name, pn)
 		}
 	}
 
-	skipped, childCols, err := c.initSelect(sel, ti, vars)
 	if err != nil {
-		return 0, err
+		return err
+	}
+
+	childCols, err := c.initSelect(sel, ti, vars)
+	if err != nil {
+		return err
 	}
 
 	// SELECT
-	io.WriteString(c.w, `SELECT json_build_object(`)
-	if err := c.renderColumns(sel, ti, skipped); err != nil {
-		return 0, err
+	// io.WriteString(c.w, `SELECT jsonb_build_object(`)
+	// if err := c.renderColumns(sel, ti, skipped); err != nil {
+	// 	return 0, err
+	// }
+
+	io.WriteString(c.w, `SELECT to_jsonb("__sr_`)
+	int32String(c.w, sel.ID)
+	io.WriteString(c.w, `".*) `)
+
+	if sel.Paging.Type != qcode.PtOffset {
+		for i := range sel.OrderBy {
+			io.WriteString(c.w, `- '__cur_`)
+			int32String(c.w, int32(i))
+			io.WriteString(c.w, `' `)
+		}
+	}
+
+	io.WriteString(c.w, `AS "json"`)
+
+	if sel.Paging.Type != qcode.PtOffset {
+		for i := range sel.OrderBy {
+			io.WriteString(c.w, `, "__cur_`)
+			int32String(c.w, int32(i))
+			io.WriteString(c.w, `"`)
+		}
+	}
+
+	io.WriteString(c.w, `FROM (SELECT `)
+
+	if err := c.renderColumns(sel, ti); err != nil {
+		return err
 	}
-	io.WriteString(c.w, `) AS "json"`)
 
 	if sel.Paging.Type != qcode.PtOffset {
 		for i, ob := range sel.OrderBy {
 			io.WriteString(c.w, `, LAST_VALUE(`)
 			colWithTableID(c.w, ti.Name, sel.ID, ob.Col)
 			io.WriteString(c.w, `) OVER() AS "__cur_`)
-			int2string(c.w, int32(i))
+			int32String(c.w, int32(i))
 			io.WriteString(c.w, `"`)
 		}
 	}
@@ -447,9 +522,8 @@ func (c *compilerContext) renderSelect(sel *qcode.Select, ti *DBTableInfo, vars
 	io.WriteString(c.w, ` FROM (`)
 
 	// FROM (SELECT .... )
-	err = c.renderBaseSelect(sel, ti, rel, childCols, skipped)
-	if err != nil {
-		return skipped, err
+	if err = c.renderBaseSelect(sel, ti, rel, childCols); err != nil {
+		return err
 	}
 
 	//fmt.Fprintf(w, `) AS "%s_%d"`, c.sel.Name, c.sel.ID)
@@ -458,7 +532,7 @@ func (c *compilerContext) renderSelect(sel *qcode.Select, ti *DBTableInfo, vars
 
 	// END-FROM
 
-	return skipped, nil
+	return nil
 }
 
 func (c *compilerContext) renderLateralJoin(sel *qcode.Select) error {
@@ -467,8 +541,8 @@ func (c *compilerContext) renderLateralJoin(sel *qcode.Select) error {
 }
 
 func (c *compilerContext) renderLateralJoinClose(sel *qcode.Select) error {
-	io.WriteString(c.w, `) `)
-	aliasWithID(c.w, "__sel", sel.ID)
+	// io.WriteString(c.w, `) `)
+	// aliasWithID(c.w, "__sj", sel.ID)
 	io.WriteString(c.w, ` ON ('true')`)
 	return nil
 }
@@ -479,41 +553,38 @@ func (c *compilerContext) renderJoin(sel *qcode.Select, ti *DBTableInfo) error {
 }
 
 func (c *compilerContext) renderJoinByName(table, parent string, id int32) error {
-	rel, err := c.schema.GetRel(table, parent)
-	if err != nil {
-		return err
-	}
+	rel, _ := c.schema.GetRel(table, parent)
 
 	// This join is only required for one-to-many relations since
 	// these make use of join tables that need to be pulled in.
-	if rel.Type != RelOneToManyThrough {
-		return err
+	if rel == nil || rel.Type != RelOneToManyThrough {
+		return nil
 	}
 
-	pt, err := c.schema.GetTable(parent)
-	if err != nil {
-		return err
-	}
+	// pt, err := c.schema.GetTable(parent)
+	// if err != nil {
+	// 	return err
+	// }
 
 	//fmt.Fprintf(w, ` LEFT OUTER JOIN "%s" ON (("%s"."%s") = ("%s_%d"."%s"))`,
 	//rel.Through, rel.Through, rel.ColT, c.parent.Name, c.parent.ID, rel.Left.Col)
 	io.WriteString(c.w, ` LEFT OUTER JOIN "`)
-	io.WriteString(c.w, rel.Through)
+	io.WriteString(c.w, rel.Through.Table)
 	io.WriteString(c.w, `" ON ((`)
-	colWithTable(c.w, rel.Through, rel.ColT)
+	colWithTable(c.w, rel.Through.Table, rel.Through.ColL)
 	io.WriteString(c.w, `) = (`)
-	colWithTableID(c.w, pt.Name, id, rel.Left.Col)
+	colWithTable(c.w, rel.Left.Table, rel.Left.Col)
 	io.WriteString(c.w, `))`)
 
 	return nil
 }
 
-func (c *compilerContext) renderColumns(sel *qcode.Select, ti *DBTableInfo, skipped uint32) error {
+func (c *compilerContext) renderColumns(sel *qcode.Select, ti *DBTableInfo) error {
 	i := 0
 	var cn string
 
 	for _, col := range sel.Cols {
-		if n := funcPrefixLen(col.Name); n != 0 {
+		if n := funcPrefixLen(c.schema.fm, col.Name); n != 0 {
 			if !sel.Functions {
 				continue
 			}
@@ -536,16 +607,15 @@ func (c *compilerContext) renderColumns(sel *qcode.Select, ti *DBTableInfo, skip
 			io.WriteString(c.w, ", ")
 		}
 
-		squoted(c.w, col.FieldName)
-		io.WriteString(c.w, ", ")
 		colWithTableID(c.w, ti.Name, sel.ID, col.Name)
+		alias(c.w, col.FieldName)
 
 		i++
 	}
 
 	i += c.renderRemoteRelColumns(sel, ti, i)
 
-	return c.renderJoinColumns(sel, ti, skipped, i)
+	return c.renderJoinColumns(sel, ti, i)
 }
 
 func (c *compilerContext) renderRemoteRelColumns(sel *qcode.Select, ti *DBTableInfo, colsRendered int) int {
@@ -562,21 +632,20 @@ func (c *compilerContext) renderRemoteRelColumns(sel *qcode.Select, ti *DBTableI
 			io.WriteString(c.w, ", ")
 		}
 
-		squoted(c.w, rel.Right.Col)
-		io.WriteString(c.w, ", ")
 		colWithTableID(c.w, ti.Name, sel.ID, rel.Left.Col)
+		alias(c.w, rel.Right.Col)
 		i++
 	}
 
 	return i
 }
 
-func (c *compilerContext) renderJoinColumns(sel *qcode.Select, ti *DBTableInfo, skipped uint32, colsRendered int) error {
+func (c *compilerContext) renderJoinColumns(sel *qcode.Select, ti *DBTableInfo, colsRendered int) error {
 	// columns previously rendered
 	i := colsRendered
 
 	for _, id := range sel.Children {
-		if hasBit(skipped, uint32(id)) {
+		if hasBit(c.md.skipped, uint32(id)) {
 			continue
 		}
 		childSel := &c.s[id]
@@ -585,23 +654,46 @@ func (c *compilerContext) renderJoinColumns(sel *qcode.Select, ti *DBTableInfo,
 			io.WriteString(c.w, ", ")
 		}
 
-		squoted(c.w, childSel.FieldName)
-
 		if childSel.SkipRender {
-			io.WriteString(c.w, `, NULL`)
+			io.WriteString(c.w, `NULL`)
+			alias(c.w, childSel.FieldName)
 			continue
 		}
 
-		io.WriteString(c.w, `, "__sel_`)
-		int2string(c.w, childSel.ID)
-		io.WriteString(c.w, `"."json"`)
+		if childSel.Type == qcode.STUnion {
+			rel, err := c.schema.GetRel(childSel.Name, ti.Name)
+			if err != nil {
+				return err
+			}
+			io.WriteString(c.w, `(CASE `)
+			for _, uid := range childSel.Children {
+				unionSel := &c.s[uid]
+
+				io.WriteString(c.w, `WHEN `)
+				colWithTableID(c.w, ti.Name, sel.ID, rel.Right.Table)
+				io.WriteString(c.w, ` = `)
+				squoted(c.w, unionSel.Name)
+				io.WriteString(c.w, ` THEN `)
+				io.WriteString(c.w, `"__sj_`)
+				int32String(c.w, unionSel.ID)
+				io.WriteString(c.w, `"."json"`)
+			}
+			io.WriteString(c.w, `END)`)
+			alias(c.w, childSel.FieldName)
+
+		} else {
+			io.WriteString(c.w, `"__sj_`)
+			int32String(c.w, childSel.ID)
+			io.WriteString(c.w, `"."json"`)
+			alias(c.w, childSel.FieldName)
+		}
 
 		if childSel.Paging.Type != qcode.PtOffset {
-			io.WriteString(c.w, `, '`)
+			io.WriteString(c.w, `, "__sj_`)
+			int32String(c.w, childSel.ID)
+			io.WriteString(c.w, `"."cursor" AS "`)
 			io.WriteString(c.w, childSel.FieldName)
-			io.WriteString(c.w, `_cursor', "__sel_`)
-			int2string(c.w, childSel.ID)
-			io.WriteString(c.w, `"."cursor"`)
+			io.WriteString(c.w, `_cursor"`)
 		}
 
 		i++
@@ -611,7 +703,7 @@ func (c *compilerContext) renderJoinColumns(sel *qcode.Select, ti *DBTableInfo,
 }
 
 func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo, rel *DBRel,
-	childCols []*qcode.Column, skipped uint32) error {
+	childCols []*qcode.Column) error {
 	isRoot := (rel == nil)
 	isFil := (sel.Where != nil && sel.Where.Op != qcode.OpNop)
 	hasOrder := len(sel.OrderBy) != 0
@@ -626,7 +718,7 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo, r
 		c.renderDistinctOn(sel, ti)
 	}
 
-	realColsRendered, isAgg, err := c.renderBaseColumns(sel, ti, childCols, skipped)
+	realColsRendered, isAgg, err := c.renderBaseColumns(sel, ti, childCols)
 	if err != nil {
 		return err
 	}
@@ -649,7 +741,8 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo, r
 		}
 
 		io.WriteString(c.w, ` WHERE (`)
-		if err := c.renderRelationship(sel, ti); err != nil {
+
+		if err := c.renderRelationship(sel, rel); err != nil {
 			return err
 		}
 		if isFil {
@@ -678,10 +771,10 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo, r
 	}
 
 	switch {
-	case ti.Singular:
+	case ti.IsSingular:
 		io.WriteString(c.w, ` LIMIT ('1') :: integer`)
 
-	case len(sel.Paging.Limit) != 0:
+	case sel.Paging.Limit != "":
 		//fmt.Fprintf(w, ` LIMIT ('%s') :: integer`, c.sel.Paging.Limit)
 		io.WriteString(c.w, ` LIMIT ('`)
 		io.WriteString(c.w, sel.Paging.Limit)
@@ -694,7 +787,7 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo, r
 		io.WriteString(c.w, ` LIMIT ('20') :: integer`)
 	}
 
-	if len(sel.Paging.Offset) != 0 {
+	if sel.Paging.Offset != "" {
 		//fmt.Fprintf(w, ` OFFSET ('%s') :: integer`, c.sel.Paging.Offset)
 		io.WriteString(c.w, ` OFFSET ('`)
 		io.WriteString(c.w, sel.Paging.Offset)
@@ -706,7 +799,7 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo, r
 
 func (c *compilerContext) renderFrom(sel *qcode.Select, ti *DBTableInfo, rel *DBRel) error {
 	if rel != nil && rel.Type == RelEmbedded {
-		// json_to_recordset('[{"a":1,"b":[1,2,3],"c":"bar"}, {"a":2,"b":[1,2,3],"c":"bar"}]') as x(a int, b text, d text);
+		// jsonb_to_recordset('[{"a":1,"b":[1,2,3],"c":"bar"}, {"a":2,"b":[1,2,3],"c":"bar"}]') as x(a int, b text, d text);
 
 		io.WriteString(c.w, `"`)
 		io.WriteString(c.w, rel.Left.Table)
@@ -753,30 +846,35 @@ func (c *compilerContext) renderCursorCTE(sel *qcode.Select) error {
 			io.WriteString(c.w, `, `)
 		}
 		io.WriteString(c.w, `a[`)
-		int2string(c.w, int32(i+1))
+		int32String(c.w, int32(i+1))
 		io.WriteString(c.w, `] as `)
 		quoted(c.w, ob.Col)
 	}
-	io.WriteString(c.w, ` FROM string_to_array('{{cursor}}', ',') as a) `)
+	io.WriteString(c.w, ` FROM string_to_array(`)
+	c.md.renderValueExp(c.w, Param{Name: "cursor", Type: "json"})
+	io.WriteString(c.w, `, ',') as a) `)
 	return nil
 }
 
-func (c *compilerContext) renderRelationship(sel *qcode.Select, ti *DBTableInfo) error {
-	parent := c.s[sel.ParentID]
-
-	pti, err := c.schema.GetTable(parent.Name)
-	if err != nil {
-		return err
-	}
-
-	return c.renderRelationshipByName(ti.Name, pti.Name, parent.ID)
-}
-
-func (c *compilerContext) renderRelationshipByName(table, parent string, id int32) error {
+func (c *compilerContext) renderRelationshipByName(table, parent string) error {
 	rel, err := c.schema.GetRel(table, parent)
 	if err != nil {
 		return err
 	}
+	return c.renderRelationship(nil, rel)
+}
+
+func (c *compilerContext) renderRelationship(sel *qcode.Select, rel *DBRel) error {
+	var pid int32
+
+	switch {
+	case sel == nil:
+		pid = int32(-1)
+	case sel.Type == qcode.STMember:
+		pid = sel.UParentID
+	default:
+		pid = sel.ParentID
+	}
 
 	io.WriteString(c.w, `((`)
 
@@ -788,19 +886,19 @@ func (c *compilerContext) renderRelationshipByName(table, parent string, id int3
 
 		switch {
 		case !rel.Left.Array && rel.Right.Array:
-			colWithTable(c.w, table, rel.Left.Col)
+			colWithTable(c.w, rel.Left.Table, rel.Left.Col)
 			io.WriteString(c.w, `) = any (`)
-			colWithTableID(c.w, parent, id, rel.Right.Col)
+			colWithTableID(c.w, rel.Right.Table, pid, rel.Right.Col)
 
 		case rel.Left.Array && !rel.Right.Array:
-			colWithTableID(c.w, parent, id, rel.Right.Col)
+			colWithTableID(c.w, rel.Right.Table, pid, rel.Right.Col)
 			io.WriteString(c.w, `) = any (`)
-			colWithTable(c.w, table, rel.Left.Col)
+			colWithTable(c.w, rel.Left.Table, rel.Left.Col)
 
 		default:
-			colWithTable(c.w, table, rel.Left.Col)
+			colWithTable(c.w, rel.Left.Table, rel.Left.Col)
 			io.WriteString(c.w, `) = (`)
-			colWithTableID(c.w, parent, id, rel.Right.Col)
+			colWithTableID(c.w, rel.Right.Table, pid, rel.Right.Col)
 		}
 
 	case RelOneToManyThrough:
@@ -810,25 +908,34 @@ func (c *compilerContext) renderRelationshipByName(table, parent string, id int3
 
 		switch {
 		case !rel.Left.Array && rel.Right.Array:
-			colWithTable(c.w, table, rel.Left.Col)
+			colWithTable(c.w, rel.Left.Table, rel.Left.Col)
 			io.WriteString(c.w, `) = any (`)
-			colWithTable(c.w, rel.Through, rel.Right.Col)
+			colWithTable(c.w, rel.Through.Table, rel.Through.ColR)
 
 		case rel.Left.Array && !rel.Right.Array:
-			colWithTable(c.w, rel.Through, rel.Right.Col)
+			colWithTable(c.w, rel.Through.Table, rel.Through.ColR)
 			io.WriteString(c.w, `) = any (`)
-			colWithTable(c.w, table, rel.Left.Col)
+			colWithTable(c.w, rel.Left.Table, rel.Left.Col)
 
 		default:
-			colWithTable(c.w, table, rel.Left.Col)
+			colWithTable(c.w, rel.Through.Table, rel.Through.ColR)
 			io.WriteString(c.w, `) = (`)
-			colWithTable(c.w, rel.Through, rel.Right.Col)
+			colWithTable(c.w, rel.Right.Table, rel.Right.Col)
 		}
 
 	case RelEmbedded:
 		colWithTable(c.w, rel.Left.Table, rel.Left.Col)
 		io.WriteString(c.w, `) = (`)
-		colWithTableID(c.w, parent, id, rel.Left.Col)
+		colWithTableID(c.w, rel.Left.Table, pid, rel.Left.Col)
+
+	case RelPolymorphic:
+		colWithTable(c.w, sel.Name, rel.Right.Col)
+		io.WriteString(c.w, `) = (`)
+		colWithTableID(c.w, rel.Left.Table, pid, rel.Left.Col)
+		io.WriteString(c.w, `) AND (`)
+		colWithTableID(c.w, rel.Left.Table, pid, rel.Right.Table)
+		io.WriteString(c.w, `) = (`)
+		squoted(c.w, sel.Name)
 	}
 
 	io.WriteString(c.w, `))`)
@@ -893,8 +1000,6 @@ func (c *compilerContext) renderExp(ex *qcode.Exp, ti *DBTableInfo, skipNested b
 				st.Push('(')
 
 			case qcode.OpNot:
-				//fmt.Printf("1> %s %d %s %s\n", val.Op, len(val.Children), val.Children[0].Op, val.Children[1].Op)
-
 				st.Push(val.Children[0])
 				st.Push(qcode.OpNot)
 
@@ -906,11 +1011,8 @@ func (c *compilerContext) renderExp(ex *qcode.Exp, ti *DBTableInfo, skipNested b
 						return err
 					}
 
-				} else {
-					//fmt.Fprintf(w, `(("%s"."%s") `, c.sel.Name, val.Col)
-					if err := c.renderOp(val, ti); err != nil {
-						return err
-					}
+				} else if err := c.renderOp(val, ti); err != nil {
+					return err
 				}
 			}
 			//qcode.FreeExp(val)
@@ -943,7 +1045,7 @@ func (c *compilerContext) renderNestedWhere(ex *qcode.Exp, ti *DBTableInfo) erro
 
 		io.WriteString(c.w, ` WHERE `)
 
-		if err := c.renderRelationshipByName(cti.Name, ti.Name, -1); err != nil {
+		if err := c.renderRelationshipByName(cti.Name, ti.Name); err != nil {
 			return err
 		}
 
@@ -972,7 +1074,7 @@ func (c *compilerContext) renderOp(ex *qcode.Exp, ti *DBTableInfo) error {
 		return nil
 	}
 
-	if len(ex.Col) != 0 {
+	if ex.Col != "" {
 		if col, ok = ti.ColMap[ex.Col]; !ok {
 			return fmt.Errorf("no column '%s' found ", ex.Col)
 		}
@@ -1000,9 +1102,9 @@ func (c *compilerContext) renderOp(ex *qcode.Exp, ti *DBTableInfo) error {
 	case qcode.OpLesserThan:
 		io.WriteString(c.w, `<`)
 	case qcode.OpIn:
-		io.WriteString(c.w, `IN`)
+		io.WriteString(c.w, `= ANY`)
 	case qcode.OpNotIn:
-		io.WriteString(c.w, `NOT IN`)
+		io.WriteString(c.w, `!= ANY`)
 	case qcode.OpLike:
 		io.WriteString(c.w, `LIKE`)
 	case qcode.OpNotLike:
@@ -1052,12 +1154,13 @@ func (c *compilerContext) renderOp(ex *qcode.Exp, ti *DBTableInfo) error {
 		io.WriteString(c.w, `((`)
 		colWithTable(c.w, ti.Name, ti.TSVCol.Name)
 		if c.schema.ver >= 110000 {
-			io.WriteString(c.w, `) @@ websearch_to_tsquery('{{`)
+			io.WriteString(c.w, `) @@ websearch_to_tsquery(`)
 		} else {
-			io.WriteString(c.w, `) @@ to_tsquery('{{`)
+			io.WriteString(c.w, `) @@ to_tsquery(`)
 		}
-		io.WriteString(c.w, ex.Val)
-		io.WriteString(c.w, `}}'))`)
+		c.md.renderValueExp(c.w, Param{Name: ex.Val, Type: "string"})
+		io.WriteString(c.w, `))`)
+
 		return nil
 
 	default:
@@ -1143,15 +1246,25 @@ func (c *compilerContext) renderVal(ex *qcode.Exp, vars map[string]string, col *
 		val, ok := vars[ex.Val]
 		switch {
 		case ok && strings.HasPrefix(val, "sql:"):
-			io.WriteString(c.w, ` (`)
-			io.WriteString(c.w, val[4:])
+			io.WriteString(c.w, `(`)
+			c.md.RenderVar(c.w, val[4:])
 			io.WriteString(c.w, `)`)
+
 		case ok:
 			squoted(c.w, val)
+
+		case ex.Op == qcode.OpIn || ex.Op == qcode.OpNotIn:
+			io.WriteString(c.w, `(ARRAY(SELECT json_array_elements_text(`)
+			c.md.renderValueExp(c.w, Param{Name: ex.Val, Type: col.Type, IsArray: true})
+			io.WriteString(c.w, `))`)
+
+			io.WriteString(c.w, ` :: `)
+			io.WriteString(c.w, col.Type)
+			io.WriteString(c.w, `[])`)
+			return
+
 		default:
-			io.WriteString(c.w, ` '{{`)
-			io.WriteString(c.w, ex.Val)
-			io.WriteString(c.w, `}}'`)
+			c.md.renderValueExp(c.w, Param{Name: ex.Val, Type: col.Type, IsArray: false})
 		}
 
 	case qcode.ValRef:
@@ -1165,7 +1278,7 @@ func (c *compilerContext) renderVal(ex *qcode.Exp, vars map[string]string, col *
 	io.WriteString(c.w, col.Type)
 }
 
-func funcPrefixLen(fn string) int {
+func funcPrefixLen(fm map[string]*DBFunction, fn string) int {
 	switch {
 	case strings.HasPrefix(fn, "avg_"):
 		return 4
@@ -1190,10 +1303,18 @@ func funcPrefixLen(fn string) int {
 	case strings.HasPrefix(fn, "var_samp_"):
 		return 9
 	}
+	fnLen := len(fn)
+
+	for k := range fm {
+		kLen := len(k)
+		if kLen < fnLen && k[0] == fn[0] && strings.HasPrefix(fn, k) && fn[kLen] == '_' {
+			return kLen + 1
+		}
+	}
 	return 0
 }
 
-func hasBit(n uint32, pos uint32) bool {
+func hasBit(n, pos uint32) bool {
 	val := n & (1 << pos)
 	return (val > 0)
 }
@@ -1208,7 +1329,7 @@ func aliasWithID(w io.Writer, alias string, id int32) {
 	io.WriteString(w, ` AS "`)
 	io.WriteString(w, alias)
 	io.WriteString(w, `_`)
-	int2string(w, id)
+	int32String(w, id)
 	io.WriteString(w, `"`)
 }
 
@@ -1225,7 +1346,7 @@ func colWithTableID(w io.Writer, table string, id int32, col string) {
 	io.WriteString(w, table)
 	if id >= 0 {
 		io.WriteString(w, `_`)
-		int2string(w, id)
+		int32String(w, id)
 	}
 	io.WriteString(w, `"."`)
 	io.WriteString(w, col)
@@ -1244,26 +1365,6 @@ func squoted(w io.Writer, identifier string) {
 	io.WriteString(w, `'`)
 }
 
-const charset = "0123456789"
-
-func int2string(w io.Writer, val int32) {
-	if val < 10 {
-		w.Write([]byte{charset[val]})
-		return
-	}
-
-	temp := int32(0)
-	val2 := val
-	for val2 > 0 {
-		temp *= 10
-		temp += val2 % 10
-		val2 = int32(float64(val2 / 10))
-	}
-
-	val3 := temp
-	for val3 > 0 {
-		d := val3 % 10
-		val3 /= 10
-		w.Write([]byte{charset[d]})
-	}
+func int32String(w io.Writer, val int32) {
+	io.WriteString(w, strconv.FormatInt(int64(val), 10))
 }

core/internal/psql/query_test.go

@@ -1,4 +1,4 @@
-package psql
+package psql_test
 
 import (
 	"bytes"
@@ -32,6 +32,20 @@ func withComplexArgs(t *testing.T) {
 	compileGQLToPSQL(t, gql, nil, "user")
 }
 
+func withWhereIn(t *testing.T) {
+	gql := `query {
+		products(where: { id: { in: $list } }) {
+			id
+		}
+	}`
+
+	vars := map[string]json.RawMessage{
+		"list": json.RawMessage(`[1,2,3]`),
+	}
+
+	compileGQLToPSQL(t, gql, vars, "user")
+}
+
 func withWhereAndList(t *testing.T) {
 	gql := `query {
 		products(
@@ -293,6 +307,100 @@ func multiRoot(t *testing.T) {
 	compileGQLToPSQL(t, gql, nil, "user")
 }
 
+func withFragment1(t *testing.T) {
+	gql := `
+	fragment userFields1 on user {
+		id
+		email
+	}
+
+	query {
+		users {
+			...userFields2
+	
+			created_at
+			...userFields1
+		}
+	}
+	
+	fragment userFields2 on user {
+		first_name
+		last_name
+	}`
+
+	compileGQLToPSQL(t, gql, nil, "anon")
+}
+
+func withFragment2(t *testing.T) {
+	gql := `
+	query {
+		users {
+			...userFields2
+	
+			created_at
+			...userFields1
+		}
+	}
+
+	fragment userFields1 on user {
+		id
+		email
+	}
+	
+	fragment userFields2 on user {
+		first_name
+		last_name
+	}`
+
+	compileGQLToPSQL(t, gql, nil, "anon")
+}
+
+func withFragment3(t *testing.T) {
+	gql := `
+
+	fragment userFields1 on user {
+		id
+		email
+	}
+	
+	fragment userFields2 on user {
+		first_name
+		last_name
+	}
+
+	query {
+		users {
+			...userFields2
+	
+			created_at
+			...userFields1
+		}
+	}
+`
+
+	compileGQLToPSQL(t, gql, nil, "anon")
+}
+
+// func withInlineFragment(t *testing.T) {
+// 	gql := `
+// 	query {
+// 		users {
+// 			... on users {
+// 				id
+// 				email
+// 			}
+// 			created_at
+// 			... on user {
+// 				first_name
+// 				last_name
+// 			}
+// 		}
+// 	}
+// `
+
+// 	compileGQLToPSQL(t, gql, nil, "anon")
+// }
+
 func withCursor(t *testing.T) {
 	gql := `query {
 		Products(
@@ -367,6 +475,7 @@ func blockedFunctions(t *testing.T) {
 
 func TestCompileQuery(t *testing.T) {
 	t.Run("withComplexArgs", withComplexArgs)
+	t.Run("withWhereIn", withWhereIn)
 	t.Run("withWhereAndList", withWhereAndList)
 	t.Run("withWhereIsNull", withWhereIsNull)
 	t.Run("withWhereMultiOr", withWhereMultiOr)
@@ -385,6 +494,10 @@ func TestCompileQuery(t *testing.T) {
 	t.Run("queryWithVariables", queryWithVariables)
 	t.Run("withWhereOnRelations", withWhereOnRelations)
 	t.Run("multiRoot", multiRoot)
+	t.Run("withFragment1", withFragment1)
+	t.Run("withFragment2", withFragment2)
+	t.Run("withFragment3", withFragment3)
+	//t.Run("withInlineFragment", withInlineFragment)
 	t.Run("jsonColumnAsTable", jsonColumnAsTable)
 	t.Run("withCursor", withCursor)
 	t.Run("nullForAuthRequiredInAnon", nullForAuthRequiredInAnon)
@@ -429,7 +542,7 @@ func BenchmarkCompile(b *testing.B) {
 			b.Fatal(err)
 		}
 
-		_, err = pcompile.Compile(qc, w, nil)
+		_, err = pcompile.Compile(w, qc, nil)
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -450,7 +563,7 @@ func BenchmarkCompileParallel(b *testing.B) {
 				b.Fatal(err)
 			}
 
-			_, err = pcompile.Compile(qc, w, nil)
+			_, err = pcompile.Compile(w, qc, nil)
 			if err != nil {
 				b.Fatal(err)
 			}

core/internal/psql/schema.go

@@ -11,17 +11,21 @@ type DBSchema struct {
 	ver int
 	t   map[string]*DBTableInfo
 	rm  map[string]map[string]*DBRel
+	vt  map[string]*VirtualTable
+	fm  map[string]*DBFunction
 }
 
 type DBTableInfo struct {
 	Name       string
 	Type       string
-	Singular   bool
+	IsSingular bool
 	Columns    []DBColumn
 	PrimaryCol *DBColumn
 	TSVCol     *DBColumn
 	ColMap     map[string]*DBColumn
 	ColIDMap   map[int16]*DBColumn
+	Singular   string
+	Plural     string
 }
 
 type RelType int
@@ -30,15 +34,19 @@ const (
 	RelOneToOne RelType = iota + 1
 	RelOneToMany
 	RelOneToManyThrough
+	RelPolymorphic
 	RelEmbedded
 	RelRemote
 )
 
 type DBRel struct {
 	Type    RelType
-	Through string
-	ColT    string
-	Left    struct {
+	Through struct {
+		Table string
+		ColL  string
+		ColR  string
+	}
+	Left struct {
 		col   *DBColumn
 		Table string
 		Col   string
@@ -54,8 +62,11 @@ type DBRel struct {
 
 func NewDBSchema(info *DBInfo, aliases map[string][]string) (*DBSchema, error) {
 	schema := &DBSchema{
-		t:  make(map[string]*DBTableInfo),
-		rm: make(map[string]map[string]*DBRel),
+		ver: info.Version,
+		t:   make(map[string]*DBTableInfo),
+		rm:  make(map[string]map[string]*DBRel),
+		vt:  make(map[string]*VirtualTable),
+		fm:  make(map[string]*DBFunction, len(info.Functions)),
 	}
 
 	for i, t := range info.Tables {
@@ -65,6 +76,10 @@ func NewDBSchema(info *DBInfo, aliases map[string][]string) (*DBSchema, error) {
 		}
 	}
 
+	if err := schema.virtualRels(info.VTables); err != nil {
+		return nil, err
+	}
+
 	for i, t := range info.Tables {
 		err := schema.firstDegreeRels(t, info.Columns[i])
 		if err != nil {
@@ -79,6 +94,12 @@ func NewDBSchema(info *DBInfo, aliases map[string][]string) (*DBSchema, error) {
 		}
 	}
 
+	for k, f := range info.Functions {
+		if len(f.Params) == 1 {
+			schema.fm[strings.ToLower(f.Name)] = &info.Functions[k]
+		}
+	}
+
 	return schema, nil
 }
 
@@ -89,32 +110,39 @@ func (s *DBSchema) addTable(
 	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,
+
+	ts := &DBTableInfo{
+		Name:       t.Name,
+		Type:       t.Type,
+		IsSingular: true,
+		Columns:    cols,
+		ColMap:     colmap,
+		ColIDMap:   colidmap,
+		Singular:   singular,
+		Plural:     plural,
 	}
+	s.t[singular] = ts
+
+	tp := &DBTableInfo{
+		Name:       t.Name,
+		Type:       t.Type,
+		IsSingular: false,
+		Columns:    cols,
+		ColMap:     colmap,
+		ColIDMap:   colidmap,
+		Singular:   singular,
+		Plural:     plural,
+	}
+	s.t[plural] = tp
 
 	if al, ok := aliases[t.Key]; ok {
 		for i := range al {
 			k1 := flect.Singularize(al[i])
-			s.t[k1] = s.t[singular]
+			s.t[k1] = ts
 
 			k2 := flect.Pluralize(al[i])
-			s.t[k2] = s.t[plural]
+			s.t[k2] = tp
 		}
 	}
 
@@ -138,6 +166,54 @@ func (s *DBSchema) addTable(
 	return nil
 }
 
+func (s *DBSchema) virtualRels(vts []VirtualTable) error {
+	for _, vt := range vts {
+		s.vt[vt.Name] = &vt
+
+		for _, t := range s.t {
+			idCol, ok := t.ColMap[vt.IDColumn]
+			if !ok {
+				continue
+			}
+			if _, ok = t.ColMap[vt.TypeColumn]; !ok {
+				continue
+			}
+
+			nt := DBTable{
+				ID:   -1,
+				Name: vt.Name,
+				Key:  strings.ToLower(vt.Name),
+				Type: "virtual",
+			}
+
+			if err := s.addTable(nt, nil, nil); err != nil {
+				return err
+			}
+
+			rel := &DBRel{Type: RelPolymorphic}
+			rel.Left.col = idCol
+			rel.Left.Table = t.Name
+			rel.Left.Col = idCol.Name
+
+			rcol := DBColumn{
+				Name: vt.FKeyColumn,
+				Key:  strings.ToLower(vt.FKeyColumn),
+				Type: idCol.Type,
+			}
+
+			rel.Right.col = &rcol
+			rel.Right.Table = vt.TypeColumn
+			rel.Right.Col = rcol.Name
+
+			if err := s.SetRel(vt.Name, t.Name, rel); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
 func (s *DBSchema) firstDegreeRels(t DBTable, cols []DBColumn) error {
 	ct := t.Key
 	cti, ok := s.t[ct]
@@ -148,7 +224,7 @@ func (s *DBSchema) firstDegreeRels(t DBTable, cols []DBColumn) error {
 	for i := range cols {
 		c := cols[i]
 
-		if len(c.FKeyTable) == 0 {
+		if c.FKeyTable == "" {
 			continue
 		}
 
@@ -252,7 +328,7 @@ func (s *DBSchema) secondDegreeRels(t DBTable, cols []DBColumn) error {
 	for i := range cols {
 		c := cols[i]
 
-		if len(c.FKeyTable) == 0 {
+		if c.FKeyTable == "" {
 			continue
 		}
 
@@ -328,16 +404,17 @@ func (s *DBSchema) updateSchemaOTMT(
 	// 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.Through.Table = ti.Name
+	rel1.Through.ColL = col1.Name
+	rel1.Through.ColR = col2.Name
 
-	rel1.Left.col = &col2
-	rel1.Left.Table = col2.FKeyTable
-	rel1.Left.Col = fc2.Name
+	rel1.Left.col = fc1
+	rel1.Left.Table = col1.FKeyTable
+	rel1.Left.Col = fc1.Name
 
-	rel1.Right.col = &col1
-	rel1.Right.Table = ti.Name
-	rel1.Right.Col = col1.Name
+	rel1.Right.col = fc2
+	rel1.Right.Table = t2
+	rel1.Right.Col = fc2.Name
 
 	if err := s.SetRel(t1, t2, rel1); err != nil {
 		return err
@@ -346,16 +423,17 @@ func (s *DBSchema) updateSchemaOTMT(
 	// 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
+	rel2.Through.Table = ti.Name
+	rel2.Through.ColL = col2.Name
+	rel2.Through.ColR = col1.Name
 
-	rel1.Left.col = fc1
-	rel2.Left.Table = col1.FKeyTable
-	rel2.Left.Col = fc1.Name
+	rel2.Left.col = fc2
+	rel2.Left.Table = col2.FKeyTable
+	rel2.Left.Col = fc2.Name
 
-	rel1.Right.col = &col2
-	rel2.Right.Table = ti.Name
-	rel2.Right.Col = col2.Name
+	rel2.Right.col = fc1
+	rel2.Right.Table = t1
+	rel2.Right.Col = fc1.Name
 
 	if err := s.SetRel(t2, t1, rel2); err != nil {
 		return err
@@ -364,6 +442,14 @@ func (s *DBSchema) updateSchemaOTMT(
 	return nil
 }
 
+func (s *DBSchema) GetTableNames() []string {
+	var names []string
+	for name := range s.t {
+		names = append(names, name)
+	}
+	return names
+}
+
 func (s *DBSchema) GetTable(table string) (*DBTableInfo, error) {
 	t, ok := s.t[table]
 	if !ok {
@@ -424,3 +510,11 @@ func (s *DBSchema) GetRel(child, parent string) (*DBRel, error) {
 	}
 	return rel, nil
 }
+
+func (s *DBSchema) GetFunctions() []*DBFunction {
+	var funcs []*DBFunction
+	for _, f := range s.fm {
+		funcs = append(funcs, f)
+	}
+	return funcs
+}

core/internal/psql/strings.go

@@ -14,14 +14,18 @@ func (rt RelType) String() string {
 		return "remote"
 	case RelEmbedded:
 		return "embedded"
+	case RelPolymorphic:
+		return "polymorphic"
 	}
 	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.%s)--> '%s.%s'",
+			re.Left.Table, re.Left.Col,
+			re.Through.Table, re.Through.ColL, re.Through.Table, re.Through.ColR,
+			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,34 +1,35 @@
 package psql
 
 import (
-	"context"
+	"database/sql"
 	"fmt"
 	"strconv"
 	"strings"
 
 	"github.com/jackc/pgtype"
-	"github.com/jackc/pgx/v4/pgxpool"
 )
 
 type DBInfo struct {
-	Version int
-	Tables  []DBTable
-	Columns [][]DBColumn
-	colmap  map[string]map[string]*DBColumn
+	Version   int
+	Tables    []DBTable
+	Columns   [][]DBColumn
+	Functions []DBFunction
+	VTables   []VirtualTable
+	colMap    map[string]map[string]*DBColumn
 }
 
-func GetDBInfo(db *pgxpool.Pool) (*DBInfo, error) {
+type VirtualTable struct {
+	Name       string
+	IDColumn   string
+	TypeColumn string
+	FKeyColumn string
+}
+
+func GetDBInfo(db *sql.DB, schema string) (*DBInfo, error) {
 	di := &DBInfo{}
-
-	dbc, err := db.Acquire(context.Background())
-	if err != nil {
-		return nil, fmt.Errorf("error acquiring connection from pool: %w", err)
-	}
-	defer dbc.Release()
-
 	var version string
 
-	err = dbc.QueryRow(context.Background(), `SHOW server_version_num`).Scan(&version)
+	err := db.QueryRow(`SHOW server_version_num`).Scan(&version)
 	if err != nil {
 		return nil, fmt.Errorf("error fetching version: %w", err)
 	}
@@ -38,46 +39,61 @@ func GetDBInfo(db *pgxpool.Pool) (*DBInfo, error) {
 		return nil, err
 	}
 
-	di.Tables, err = GetTables(dbc)
+	di.Tables, err = GetTables(db, schema)
 	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(dbc, "public", t.Name)
+	for _, t := range di.Tables {
+		cols, err := GetColumns(db, schema, 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]
-		}
+	di.colMap = newColMap(di.Tables, di.Columns)
+
+	di.Functions, err = GetFunctions(db, schema)
+	if err != nil {
+		return nil, err
 	}
 
 	return di, nil
 }
 
+func newColMap(tables []DBTable, columns [][]DBColumn) map[string]map[string]*DBColumn {
+	cm := make(map[string]map[string]*DBColumn, len(tables))
+
+	for i, t := range tables {
+		cols := columns[i]
+		cm[t.Key] = make(map[string]*DBColumn, len(cols))
+
+		for n, c := range cols {
+			cm[t.Key][c.Key] = &columns[i][n]
+		}
+	}
+
+	return cm
+}
+
 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))
+	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.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)]
+	v, ok := di.colMap[strings.ToLower(table)][strings.ToLower(column)]
 	return v, ok
 }
 
@@ -88,7 +104,7 @@ type DBTable struct {
 	Type string
 }
 
-func GetTables(dbc *pgxpool.Conn) ([]DBTable, error) {
+func GetTables(db *sql.DB, schema string) ([]DBTable, error) {
 	sqlStmt := `
 SELECT
 	c.relname as "name",
@@ -100,14 +116,12 @@ SELECT
 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);`
+	AND n.nspname = $1
+	AND pg_catalog.pg_table_is_visible(c.oid);`
 
 	var tables []DBTable
 
-	rows, err := dbc.Query(context.Background(), sqlStmt)
+	rows, err := db.Query(sqlStmt, schema)
 	if err != nil {
 		return nil, fmt.Errorf("Error fetching tables: %s", err)
 	}
@@ -142,7 +156,7 @@ type DBColumn struct {
 	fKeyColID  pgtype.Int2Array
 }
 
-func GetColumns(dbc *pgxpool.Conn, schema, table string) ([]DBColumn, error) {
+func GetColumns(db *sql.DB, schema, table string) ([]DBColumn, error) {
 	sqlStmt := `
 SELECT  
 	f.attnum AS id,  
@@ -183,7 +197,7 @@ WHERE c.relkind IN ('r', 'v', 'm', 'f')
 	AND f.attisdropped = false
 ORDER BY id;`
 
-	rows, err := dbc.Query(context.Background(), sqlStmt, schema, table)
+	rows, err := db.Query(sqlStmt, schema, table)
 	if err != nil {
 		return nil, fmt.Errorf("error fetching columns: %s", err)
 	}
@@ -245,6 +259,71 @@ ORDER BY id;`
 	return cols, nil
 }
 
+type DBFunction struct {
+	Name   string
+	Params []DBFuncParam
+}
+
+type DBFuncParam struct {
+	ID   int
+	Name sql.NullString
+	Type string
+}
+
+func GetFunctions(db *sql.DB, schema string) ([]DBFunction, error) {
+	sqlStmt := `
+SELECT 
+	routines.routine_name, 
+	parameters.specific_name,
+	parameters.data_type, 
+	parameters.parameter_name,
+	parameters.ordinal_position	
+FROM 
+	information_schema.routines
+RIGHT JOIN 
+	information_schema.parameters 
+	ON (routines.specific_name = parameters.specific_name and parameters.ordinal_position IS NOT NULL)	
+WHERE 
+	routines.specific_schema = $1
+ORDER BY 
+	routines.routine_name, parameters.ordinal_position;`
+
+	rows, err := db.Query(sqlStmt, schema)
+	if err != nil {
+		return nil, fmt.Errorf("Error fetching functions: %s", err)
+	}
+	defer rows.Close()
+
+	var funcs []DBFunction
+	fm := make(map[string]int)
+
+	parameterIndex := 1
+	for rows.Next() {
+		var fn, fid string
+		fp := DBFuncParam{}
+
+		err = rows.Scan(&fn, &fid, &fp.Type, &fp.Name, &fp.ID)
+		if err != nil {
+			return nil, err
+		}
+
+		if !fp.Name.Valid {
+			fp.Name.String = string(parameterIndex)
+			fp.Name.Valid = true
+		}
+
+		if i, ok := fm[fid]; ok {
+			funcs[i].Params = append(funcs[i].Params, fp)
+		} else {
+			funcs = append(funcs, DBFunction{Name: fn, Params: []DBFuncParam{fp}})
+			fm[fid] = len(funcs) - 1
+		}
+		parameterIndex++
+	}
+
+	return funcs, nil
+}
+
 // func GetValType(type string) qcode.ValType {
 // 	switch {
 // 		case "bigint", "integer", "smallint", "numeric", "bigserial":

core/internal/psql/test_dbinfo.go

@@ -1,11 +1,10 @@
 package psql
 
 import (
-	"log"
 	"strings"
 )
 
-func getTestSchema() *DBSchema {
+func GetTestDBInfo() *DBInfo {
 	tables := []DBTable{
 		DBTable{Name: "customers", Type: "table"},
 		DBTable{Name: "users", Type: "table"},
@@ -74,36 +73,19 @@ func getTestSchema() *DBSchema {
 		}
 	}
 
-	schema := &DBSchema{
-		ver: 110000,
-		t:   make(map[string]*DBTableInfo),
-		rm:  make(map[string]map[string]*DBRel),
+	return &DBInfo{
+		Version:   110000,
+		Tables:    tables,
+		Columns:   columns,
+		Functions: []DBFunction{},
+		colMap:    newColMap(tables, columns),
 	}
+}
 
+func GetTestSchema() (*DBSchema, error) {
 	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
+	return NewDBSchema(GetTestDBInfo(), aliases)
 }

core/internal/psql/tests.sql

@@ -0,0 +1,163 @@
+=== RUN   TestCompileInsert
+=== RUN   TestCompileInsert/simpleInsert
+WITH "_sg_input" AS (SELECT $1 :: 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 $1 :: 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 $1 :: 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 $1 :: 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, $2 :: 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 $1 :: 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 $1 :: 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 $1 :: 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 $1 :: 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 $1 :: 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 $1 :: 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 $1 :: 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.03s)
+    --- 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 $1 :: 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 $1 :: 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 $1 :: 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.01s)
+    --- 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/withWhereIn
+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" FROM (SELECT "products"."id" FROM "products" WHERE ((((("products"."price") > '0' :: numeric(7,2)) AND (("products"."price") < '8' :: numeric(7,2))) AND (("products"."id") = ANY (ARRAY(SELECT json_array_elements_text($1)) :: bigint[])))) LIMIT ('20') :: 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") = $1 :: 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($1)) AS "search_rank", ts_headline("products"."description", websearch_to_tsquery($1)) AS "search_headline_description" FROM "products" WHERE ((("products"."tsv") @@ websearch_to_tsquery($1))) 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"."customer_id") = ("customers"."id")) WHERE ((("purchases"."product_id") = ("products"."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"."product_id") = ("products"."id")) WHERE ((("purchases"."customer_id") = ("customers"."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") = $1 :: 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") = $1 :: numeric(7,2)) AND (("products"."id") = $2 :: 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"."customer_id") = ("customers"."id")) WHERE ((("purchases"."product_id") = ("products"."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"."customer_id") = ("customers"."id")) WHERE ((("purchases"."product_id") = ("products"."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/withFragment1
+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"."first_name" AS "first_name", "users_0"."last_name" AS "last_name", "users_0"."created_at" AS "created_at", "users_0"."id" AS "id", "users_0"."email" AS "email" FROM (SELECT , "users"."created_at", "users"."id", "users"."email" FROM "users" GROUP BY "users"."created_at", "users"."id", "users"."email" LIMIT ('20') :: integer) AS "users_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
+=== RUN   TestCompileQuery/withFragment2
+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"."first_name" AS "first_name", "users_0"."last_name" AS "last_name", "users_0"."created_at" AS "created_at", "users_0"."id" AS "id", "users_0"."email" AS "email" FROM (SELECT , "users"."created_at", "users"."id", "users"."email" FROM "users" GROUP BY "users"."created_at", "users"."id", "users"."email" LIMIT ('20') :: integer) AS "users_0") AS "__sr_0") AS "__sj_0") AS "__sj_0"
+=== RUN   TestCompileQuery/withFragment3
+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"."first_name" AS "first_name", "users_0"."last_name" AS "last_name", "users_0"."created_at" AS "created_at", "users_0"."id" AS "id", "users_0"."email" AS "email" FROM (SELECT , "users"."created_at", "users"."id", "users"."email" FROM "users" GROUP BY "users"."created_at", "users"."id", "users"."email" LIMIT ('20') :: integer) AS "users_0") AS "__sr_0") AS "__sj_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($1, ',') 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.03s)
+    --- PASS: TestCompileQuery/withComplexArgs (0.00s)
+    --- PASS: TestCompileQuery/withWhereIn (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/withFragment1 (0.00s)
+    --- PASS: TestCompileQuery/withFragment2 (0.00s)
+    --- PASS: TestCompileQuery/withFragment3 (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 $1 :: 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") = $2 :: 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 $1 :: 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") = $2 :: 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 $1 :: 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") = $2 :: 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 $1 :: 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") = $2 :: 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 $1 :: 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 $1 :: 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") = $2 :: 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 $1 :: 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") = $2 :: 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 $1 :: 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") = $2 :: 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 $1 :: 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") = $2 :: 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 $1 :: 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") = $2 :: 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.323s

core/internal/psql/update.go

@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/dosco/super-graph/qcode"
-	"github.com/dosco/super-graph/util"
+	"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) {
+func (c *compilerContext) renderUpdate(
+	w io.Writer, qc *qcode.QCode, vars Variables, ti *DBTableInfo) (uint32, error) {
 
 	update, ok := vars[qc.ActionVar]
 	if !ok {
@@ -21,9 +21,10 @@ func (c *compilerContext) renderUpdate(qc *qcode.QCode, w io.Writer,
 		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)`)
+	io.WriteString(c.w, `WITH "_sg_input" AS (SELECT `)
+	c.md.renderValueExp(c.w, Param{Name: qc.ActionVar, Type: "json"})
+	// 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})
@@ -84,32 +85,16 @@ func (c *compilerContext) renderUpdateStmt(w io.Writer, qc *qcode.QCode, item re
 	io.WriteString(w, `UPDATE `)
 	quoted(w, ti.Name)
 	io.WriteString(w, ` SET (`)
-	renderInsertUpdateColumns(w, qc, jt, ti, sk, false)
+	c.renderInsertUpdateColumns(qc, jt, ti, sk, false)
 	renderNestedUpdateRelColumns(w, item.kvitem, false)
 
 	io.WriteString(w, `) = (SELECT `)
-	renderInsertUpdateColumns(w, qc, jt, ti, sk, true)
+	c.renderInsertUpdateColumns(qc, jt, ti, sk, true)
 	renderNestedUpdateRelColumns(w, item.kvitem, true)
 
-	io.WriteString(w, ` FROM "_sg_input" i, `)
+	io.WriteString(w, ` FROM "_sg_input" i`)
 	renderNestedUpdateRelTables(w, item.kvitem)
-
-	if item.array {
-		io.WriteString(w, `json_populate_recordset`)
-	} else {
-		io.WriteString(w, `json_populate_record`)
-	}
-
-	io.WriteString(w, `(NULL::`)
-	io.WriteString(w, ti.Name)
-
-	if len(item.path) == 0 {
-		io.WriteString(w, `, i.j) t)`)
-	} else {
-		io.WriteString(w, `, i.j->`)
-		joinPath(w, item.path)
-		io.WriteString(w, `) t) `)
-	}
+	io.WriteString(w, `) `)
 
 	if item.id != 0 {
 		// Render sql to set id values if child-to-parent
@@ -136,8 +121,8 @@ func (c *compilerContext) renderUpdateStmt(w io.Writer, qc *qcode.QCode, item re
 		}
 		io.WriteString(w, `)`)
 
-	} else {
-		io.WriteString(w, ` WHERE `)
+	} else if qc.Selects[0].Where != nil {
+		io.WriteString(w, `WHERE `)
 		if err := c.renderWhere(&qc.Selects[0], ti); err != nil {
 			return err
 		}
@@ -202,17 +187,18 @@ func renderNestedUpdateRelTables(w io.Writer, item kvitem) error {
 	// 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, `, "_x_`)
 			io.WriteString(w, v.relCP.Left.Table)
-			io.WriteString(w, `", `)
+			io.WriteString(w, `"`)
 		}
 	}
 
 	return nil
 }
 
-func (c *compilerContext) renderDelete(qc *qcode.QCode, w io.Writer,
-	vars Variables, ti *DBTableInfo) (uint32, error) {
+func (c *compilerContext) renderDelete(
+	w io.Writer, qc *qcode.QCode, vars Variables, ti *DBTableInfo) (uint32, error) {
+
 	root := &qc.Selects[0]
 
 	io.WriteString(c.w, `WITH `)

core/internal/psql/update_test.go

@@ -1,4 +1,4 @@
-package psql
+package psql_test
 
 import (
 	"encoding/json"
@@ -223,7 +223,7 @@ func nestedUpdateOneToOneWithDisconnect(t *testing.T) {
 // 		}
 // 	}`
 
-// 	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"`
+// 	sql := `WITH "_sg_input" AS (SELECT $1 :: 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(`{

core/internal/qcode/bench.10

@@ -0,0 +1,11 @@
+goos: darwin
+goarch: amd64
+pkg: github.com/dosco/super-graph/core/internal/qcode
+BenchmarkQCompile-16        	  120888	      9236 ns/op	    3755 B/op	      28 allocs/op
+BenchmarkQCompileP-16       	  502248	      2620 ns/op	    3795 B/op	      28 allocs/op
+BenchmarkParse-16           	  128370	      9294 ns/op	    3902 B/op	      18 allocs/op
+BenchmarkParseP-16          	  575752	      2340 ns/op	    3903 B/op	      18 allocs/op
+BenchmarkSchemaParse-16     	  212048	      5779 ns/op	    3968 B/op	      57 allocs/op
+BenchmarkSchemaParseP-16    	  630918	      1686 ns/op	    3968 B/op	      57 allocs/op
+PASS
+ok  	github.com/dosco/super-graph/core/internal/qcode	7.710s

core/internal/qcode/bench.11

@@ -0,0 +1,13 @@
+goos: darwin
+goarch: amd64
+pkg: github.com/dosco/super-graph/core/internal/qcode
+BenchmarkQCompile-16            	  118282	      9686 ns/op	    4031 B/op	      30 allocs/op
+BenchmarkQCompileP-16           	  427531	      2710 ns/op	    4077 B/op	      30 allocs/op
+BenchmarkQCompileFragment-16    	  140588	      8328 ns/op	    8903 B/op	      13 allocs/op
+BenchmarkParse-16               	  131396	      9212 ns/op	    4175 B/op	      18 allocs/op
+BenchmarkParseP-16              	  503778	      2310 ns/op	    4176 B/op	      18 allocs/op
+BenchmarkParseFragment-16       	  143725	      8158 ns/op	   10193 B/op	       9 allocs/op
+BenchmarkSchemaParse-16         	  240609	      5060 ns/op	    3968 B/op	      57 allocs/op
+BenchmarkSchemaParseP-16        	  785116	      1534 ns/op	    3968 B/op	      57 allocs/op
+PASS
+ok  	github.com/dosco/super-graph/core/internal/qcode	11.092s

core/internal/qcode/bench.9

@@ -0,0 +1,17 @@
+goos: darwin
+goarch: amd64
+pkg: github.com/dosco/super-graph/core/internal/qcode
+BenchmarkQCompile
+BenchmarkQCompile-16        	  129614	      8649 ns/op	    3756 B/op	      28 allocs/op
+BenchmarkQCompileP
+BenchmarkQCompileP-16       	  487488	      2525 ns/op	    3792 B/op	      28 allocs/op
+BenchmarkParse
+BenchmarkParse-16           	  127582	      8731 ns/op	    3902 B/op	      18 allocs/op
+BenchmarkParseP
+BenchmarkParseP-16          	  561373	      2223 ns/op	    3903 B/op	      18 allocs/op
+BenchmarkSchemaParse
+BenchmarkSchemaParse-16     	  209142	      5523 ns/op	    3968 B/op	      57 allocs/op
+BenchmarkSchemaParseP
+BenchmarkSchemaParseP-16    	  716437	      1734 ns/op	    3968 B/op	      57 allocs/op
+PASS
+ok  	github.com/dosco/super-graph/core/internal/qcode	8.483s

core/internal/qcode/config.go

@@ -1,13 +1,13 @@
 package qcode
 
 import (
-	"regexp"
 	"sort"
 	"strings"
 )
 
 type Config struct {
-	Blocklist []string
+	DefaultBlock bool
+	Blocklist    []string
 }
 
 type QueryConfig struct {
@@ -15,23 +15,27 @@ type QueryConfig struct {
 	Filters          []string
 	Columns          []string
 	DisableFunctions bool
+	Block            bool
 }
 
 type InsertConfig struct {
 	Filters []string
 	Columns []string
 	Presets map[string]string
+	Block   bool
 }
 
 type UpdateConfig struct {
 	Filters []string
 	Columns []string
 	Presets map[string]string
+	Block   bool
 }
 
 type DeleteConfig struct {
 	Filters []string
 	Columns []string
+	Block   bool
 }
 
 type TRConfig struct {
@@ -47,9 +51,8 @@ type trval struct {
 		fil     *Exp
 		filNU   bool
 		cols    map[string]struct{}
-		disable struct {
-			funcs bool
-		}
+		disable struct{ funcs bool }
+		block   bool
 	}
 
 	insert struct {
@@ -58,6 +61,7 @@ type trval struct {
 		cols   map[string]struct{}
 		psmap  map[string]string
 		pslist []string
+		block  bool
 	}
 
 	update struct {
@@ -66,12 +70,14 @@ type trval struct {
 		cols   map[string]struct{}
 		psmap  map[string]string
 		pslist []string
+		block  bool
 	}
 
 	delete struct {
 		fil   *Exp
 		filNU bool
 		cols  map[string]struct{}
+		block bool
 	}
 }
 
@@ -125,12 +131,3 @@ func mapToList(m map[string]string) []string {
 	sort.Strings(list)
 	return list
 }
-
-var varRe = regexp.MustCompile(`\$([a-zA-Z0-9_]+)`)
-
-func parsePresets(m map[string]string) map[string]string {
-	for k, v := range m {
-		m[k] = varRe.ReplaceAllString(v, `{{$1}}`)
-	}
-	return m
-}

core/internal/qcode/lex.go

@@ -11,15 +11,18 @@ import (
 var (
 	queryToken        = []byte("query")
 	mutationToken     = []byte("mutation")
+	fragmentToken     = []byte("fragment")
 	subscriptionToken = []byte("subscription")
+	onToken           = []byte("on")
 	trueToken         = []byte("true")
 	falseToken        = []byte("false")
 	quotesToken       = []byte(`'"`)
 	signsToken        = []byte(`+-`)
-	punctuatorToken   = []byte(`!():=[]{|}`)
 	spreadToken       = []byte(`...`)
 	digitToken        = []byte(`0123456789`)
 	dotToken          = []byte(`.`)
+
+	punctuatorToken = `!():=[]{|}`
 )
 
 // Pos represents a byte position in the original input text from which
@@ -43,6 +46,8 @@ const (
 	itemName
 	itemQuery
 	itemMutation
+	itemFragment
+	itemOn
 	itemSub
 	itemPunctuator
 	itemArgsOpen
@@ -136,8 +141,7 @@ func (l *lexer) current() (Pos, Pos) {
 func (l *lexer) emit(t itemType) {
 	l.items = append(l.items, item{t, l.start, l.pos, l.line})
 	// Some items contain text internally. If so, count their newlines.
-	switch t {
-	case itemStringVal:
+	if t == itemStringVal {
 		for i := l.start; i < l.pos; i++ {
 			if l.input[i] == '\n' {
 				l.line++
@@ -263,11 +267,11 @@ func lexRoot(l *lexer) stateFn {
 		l.backup()
 		return lexString
 	case r == '.':
-		if len(l.input) >= 3 {
-			if equals(l.input, 0, 3, spreadToken) {
-				l.emit(itemSpread)
-				return lexRoot
-			}
+		l.acceptRun(dotToken)
+		s, e := l.current()
+		if equals(l.input, s, e, spreadToken) {
+			l.emit(itemSpread)
+			return lexRoot
 		}
 		fallthrough // '.' can start a number.
 	case r == '+' || r == '-' || ('0' <= r && r <= '9'):
@@ -299,10 +303,14 @@ func lexName(l *lexer) stateFn {
 			switch {
 			case equals(l.input, s, e, queryToken):
 				l.emitL(itemQuery)
+			case equals(l.input, s, e, fragmentToken):
+				l.emitL(itemFragment)
 			case equals(l.input, s, e, mutationToken):
 				l.emitL(itemMutation)
 			case equals(l.input, s, e, subscriptionToken):
 				l.emitL(itemSub)
+			case equals(l.input, s, e, onToken):
+				l.emitL(itemOn)
 			case equals(l.input, s, e, trueToken):
 				l.emitL(itemBoolVal)
 			case equals(l.input, s, e, falseToken):
@@ -395,35 +403,15 @@ func isAlphaNumeric(r rune) bool {
 	return r == '_' || unicode.IsLetter(r) || unicode.IsDigit(r)
 }
 
-func equals(b []byte, s Pos, e Pos, val []byte) bool {
-	n := 0
-	for i := s; i < e; i++ {
-		if n >= len(val) {
-			return true
-		}
-		switch {
-		case b[i] >= 'A' && b[i] <= 'Z' && ('a'+(b[i]-'A')) != val[n]:
-			return false
-		case b[i] != val[n]:
-			return false
-		}
-		n++
-	}
-	return true
+func equals(b []byte, s, e Pos, val []byte) bool {
+	return bytes.EqualFold(b[s:e], val)
 }
 
-func contains(b []byte, s Pos, e Pos, val []byte) bool {
-	for i := s; i < e; i++ {
-		for n := 0; n < len(val); n++ {
-			if b[i] == val[n] {
-				return true
-			}
-		}
-	}
-	return false
+func contains(b []byte, s, e Pos, chars string) bool {
+	return bytes.ContainsAny(b[s:e], chars)
 }
 
-func lowercase(b []byte, s Pos, e Pos) {
+func lowercase(b []byte, s, e Pos) {
 	for i := s; i < e; i++ {
 		if b[i] >= 'A' && b[i] <= 'Z' {
 			b[i] = ('a' + (b[i] - 'A'))

core/internal/qcode/parse.go

@@ -3,10 +3,9 @@ package qcode
 import (
 	"errors"
 	"fmt"
+	"hash/maphash"
 	"sync"
 	"unsafe"
-
-	"github.com/dosco/super-graph/util"
 )
 
 var (
@@ -16,7 +15,7 @@ var (
 type parserType int32
 
 const (
-	maxFields = 100
+	maxFields = 1200
 	maxArgs   = 25
 )
 
@@ -50,6 +49,19 @@ func (o *Operation) Reset() {
 	*o = zeroOperation
 }
 
+type Fragment struct {
+	Name    string
+	On      string
+	Fields  []Field
+	fieldsA [10]Field
+}
+
+var zeroFragment = Fragment{}
+
+func (f *Fragment) Reset() {
+	*f = zeroFragment
+}
+
 type Field struct {
 	ID        int32
 	ParentID  int32
@@ -59,11 +71,13 @@ type Field struct {
 	argsA     [5]Arg
 	Children  []int32
 	childrenA [5]int32
+	Union     bool
 }
 
 type Arg struct {
 	Name string
 	Val  *Node
+	df   bool
 }
 
 type Node struct {
@@ -82,6 +96,8 @@ func (n *Node) Reset() {
 }
 
 type Parser struct {
+	frags map[uint64]*Fragment
+	h     maphash.Hash
 	input []byte // the string being scanned
 	pos   int
 	items []item
@@ -96,12 +112,192 @@ var opPool = sync.Pool{
 	New: func() interface{} { return new(Operation) },
 }
 
+var fragPool = sync.Pool{
+	New: func() interface{} { return new(Fragment) },
+}
+
 var lexPool = sync.Pool{
 	New: func() interface{} { return new(lexer) },
 }
 
 func Parse(gql []byte) (*Operation, error) {
-	return parseSelectionSet(gql)
+	var err error
+
+	if len(gql) == 0 {
+		return nil, errors.New("blank query")
+	}
+
+	l := lexPool.Get().(*lexer)
+	l.Reset()
+	defer lexPool.Put(l)
+
+	if err = lex(l, gql); err != nil {
+		return nil, err
+	}
+
+	p := &Parser{
+		input: l.input,
+		pos:   -1,
+		items: l.items,
+	}
+
+	op := opPool.Get().(*Operation)
+	op.Reset()
+	op.Fields = op.fieldsA[:0]
+
+	s := -1
+	qf := false
+
+	for {
+		if p.peek(itemEOF) {
+			p.ignore()
+			break
+		}
+
+		if p.peek(itemFragment) {
+			p.ignore()
+			if f, err := p.parseFragment(); err != nil {
+				fragPool.Put(f)
+				return nil, err
+			}
+
+		} else {
+			if !qf && p.peek(itemQuery, itemMutation, itemSub, itemObjOpen) {
+				s = p.pos
+				qf = true
+			}
+			p.ignore()
+		}
+	}
+
+	p.reset(s)
+	if err := p.parseOp(op); err != nil {
+		return nil, err
+	}
+
+	for _, v := range p.frags {
+		fragPool.Put(v)
+	}
+
+	return op, nil
+}
+
+func (p *Parser) parseFragment() (*Fragment, error) {
+	var err error
+
+	frag := fragPool.Get().(*Fragment)
+	frag.Reset()
+	frag.Fields = frag.fieldsA[:0]
+
+	if p.peek(itemName) {
+		frag.Name = p.val(p.next())
+	} else {
+		return frag, errors.New("fragment: missing name")
+	}
+
+	if p.peek(itemOn) {
+		p.ignore()
+	} else {
+		return frag, errors.New("fragment: missing 'on' keyword")
+	}
+
+	if p.peek(itemName) {
+		frag.On = p.vall(p.next())
+	} else {
+		return frag, errors.New("fragment: missing table name after 'on' keyword")
+	}
+
+	if p.peek(itemObjOpen) {
+		p.ignore()
+	} else {
+		return frag, fmt.Errorf("fragment: expecting a '{', got: %s", p.next())
+	}
+
+	frag.Fields, err = p.parseFields(frag.Fields)
+	if err != nil {
+		return frag, fmt.Errorf("fragment: %v", err)
+	}
+
+	if p.frags == nil {
+		p.frags = make(map[uint64]*Fragment)
+	}
+
+	_, _ = p.h.WriteString(frag.Name)
+	k := p.h.Sum64()
+	p.h.Reset()
+
+	p.frags[k] = frag
+
+	return frag, nil
+}
+
+func (p *Parser) parseOp(op *Operation) error {
+	var err error
+	var typeSet bool
+
+	if p.peek(itemQuery, itemMutation, itemSub) {
+		err = p.parseOpTypeAndArgs(op)
+
+		if err != nil {
+			return fmt.Errorf("%s: %v", op.Type, err)
+		}
+		typeSet = true
+	}
+
+	if p.peek(itemObjOpen) {
+		p.ignore()
+		if !typeSet {
+			op.Type = opQuery
+		}
+
+		for {
+			if p.peek(itemEOF, itemFragment) {
+				p.ignore()
+				break
+			}
+
+			op.Fields, err = p.parseFields(op.Fields)
+			if err != nil {
+				return fmt.Errorf("%s: %v", op.Type, err)
+			}
+		}
+	} else {
+		return fmt.Errorf("expecting a query, mutation or subscription, got: %s", p.next())
+	}
+
+	return nil
+}
+
+func (p *Parser) parseOpTypeAndArgs(op *Operation) error {
+	item := p.next()
+
+	switch item._type {
+	case itemQuery:
+		op.Type = opQuery
+	case itemMutation:
+		op.Type = opMutate
+	case itemSub:
+		op.Type = opSub
+	}
+
+	op.Args = op.argsA[:0]
+
+	var err error
+
+	if p.peek(itemName) {
+		op.Name = p.val(p.next())
+	}
+
+	if p.peek(itemArgsOpen) {
+		p.ignore()
+
+		op.Args, err = p.parseOpParams(op.Args)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
 }
 
 func ParseArgValue(argVal string) (*Node, error) {
@@ -123,228 +319,158 @@ func ParseArgValue(argVal string) (*Node, error) {
 	return op, err
 }
 
-func parseSelectionSet(gql []byte) (*Operation, error) {
-	var err error
-
-	if len(gql) == 0 {
-		return nil, errors.New("blank query")
-	}
-
-	l := lexPool.Get().(*lexer)
-	l.Reset()
-
-	if err = lex(l, gql); err != nil {
-		return nil, err
-	}
-
-	p := &Parser{
-		input: l.input,
-		pos:   -1,
-		items: l.items,
-	}
-
-	var op *Operation
-
-	if p.peek(itemObjOpen) {
-		p.ignore()
-		op, err = p.parseQueryOp()
-	} else {
-		op, err = p.parseOp()
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	if p.peek(itemObjClose) {
-		p.ignore()
-	} else {
-		return nil, fmt.Errorf("operation missing closing '}'")
-	}
-
-	if !p.peek(itemEOF) {
-		p.ignore()
-		return nil, fmt.Errorf("invalid '%s' found after closing '}'", p.current())
-	}
-
-	lexPool.Put(l)
-
-	return op, err
-}
-
-func (p *Parser) next() item {
-	n := p.pos + 1
-	if n >= len(p.items) {
-		p.err = errEOT
-		return item{_type: itemEOF}
-	}
-	p.pos = n
-	return p.items[p.pos]
-}
-
-func (p *Parser) ignore() {
-	n := p.pos + 1
-	if n >= len(p.items) {
-		p.err = errEOT
-		return
-	}
-	p.pos = n
-}
-
-func (p *Parser) current() string {
-	item := p.items[p.pos]
-	return b2s(p.input[item.pos:item.end])
-}
-
-func (p *Parser) peek(types ...itemType) bool {
-	n := p.pos + 1
-	// if p.items[n]._type == itemEOF {
-	// 	return false
-	// }
-	if n >= len(p.items) {
-		return false
-	}
-	for i := 0; i < len(types); i++ {
-		if p.items[n]._type == types[i] {
-			return true
-		}
-	}
-	return false
-}
-
-func (p *Parser) parseOp() (*Operation, error) {
-	if !p.peek(itemQuery, itemMutation, itemSub) {
-		err := errors.New("expecting a query, mutation or subscription")
-		return nil, err
-	}
-	item := p.next()
-
-	op := opPool.Get().(*Operation)
-	op.Reset()
-
-	switch item._type {
-	case itemQuery:
-		op.Type = opQuery
-	case itemMutation:
-		op.Type = opMutate
-	case itemSub:
-		op.Type = opSub
-	}
-
-	op.Fields = op.fieldsA[:0]
-	op.Args = op.argsA[:0]
-
-	var err error
-
-	if p.peek(itemName) {
-		op.Name = p.val(p.next())
-	}
-
-	if p.peek(itemArgsOpen) {
-		p.ignore()
-
-		op.Args, err = p.parseOpParams(op.Args)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if p.peek(itemObjOpen) {
-		p.ignore()
-
-		for n := 0; n < 10; n++ {
-			if !p.peek(itemName) {
-				break
-			}
-
-			op.Fields, err = p.parseFields(op.Fields)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	return op, nil
-}
-
-func (p *Parser) parseQueryOp() (*Operation, error) {
-	op := opPool.Get().(*Operation)
-	op.Reset()
-
-	op.Type = opQuery
-	op.Fields = op.fieldsA[:0]
-	op.Args = op.argsA[:0]
-
-	var err error
-
-	for n := 0; n < 10; n++ {
-		if !p.peek(itemName) {
-			break
-		}
-
-		op.Fields, err = p.parseFields(op.Fields)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return op, nil
-}
-
 func (p *Parser) parseFields(fields []Field) ([]Field, error) {
-	st := util.NewStack()
+	var err error
+	st := NewStack()
+
+	if !p.peek(itemName, itemSpread) {
+		return nil, fmt.Errorf("unexpected token: %s", p.peekNext())
+	}
 
 	for {
-		if len(fields) >= maxFields {
-			return nil, fmt.Errorf("too many fields (max %d)", maxFields)
+		if p.peek(itemEOF) {
+			p.ignore()
+			return nil, errors.New("invalid query")
 		}
 
 		if p.peek(itemObjClose) {
 			p.ignore()
-			st.Pop()
 
-			if st.Len() == 0 {
-				break
-			} else {
+			if st.Len() != 0 {
+				st.Pop()
 				continue
+			} else {
+				break
 			}
 		}
 
-		if !p.peek(itemName) {
-			return nil, errors.New("expecting an alias or field name")
+		if len(fields) >= maxFields {
+			return nil, fmt.Errorf("too many fields (max %d)", maxFields)
 		}
 
-		fields = append(fields, Field{ID: int32(len(fields))})
+		isFrag := false
 
-		f := &fields[(len(fields) - 1)]
-		f.Args = f.argsA[:0]
-		f.Children = f.childrenA[:0]
+		if p.peek(itemSpread) {
+			p.ignore()
+			isFrag = true
+		}
 
-		// Parse the inside of the the fields () parentheses
-		// in short parse the args like id, where, etc
-		if err := p.parseField(f); err != nil {
+		if isFrag {
+			fields, err = p.parseFragmentFields(st, fields)
+		} else {
+			fields, err = p.parseNormalFields(st, fields)
+		}
+
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return fields, nil
+}
+
+func (p *Parser) parseNormalFields(st *Stack, fields []Field) ([]Field, error) {
+	if !p.peek(itemName) {
+		return nil, fmt.Errorf("expecting an alias or field name, got: %s", p.next())
+	}
+
+	fields = append(fields, Field{ID: int32(len(fields))})
+
+	f := &fields[(len(fields) - 1)]
+	f.Args = f.argsA[:0]
+	f.Children = f.childrenA[:0]
+
+	// Parse the field
+	if err := p.parseField(f); err != nil {
+		return nil, err
+	}
+
+	if st.Len() == 0 {
+		f.ParentID = -1
+	} else {
+		pid := st.Peek()
+		f.ParentID = pid
+		fields[pid].Children = append(fields[pid].Children, f.ID)
+	}
+
+	// The first opening curley brackets after this
+	// comes the columns or child fields
+	if p.peek(itemObjOpen) {
+		p.ignore()
+		st.Push(f.ID)
+	}
+
+	return fields, nil
+}
+
+func (p *Parser) parseFragmentFields(st *Stack, fields []Field) ([]Field, error) {
+	var err error
+	pid := st.Peek()
+
+	if p.peek(itemOn) {
+		p.ignore()
+		fields[pid].Union = true
+
+		if fields, err = p.parseNormalFields(st, fields); err != nil {
 			return nil, err
 		}
 
-		intf := st.Peek()
-		if pid, ok := intf.(int32); ok {
-			f.ParentID = pid
-			fields[pid].Children = append(fields[pid].Children, f.ID)
-		} else {
-			f.ParentID = -1
+		// If parent is a union selector than copy over args from the parent
+		// to the first child which is the root selector for each union type.
+		for i := pid + 1; i < int32(len(fields)); i++ {
+			f := &fields[i]
+			if f.ParentID == pid {
+				f.Args = fields[pid].Args
+			}
 		}
 
-		// The first opening curley brackets after this
-		// comes the columns or child fields
-		if p.peek(itemObjOpen) {
-			p.ignore()
-			st.Push(f.ID)
+	} else {
+		if !p.peek(itemName) {
+			return nil, fmt.Errorf("expecting a fragment name, got: %s", p.next())
+		}
 
-		} else if p.peek(itemObjClose) {
-			if st.Len() == 0 {
-				break
+		name := p.val(p.next())
+		_, _ = p.h.WriteString(name)
+		id := p.h.Sum64()
+		p.h.Reset()
+
+		fr, ok := p.frags[id]
+		if !ok {
+			return nil, fmt.Errorf("no fragment named '%s' defined", name)
+		}
+		ff := fr.Fields
+
+		n := int32(len(fields))
+		fields = append(fields, ff...)
+
+		for i := 0; i < len(ff); i++ {
+			k := (n + int32(i))
+			f := &fields[k]
+			f.ID = int32(k)
+
+			// If this is the top-level point the parent to the parent of the
+			// previous field.
+			if f.ParentID == -1 {
+				f.ParentID = pid
+				if f.ParentID != -1 {
+					fields[pid].Children = append(fields[pid].Children, f.ID)
+				}
+				// Update all the other parents id's by our new place in this new array
 			} else {
-				continue
+				f.ParentID += n
+			}
+
+			// Copy over children since fields append is not a deep copy
+			f.Children = make([]int32, len(f.Children))
+			copy(f.Children, ff[i].Children)
+
+			// Copy over args since args append is not a deep copy
+			f.Args = make([]Arg, len(f.Args))
+			copy(f.Args, ff[i].Args)
+
+			// Update all the children which is needed.
+			for j := range f.Children {
+				f.Children[j] += n
 			}
 		}
 	}
@@ -385,7 +511,7 @@ func (p *Parser) parseOpParams(args []Arg) ([]Arg, error) {
 			return nil, fmt.Errorf("too many args (max %d)", maxArgs)
 		}
 
-		if p.peek(itemArgsClose) {
+		if p.peek(itemEOF, itemArgsClose) {
 			p.ignore()
 			break
 		}
@@ -403,7 +529,7 @@ func (p *Parser) parseArgs(args []Arg) ([]Arg, error) {
 			return nil, fmt.Errorf("too many args (max %d)", maxArgs)
 		}
 
-		if p.peek(itemArgsClose) {
+		if p.peek(itemEOF, itemArgsClose) {
 			p.ignore()
 			break
 		}
@@ -445,10 +571,8 @@ func (p *Parser) parseList() (*Node, error) {
 		}
 		if ty == 0 {
 			ty = node.Type
-		} else {
-			if ty != node.Type {
-				return nil, errors.New("All values in a list must be of the same type")
-			}
+		} else if ty != node.Type {
+			return nil, errors.New("All values in a list must be of the same type")
 		}
 		node.Parent = parent
 		nodes = append(nodes, node)
@@ -470,7 +594,7 @@ func (p *Parser) parseObj() (*Node, error) {
 	parent.Reset()
 
 	for {
-		if p.peek(itemObjClose) {
+		if p.peek(itemEOF, itemObjClose) {
 			p.ignore()
 			break
 		}
@@ -545,6 +669,57 @@ func (p *Parser) vall(v item) string {
 	return b2s(p.input[v.pos:v.end])
 }
 
+func (p *Parser) peek(types ...itemType) bool {
+	n := p.pos + 1
+	l := len(types)
+	// if p.items[n]._type == itemEOF {
+	// 	return false
+	// }
+
+	if n >= len(p.items) {
+		return types[0] == itemEOF
+	}
+
+	if l == 1 {
+		return p.items[n]._type == types[0]
+	}
+
+	for i := 0; i < l; i++ {
+		if p.items[n]._type == types[i] {
+			return true
+		}
+	}
+	return false
+}
+
+func (p *Parser) next() item {
+	n := p.pos + 1
+	if n >= len(p.items) {
+		p.err = errEOT
+		return item{_type: itemEOF}
+	}
+	p.pos = n
+	return p.items[p.pos]
+}
+
+func (p *Parser) ignore() {
+	n := p.pos + 1
+	if n >= len(p.items) {
+		p.err = errEOT
+		return
+	}
+	p.pos = n
+}
+
+func (p *Parser) peekNext() string {
+	item := p.items[p.pos+1]
+	return b2s(p.input[item.pos:item.end])
+}
+
+func (p *Parser) reset(to int) {
+	p.pos = to
+}
+
 func b2s(b []byte) string {
 	return *(*string)(unsafe.Pointer(&b))
 }
@@ -578,34 +753,9 @@ func (t parserType) String() string {
 	case NodeList:
 		v = "node-list"
 	}
-	return fmt.Sprintf("<%s>", v)
+	return v
 }
 
-// type Frees struct {
-// 	n   *Node
-// 	loc int
-// }
-
-// var freeList []Frees
-
-// func FreeNode(n *Node, loc int) {
-// 	j := -1
-
-// 	for i := range freeList {
-// 		if n == freeList[i].n {
-// 			j = i
-// 			break
-// 		}
-// 	}
-
-// 	if j == -1 {
-// 		nodePool.Put(n)
-// 		freeList = append(freeList, Frees{n, loc})
-// 	} else {
-// 		fmt.Printf(">>>>(%d) RE_FREE %d %p %s %s\n", loc, freeList[j].loc, freeList[j].n, n.Name, n.Type)
-// 	}
-// }
-
-func FreeNode(n *Node, loc int) {
+func FreeNode(n *Node) {
 	nodePool.Put(n)
 }

core/internal/qcode/parse_test.go

@@ -3,6 +3,8 @@ package qcode
 import (
 	"errors"
 	"testing"
+
+	"github.com/chirino/graphql/schema"
 )
 
 func TestCompile1(t *testing.T) {
@@ -119,7 +121,7 @@ updateThread {
     }
 	}
 }
-}`
+}}`
 	qcompile, _ := NewCompiler(Config{})
 	_, err := qcompile.Compile([]byte(gql), "anon")
 
@@ -129,8 +131,95 @@ updateThread {
 
 }
 
+func TestFragmentsCompile1(t *testing.T) {
+	gql := `
+	fragment userFields1 on user {
+		id
+		email
+	}
+
+	query {
+		users {
+			...userFields2
+	
+			created_at
+			...userFields1
+		}
+	}
+	
+	fragment userFields2 on user {
+		first_name
+		last_name
+	}
+	`
+	qcompile, _ := NewCompiler(Config{})
+	_, err := qcompile.Compile([]byte(gql), "user")
+
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestFragmentsCompile2(t *testing.T) {
+	gql := `
+	query {
+		users {
+			...userFields2
+	
+			created_at
+			...userFields1
+		}
+	}
+
+	fragment userFields1 on user {
+		id
+		email
+	}
+	
+	fragment userFields2 on user {
+		first_name
+		last_name
+	}`
+	qcompile, _ := NewCompiler(Config{})
+	_, err := qcompile.Compile([]byte(gql), "user")
+
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestFragmentsCompile3(t *testing.T) {
+	gql := `
+	fragment userFields1 on user {
+		id
+		email
+	}
+	
+	fragment userFields2 on user {
+		first_name
+		last_name
+	}
+
+	query {
+		users {
+			...userFields2
+	
+			created_at
+			...userFields1
+		}
+	}
+
+	`
+	qcompile, _ := NewCompiler(Config{})
+	_, err := qcompile.Compile([]byte(gql), "user")
+
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
 var gql = []byte(`
-	products(
+	{products(
 		# returns only 30 items
 		limit: 30,
 
@@ -148,7 +237,30 @@ var gql = []byte(`
 		id
 		name
 		price
-	}`)
+	}}`)
+
+var gqlWithFragments = []byte(`
+fragment userFields1 on user {
+	id
+	email
+	__typename
+}
+
+query {
+	users {
+		...userFields2
+
+		created_at
+		...userFields1
+		__typename
+	}
+}
+
+fragment userFields2 on user {
+	first_name
+	last_name
+	__typename
+}`)
 
 func BenchmarkQCompile(b *testing.B) {
 	qcompile, _ := NewCompiler(Config{})
@@ -181,3 +293,85 @@ func BenchmarkQCompileP(b *testing.B) {
 		}
 	})
 }
+
+func BenchmarkQCompileFragment(b *testing.B) {
+	qcompile, _ := NewCompiler(Config{})
+
+	b.ResetTimer()
+	b.ReportAllocs()
+	for n := 0; n < b.N; n++ {
+		_, err := qcompile.Compile(gqlWithFragments, "user")
+
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+
+}
+
+func BenchmarkParse(b *testing.B) {
+	b.ResetTimer()
+	b.ReportAllocs()
+	for n := 0; n < b.N; n++ {
+		_, err := Parse(gql)
+
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+}
+
+func BenchmarkParseP(b *testing.B) {
+	b.ResetTimer()
+	b.ReportAllocs()
+
+	b.RunParallel(func(pb *testing.PB) {
+		for pb.Next() {
+			_, err := Parse(gql)
+
+			if err != nil {
+				b.Fatal(err)
+			}
+		}
+	})
+}
+
+func BenchmarkParseFragment(b *testing.B) {
+	b.ResetTimer()
+	b.ReportAllocs()
+	for n := 0; n < b.N; n++ {
+		_, err := Parse(gqlWithFragments)
+
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+}
+
+func BenchmarkSchemaParse(b *testing.B) {
+
+	b.ResetTimer()
+	b.ReportAllocs()
+	for n := 0; n < b.N; n++ {
+		doc := schema.QueryDocument{}
+		err := doc.Parse(string(gql))
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+}
+
+func BenchmarkSchemaParseP(b *testing.B) {
+	b.ResetTimer()
+	b.ReportAllocs()
+
+	b.RunParallel(func(pb *testing.PB) {
+		for pb.Next() {
+			doc := schema.QueryDocument{}
+			err := doc.Parse(string(gql))
+			if err != nil {
+				b.Fatal(err)
+			}
+		}
+	})
+}

core/internal/qcode/qcode.go

@@ -7,11 +7,12 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/dosco/super-graph/util"
+	"github.com/dosco/super-graph/core/internal/util"
 	"github.com/gobuffalo/flect"
 )
 
 type QType int
+type SType int
 type Action int
 
 const (
@@ -19,7 +20,8 @@ const (
 )
 
 const (
-	QTQuery QType = iota + 1
+	QTUnknown QType = iota
+	QTQuery
 	QTMutation
 	QTInsert
 	QTUpdate
@@ -27,6 +29,12 @@ const (
 	QTUpsert
 )
 
+const (
+	STNone SType = iota
+	STUnion
+	STMember
+)
+
 type QCode struct {
 	Type      QType
 	ActionVar string
@@ -38,6 +46,8 @@ type QCode struct {
 type Select struct {
 	ID         int32
 	ParentID   int32
+	UParentID  int32
+	Type       SType
 	Args       map[string]*Node
 	Name       string
 	FieldName  string
@@ -172,6 +182,8 @@ const (
 type Compiler struct {
 	tr map[string]map[string]*trval
 	bl map[string]struct{}
+
+	defBlock bool
 }
 
 var expPool = sync.Pool{
@@ -179,7 +191,7 @@ var expPool = sync.Pool{
 }
 
 func NewCompiler(c Config) (*Compiler, error) {
-	co := &Compiler{}
+	co := &Compiler{defBlock: c.DefaultBlock}
 	co.tr = make(map[string]map[string]*trval)
 	co.bl = make(map[string]struct{}, len(c.Blocklist))
 
@@ -218,6 +230,7 @@ func (com *Compiler) AddRole(role, table string, trc TRConfig) error {
 	}
 	trv.query.cols = listToMap(trc.Query.Columns)
 	trv.query.disable.funcs = trc.Query.DisableFunctions
+	trv.query.block = trc.Query.Block
 
 	// insert config
 	trv.insert.fil, trv.insert.filNU, err = compileFilter(trc.Insert.Filters)
@@ -225,8 +238,9 @@ func (com *Compiler) AddRole(role, table string, trc TRConfig) error {
 		return err
 	}
 	trv.insert.cols = listToMap(trc.Insert.Columns)
-	trv.insert.psmap = parsePresets(trc.Insert.Presets)
+	trv.insert.psmap = trc.Insert.Presets
 	trv.insert.pslist = mapToList(trv.insert.psmap)
+	trv.insert.block = trc.Insert.Block
 
 	// update config
 	trv.update.fil, trv.update.filNU, err = compileFilter(trc.Update.Filters)
@@ -234,8 +248,9 @@ func (com *Compiler) AddRole(role, table string, trc TRConfig) error {
 		return err
 	}
 	trv.update.cols = listToMap(trc.Update.Columns)
-	trv.update.psmap = parsePresets(trc.Update.Presets)
+	trv.update.psmap = trc.Update.Presets
 	trv.update.pslist = mapToList(trv.update.psmap)
+	trv.update.block = trc.Update.Block
 
 	// delete config
 	trv.delete.fil, trv.delete.filNU, err = compileFilter(trc.Delete.Filters)
@@ -243,6 +258,7 @@ func (com *Compiler) AddRole(role, table string, trc TRConfig) error {
 		return err
 	}
 	trv.delete.cols = listToMap(trc.Delete.Columns)
+	trv.delete.block = trc.Delete.Block
 
 	singular := flect.Singularize(table)
 	plural := flect.Pluralize(table)
@@ -271,6 +287,7 @@ func (com *Compiler) Compile(query []byte, role string) (*QCode, error) {
 		return nil, err
 	}
 
+	freeNodes(op)
 	opPool.Put(op)
 
 	return &qc, nil
@@ -328,37 +345,91 @@ func (com *Compiler) compileQuery(qc *QCode, op *Operation, role string) error {
 		}
 
 		trv := com.getRole(role, field.Name)
+		skipRender := false
+
+		if trv != nil {
+			switch action {
+			case QTQuery:
+				if trv.query.block {
+					skipRender = true
+				}
+
+			case QTInsert:
+				if trv.insert.block {
+					return fmt.Errorf("%s, insert blocked: %s", role, field.Name)
+				}
+
+			case QTUpdate:
+				if trv.update.block {
+					return fmt.Errorf("%s, update blocked: %s", role, field.Name)
+				}
+
+			case QTDelete:
+				if trv.delete.block {
+					return fmt.Errorf("%s, delete blocked: %s", role, field.Name)
+				}
+			}
+
+		} else if role == "anon" {
+			skipRender = com.defBlock
+		}
 
 		selects = append(selects, Select{
-			ID:        id,
-			ParentID:  parentID,
-			Name:      field.Name,
-			Children:  make([]int32, 0, 5),
-			Allowed:   trv.allowedColumns(action),
-			Functions: true,
+			ID:         id,
+			ParentID:   parentID,
+			Name:       field.Name,
+			SkipRender: skipRender,
 		})
 		s := &selects[(len(selects) - 1)]
 
-		switch action {
-		case QTQuery:
-			s.Functions = !trv.query.disable.funcs
-			s.Paging.Limit = trv.query.limit
-
-		case QTInsert:
-			s.PresetMap = trv.insert.psmap
-			s.PresetList = trv.insert.pslist
-
-		case QTUpdate:
-			s.PresetMap = trv.update.psmap
-			s.PresetList = trv.update.pslist
+		if field.Union {
+			s.Type = STUnion
 		}
 
-		if len(field.Alias) != 0 {
+		if field.Alias != "" {
 			s.FieldName = field.Alias
 		} else {
 			s.FieldName = s.Name
 		}
 
+		if s.ParentID == -1 {
+			qc.Roots = append(qc.Roots, s.ID)
+		} else {
+			p := &selects[s.ParentID]
+			p.Children = append(p.Children, s.ID)
+
+			if p.Type == STUnion {
+				s.Type = STMember
+				s.UParentID = p.ParentID
+			}
+		}
+
+		if skipRender {
+			id++
+			continue
+		}
+
+		s.Children = make([]int32, 0, 5)
+		s.Functions = true
+
+		if trv != nil {
+			s.Allowed = trv.allowedColumns(action)
+
+			switch action {
+			case QTQuery:
+				s.Functions = !trv.query.disable.funcs
+				s.Paging.Limit = trv.query.limit
+
+			case QTInsert:
+				s.PresetMap = trv.insert.psmap
+				s.PresetList = trv.insert.pslist
+
+			case QTUpdate:
+				s.PresetMap = trv.update.psmap
+				s.PresetList = trv.update.pslist
+			}
+		}
+
 		err := com.compileArgs(qc, s, field.Args, role)
 		if err != nil {
 			return err
@@ -367,14 +438,8 @@ func (com *Compiler) compileQuery(qc *QCode, op *Operation, role string) error {
 		// Order is important AddFilters must come after compileArgs
 		com.AddFilters(qc, s, role)
 
-		if s.ParentID == -1 {
-			qc.Roots = append(qc.Roots, s.ID)
-		} else {
-			p := &selects[s.ParentID]
-			p.Children = append(p.Children, s.ID)
-		}
-
 		s.Cols = make([]Column, 0, len(field.Children))
+		cm := make(map[string]struct{})
 		action = QTQuery
 
 		for _, cid := range field.Children {
@@ -384,19 +449,27 @@ func (com *Compiler) compileQuery(qc *QCode, op *Operation, role string) error {
 				continue
 			}
 
+			var fname string
+
+			if f.Alias != "" {
+				fname = f.Alias
+			} else {
+				fname = f.Name
+			}
+
+			if _, ok := cm[fname]; ok {
+				continue
+			} else {
+				cm[fname] = struct{}{}
+			}
+
 			if len(f.Children) != 0 {
 				val := f.ID | (s.ID << 16)
 				st.Push(val)
 				continue
 			}
 
-			col := Column{Name: f.Name}
-
-			if len(f.Alias) != 0 {
-				col.FieldName = f.Alias
-			} else {
-				col.FieldName = f.Name
-			}
+			col := Column{Name: f.Name, FieldName: fname}
 			s.Cols = append(s.Cols, col)
 		}
 
@@ -408,19 +481,16 @@ func (com *Compiler) compileQuery(qc *QCode, op *Operation, role string) error {
 	}
 
 	qc.Selects = selects[:id]
+
 	return nil
 }
 
 func (com *Compiler) AddFilters(qc *QCode, sel *Select, role string) {
 	var fil *Exp
-	var nu bool
+	var nu bool // need user_id (or not) in this filter
 
 	if trv, ok := com.tr[role][sel.Name]; ok {
 		fil, nu = trv.filter(qc.Type)
-
-	} else if role == "anon" {
-		// Tables not defined under the anon role will not be rendered
-		sel.SkipRender = true
 	}
 
 	if fil == nil {
@@ -443,50 +513,42 @@ func (com *Compiler) AddFilters(qc *QCode, sel *Select, role string) {
 func (com *Compiler) compileArgs(qc *QCode, sel *Select, args []Arg, role string) error {
 	var err error
 
-	// don't free this arg either previously done or will be free'd
-	// in the future like in psql
-	var df bool
-
 	for i := range args {
 		arg := &args[i]
 
 		switch arg.Name {
 		case "id":
-			err, df = com.compileArgID(sel, arg)
+			err = com.compileArgID(sel, arg)
 
 		case "search":
-			err, df = com.compileArgSearch(sel, arg)
+			err = com.compileArgSearch(sel, arg)
 
 		case "where":
-			err, df = com.compileArgWhere(sel, arg, role)
+			err = com.compileArgWhere(sel, arg, role)
 
 		case "orderby", "order_by", "order":
-			err, df = com.compileArgOrderBy(sel, arg)
+			err = com.compileArgOrderBy(sel, arg)
 
 		case "distinct_on", "distinct":
-			err, df = com.compileArgDistinctOn(sel, arg)
+			err = com.compileArgDistinctOn(sel, arg)
 
 		case "limit":
-			err, df = com.compileArgLimit(sel, arg)
+			err = com.compileArgLimit(sel, arg)
 
 		case "offset":
-			err, df = com.compileArgOffset(sel, arg)
+			err = com.compileArgOffset(sel, arg)
 
 		case "first":
-			err, df = com.compileArgFirstLast(sel, arg, PtForward)
+			err = com.compileArgFirstLast(sel, arg, PtForward)
 
 		case "last":
-			err, df = com.compileArgFirstLast(sel, arg, PtBackward)
+			err = com.compileArgFirstLast(sel, arg, PtBackward)
 
 		case "after":
-			err, df = com.compileArgAfterBefore(sel, arg, PtForward)
+			err = com.compileArgAfterBefore(sel, arg, PtForward)
 
 		case "before":
-			err, df = com.compileArgAfterBefore(sel, arg, PtBackward)
-		}
-
-		if !df {
-			FreeNode(arg.Val, 5)
+			err = com.compileArgAfterBefore(sel, arg, PtBackward)
 		}
 
 		if err != nil {
@@ -567,14 +629,12 @@ func (com *Compiler) compileArgNode(st *util.Stack, node *Node, usePool bool) (*
 		}
 
 		// Objects inside a list
-		if len(node.Name) == 0 {
+		if node.Name == "" {
 			pushChildren(st, node.exp, node)
 			continue
 
-		} else {
-			if _, ok := com.bl[node.Name]; ok {
-				continue
-			}
+		} else if _, ok := com.bl[node.Name]; ok {
+			continue
 		}
 
 		ex, err := newExp(st, node, usePool)
@@ -597,39 +657,20 @@ func (com *Compiler) compileArgNode(st *util.Stack, node *Node, usePool bool) (*
 		}
 	}
 
-	if usePool {
-		st.Push(node)
-
-		for {
-			if st.Len() == 0 {
-				break
-			}
-			intf := st.Pop()
-			node, ok := intf.(*Node)
-			if !ok || node == nil {
-				continue
-			}
-			for i := range node.Children {
-				st.Push(node.Children[i])
-			}
-			FreeNode(node, 1)
-		}
-	}
-
 	return root, needsUser, nil
 }
 
-func (com *Compiler) compileArgID(sel *Select, arg *Arg) (error, bool) {
+func (com *Compiler) compileArgID(sel *Select, arg *Arg) error {
 	if sel.ID != 0 {
-		return nil, false
+		return nil
 	}
 
 	if sel.Where != nil && sel.Where.Op == OpEqID {
-		return nil, false
+		return nil
 	}
 
 	if arg.Val.Type != NodeVar {
-		return argErr("id", "variable"), false
+		return argErr("id", "variable")
 	}
 
 	ex := expPool.Get().(*Exp)
@@ -640,12 +681,12 @@ func (com *Compiler) compileArgID(sel *Select, arg *Arg) (error, bool) {
 	ex.Val = arg.Val.Val
 
 	sel.Where = ex
-	return nil, false
+	return nil
 }
 
-func (com *Compiler) compileArgSearch(sel *Select, arg *Arg) (error, bool) {
+func (com *Compiler) compileArgSearch(sel *Select, arg *Arg) error {
 	if arg.Val.Type != NodeVar {
-		return argErr("search", "variable"), false
+		return argErr("search", "variable")
 	}
 
 	ex := expPool.Get().(*Exp)
@@ -660,18 +701,19 @@ func (com *Compiler) compileArgSearch(sel *Select, arg *Arg) (error, bool) {
 	}
 
 	sel.Args[arg.Name] = arg.Val
+	arg.df = true
 	AddFilter(sel, ex)
 
-	return nil, true
+	return nil
 }
 
-func (com *Compiler) compileArgWhere(sel *Select, arg *Arg, role string) (error, bool) {
+func (com *Compiler) compileArgWhere(sel *Select, arg *Arg, role string) error {
 	st := util.NewStack()
 	var err error
 
 	ex, nu, err := com.compileArgObj(st, arg)
 	if err != nil {
-		return err, false
+		return err
 	}
 
 	if nu && role == "anon" {
@@ -679,12 +721,12 @@ func (com *Compiler) compileArgWhere(sel *Select, arg *Arg, role string) (error,
 	}
 	AddFilter(sel, ex)
 
-	return nil, true
+	return nil
 }
 
-func (com *Compiler) compileArgOrderBy(sel *Select, arg *Arg) (error, bool) {
+func (com *Compiler) compileArgOrderBy(sel *Select, arg *Arg) error {
 	if arg.Val.Type != NodeObj {
-		return fmt.Errorf("expecting an object"), false
+		return fmt.Errorf("expecting an object")
 	}
 
 	st := util.NewStack()
@@ -702,16 +744,15 @@ func (com *Compiler) compileArgOrderBy(sel *Select, arg *Arg) (error, bool) {
 		node, ok := intf.(*Node)
 
 		if !ok || node == nil {
-			return fmt.Errorf("17: unexpected value %v (%t)", intf, intf), false
+			return fmt.Errorf("17: unexpected value %v (%t)", intf, intf)
 		}
 
 		if _, ok := com.bl[node.Name]; ok {
-			FreeNode(node, 2)
 			continue
 		}
 
 		if node.Type != NodeStr && node.Type != NodeVar {
-			return fmt.Errorf("expecting a string or variable"), false
+			return fmt.Errorf("expecting a string or variable")
 		}
 
 		ob := &OrderBy{}
@@ -730,25 +771,24 @@ func (com *Compiler) compileArgOrderBy(sel *Select, arg *Arg) (error, bool) {
 		case "desc_nulls_last":
 			ob.Order = OrderDescNullsLast
 		default:
-			return fmt.Errorf("valid values include asc, desc, asc_nulls_first and desc_nulls_first"), false
+			return fmt.Errorf("valid values include asc, desc, asc_nulls_first and desc_nulls_first")
 		}
 
 		setOrderByColName(ob, node)
 		sel.OrderBy = append(sel.OrderBy, ob)
-		FreeNode(node, 3)
 	}
-	return nil, false
+	return nil
 }
 
-func (com *Compiler) compileArgDistinctOn(sel *Select, arg *Arg) (error, bool) {
+func (com *Compiler) compileArgDistinctOn(sel *Select, arg *Arg) error {
 	node := arg.Val
 
 	if _, ok := com.bl[node.Name]; ok {
-		return nil, false
+		return nil
 	}
 
 	if node.Type != NodeList && node.Type != NodeStr {
-		return fmt.Errorf("expecting a list of strings or just a string"), false
+		return fmt.Errorf("expecting a list of strings or just a string")
 	}
 
 	if node.Type == NodeStr {
@@ -757,68 +797,70 @@ func (com *Compiler) compileArgDistinctOn(sel *Select, arg *Arg) (error, bool) {
 
 	for i := range node.Children {
 		sel.DistinctOn = append(sel.DistinctOn, node.Children[i].Val)
-		FreeNode(node.Children[i], 5)
 	}
 
-	return nil, false
+	return nil
 }
 
-func (com *Compiler) compileArgLimit(sel *Select, arg *Arg) (error, bool) {
+func (com *Compiler) compileArgLimit(sel *Select, arg *Arg) error {
 	node := arg.Val
 
 	if node.Type != NodeInt {
-		return argErr("limit", "number"), false
+		return argErr("limit", "number")
 	}
 
 	sel.Paging.Limit = node.Val
 
-	return nil, false
+	return nil
 }
 
-func (com *Compiler) compileArgOffset(sel *Select, arg *Arg) (error, bool) {
+func (com *Compiler) compileArgOffset(sel *Select, arg *Arg) error {
 	node := arg.Val
 
 	if node.Type != NodeVar {
-		return argErr("offset", "variable"), false
+		return argErr("offset", "variable")
 	}
 
 	sel.Paging.Offset = node.Val
-	return nil, false
+	return nil
 }
 
-func (com *Compiler) compileArgFirstLast(sel *Select, arg *Arg, pt PagingType) (error, bool) {
+func (com *Compiler) compileArgFirstLast(sel *Select, arg *Arg, pt PagingType) error {
 	node := arg.Val
 
 	if node.Type != NodeInt {
-		return argErr(arg.Name, "number"), false
+		return argErr(arg.Name, "number")
 	}
 
 	sel.Paging.Type = pt
 	sel.Paging.Limit = node.Val
 
-	return nil, false
+	return nil
 }
 
-func (com *Compiler) compileArgAfterBefore(sel *Select, arg *Arg, pt PagingType) (error, bool) {
+func (com *Compiler) compileArgAfterBefore(sel *Select, arg *Arg, pt PagingType) error {
 	node := arg.Val
 
 	if node.Type != NodeVar || node.Val != "cursor" {
-		return fmt.Errorf("value for argument '%s' must be a variable named $cursor", arg.Name), false
+		return fmt.Errorf("value for argument '%s' must be a variable named $cursor", arg.Name)
 	}
 	sel.Paging.Type = pt
 	sel.Paging.Cursor = true
 
-	return nil, false
+	return nil
 }
 
-var zeroTrv = &trval{}
+// var zeroTrv = &trval{}
 
 func (com *Compiler) getRole(role, field string) *trval {
 	if trv, ok := com.tr[role][field]; ok {
 		return trv
-	} else {
-		return zeroTrv
 	}
+
+	return nil
+	// } else {
+	// 	return zeroTrv
+	// }
 }
 
 func AddFilter(sel *Select, fil *Exp) {
@@ -945,6 +987,9 @@ func newExp(st *util.Stack, node *Node, usePool bool) (*Exp, error) {
 		ex.Op = OpDistinct
 		ex.Val = node.Val
 	default:
+		if len(node.Children) == 0 {
+			return nil, fmt.Errorf("[Where] invalid operation: %s", name)
+		}
 		pushChildren(st, node.exp, node)
 		return nil, nil // skip node
 	}
@@ -964,8 +1009,9 @@ func newExp(st *util.Stack, node *Node, usePool bool) (*Exp, error) {
 		case NodeVar:
 			ex.Type = ValVar
 		default:
-			return nil, fmt.Errorf("[Where] valid values include string, int, float, boolean and list: %s", node.Type)
+			return nil, fmt.Errorf("[Where] invalid values for: %s", name)
 		}
+
 		setWhereColName(ex, node)
 	}
 
@@ -984,10 +1030,15 @@ func setListVal(ex *Exp, node *Node) {
 		case NodeFloat:
 			ex.ListType = ValFloat
 		}
+	} else {
+		ex.Val = node.Val
+		return
 	}
+
 	for i := range node.Children {
 		ex.ListVal = append(ex.ListVal, node.Children[i].Val)
 	}
+
 }
 
 func setWhereColName(ex *Exp, node *Node) {
@@ -997,7 +1048,7 @@ func setWhereColName(ex *Exp, node *Node) {
 		if n.Type != NodeObj {
 			continue
 		}
-		if len(n.Name) != 0 {
+		if n.Name != "" {
 			k := n.Name
 			if k == "and" || k == "or" || k == "not" ||
 				k == "_and" || k == "_or" || k == "_not" {
@@ -1014,6 +1065,7 @@ func setWhereColName(ex *Exp, node *Node) {
 		ex.Col = list[listlen-1]
 		ex.NestedCols = list[:listlen]
 	}
+
 }
 
 func setOrderByColName(ob *OrderBy, node *Node) {
@@ -1175,3 +1227,81 @@ func FreeExp(ex *Exp) {
 func argErr(name, ty string) error {
 	return fmt.Errorf("value for argument '%s' must be a %s", name, ty)
 }
+
+func freeNodes(op *Operation) {
+	var st *util.Stack
+	fm := make(map[*Node]struct{})
+
+	for i := range op.Args {
+		arg := op.Args[i]
+		if arg.df {
+			continue
+		}
+
+		for i := range arg.Val.Children {
+			if st == nil {
+				st = util.NewStack()
+			}
+			c := arg.Val.Children[i]
+			if _, ok := fm[c]; !ok {
+				st.Push(c)
+			}
+		}
+
+		if _, ok := fm[arg.Val]; !ok {
+			nodePool.Put(arg.Val)
+			fm[arg.Val] = struct{}{}
+		}
+
+	}
+
+	for i := range op.Fields {
+		f := op.Fields[i]
+
+		for j := range f.Args {
+			arg := f.Args[j]
+			if arg.df {
+				continue
+			}
+
+			for k := range arg.Val.Children {
+				if st == nil {
+					st = util.NewStack()
+				}
+				c := arg.Val.Children[k]
+				if _, ok := fm[c]; !ok {
+					st.Push(c)
+				}
+			}
+
+			if _, ok := fm[arg.Val]; !ok {
+				nodePool.Put(arg.Val)
+				fm[arg.Val] = struct{}{}
+			}
+		}
+	}
+
+	if st == nil {
+		return
+	}
+
+	for {
+		if st.Len() == 0 {
+			break
+		}
+		intf := st.Pop()
+		node, ok := intf.(*Node)
+		if !ok || node == nil {
+			continue
+		}
+
+		for i := range node.Children {
+			st.Push(node.Children[i])
+		}
+
+		if _, ok := fm[node]; !ok {
+			nodePool.Put(node)
+			fm[node] = struct{}{}
+		}
+	}
+}

core/internal/qcode/utils.go

@@ -0,0 +1,49 @@
+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 QTUnknown:
+		return "unknown"
+	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

@@ -0,0 +1,50 @@
+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/introspec.go

@@ -0,0 +1,490 @@
+package core
+
+import (
+	"strings"
+
+	"github.com/chirino/graphql"
+	"github.com/chirino/graphql/resolvers"
+	"github.com/chirino/graphql/schema"
+	"github.com/dosco/super-graph/core/internal/psql"
+)
+
+var typeMap map[string]string = map[string]string{
+	"smallint":         "Int",
+	"integer":          "Int",
+	"bigint":           "Int",
+	"smallserial":      "Int",
+	"serial":           "Int",
+	"bigserial":        "Int",
+	"decimal":          "Float",
+	"numeric":          "Float",
+	"real":             "Float",
+	"double precision": "Float",
+	"money":            "Float",
+	"boolean":          "Boolean",
+}
+
+func (sg *SuperGraph) initGraphQLEgine() error {
+	engine := graphql.New()
+	engineSchema := engine.Schema
+	dbSchema := sg.schema
+
+	if err := engineSchema.Parse(`enum OrderDirection { asc desc }`); err != nil {
+		return err
+	}
+
+	gqltype := func(col psql.DBColumn) schema.Type {
+		typeName := typeMap[strings.ToLower(col.Type)]
+		if typeName == "" {
+			typeName = "String"
+		}
+		var t schema.Type = &schema.TypeName{Name: typeName}
+		if col.NotNull {
+			t = &schema.NonNull{OfType: t}
+		}
+		return t
+	}
+
+	query := &schema.Object{
+		Name:   "Query",
+		Fields: schema.FieldList{},
+	}
+	mutation := &schema.Object{
+		Name:   "Mutation",
+		Fields: schema.FieldList{},
+	}
+	engineSchema.Types[query.Name] = query
+	engineSchema.Types[mutation.Name] = mutation
+	engineSchema.EntryPoints[schema.Query] = query
+	engineSchema.EntryPoints[schema.Mutation] = mutation
+
+	//validGraphQLIdentifierRegex := regexp.MustCompile(`^[A-Za-z_][A-Za-z_0-9]*$`)
+
+	scalarExpressionTypesNeeded := map[string]bool{}
+	tableNames := dbSchema.GetTableNames()
+	funcs := dbSchema.GetFunctions()
+
+	for _, table := range tableNames {
+		ti, err := dbSchema.GetTable(table)
+		if err != nil {
+			return err
+		}
+
+		if !ti.IsSingular {
+			continue
+		}
+
+		singularName := ti.Singular
+		// if !validGraphQLIdentifierRegex.MatchString(singularName) {
+		// 	return errors.New("table name is not a valid GraphQL identifier: " + singularName)
+		// }
+		pluralName := ti.Plural
+		// if !validGraphQLIdentifierRegex.MatchString(pluralName) {
+		// 	return errors.New("table name is not a valid GraphQL identifier: " + pluralName)
+		// }
+
+		outputType := &schema.Object{
+			Name:   singularName + "Output",
+			Fields: schema.FieldList{},
+		}
+		engineSchema.Types[outputType.Name] = outputType
+
+		inputType := &schema.InputObject{
+			Name:   singularName + "Input",
+			Fields: schema.InputValueList{},
+		}
+		engineSchema.Types[inputType.Name] = inputType
+
+		orderByType := &schema.InputObject{
+			Name:   singularName + "OrderBy",
+			Fields: schema.InputValueList{},
+		}
+		engineSchema.Types[orderByType.Name] = orderByType
+
+		expressionTypeName := singularName + "Expression"
+		expressionType := &schema.InputObject{
+			Name: expressionTypeName,
+			Fields: schema.InputValueList{
+				&schema.InputValue{
+					Name: "and",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: expressionTypeName}},
+				},
+				&schema.InputValue{
+					Name: "or",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: expressionTypeName}},
+				},
+				&schema.InputValue{
+					Name: "not",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: expressionTypeName}},
+				},
+			},
+		}
+		engineSchema.Types[expressionType.Name] = expressionType
+
+		for _, col := range ti.Columns {
+			colName := col.Name
+			// if !validGraphQLIdentifierRegex.MatchString(colName) {
+			// 	return errors.New("column name is not a valid GraphQL identifier: " + colName)
+			// }
+
+			colType := gqltype(col)
+			nullableColType := ""
+			if x, ok := colType.(*schema.NonNull); ok {
+				nullableColType = x.OfType.(*schema.TypeName).Name
+			} else {
+				nullableColType = colType.(*schema.TypeName).Name
+			}
+
+			outputType.Fields = append(outputType.Fields, &schema.Field{
+				Name: colName,
+				Type: colType,
+			})
+
+			for _, f := range funcs {
+				if col.Type != f.Params[0].Type {
+					continue
+				}
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: f.Name + "_" + colName,
+					Type: colType,
+				})
+			}
+
+			// If it's a numeric type...
+			if nullableColType == "Float" || nullableColType == "Int" {
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: "avg_" + colName,
+					Type: colType,
+				})
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: "count_" + colName,
+					Type: colType,
+				})
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: "max_" + colName,
+					Type: colType,
+				})
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: "min_" + colName,
+					Type: colType,
+				})
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: "stddev_" + colName,
+					Type: colType,
+				})
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: "stddev_pop_" + colName,
+					Type: colType,
+				})
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: "stddev_samp_" + colName,
+					Type: colType,
+				})
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: "variance_" + colName,
+					Type: colType,
+				})
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: "var_pop_" + colName,
+					Type: colType,
+				})
+				outputType.Fields = append(outputType.Fields, &schema.Field{
+					Name: "var_samp_" + colName,
+					Type: colType,
+				})
+			}
+
+			inputType.Fields = append(inputType.Fields, &schema.InputValue{
+				Name: colName,
+				Type: colType,
+			})
+			orderByType.Fields = append(orderByType.Fields, &schema.InputValue{
+				Name: colName,
+				Type: &schema.NonNull{OfType: &schema.TypeName{Name: "OrderDirection"}},
+			})
+
+			scalarExpressionTypesNeeded[nullableColType] = true
+
+			expressionType.Fields = append(expressionType.Fields, &schema.InputValue{
+				Name: colName,
+				Type: &schema.NonNull{OfType: &schema.TypeName{Name: nullableColType + "Expression"}},
+			})
+		}
+
+		outputTypeName := &schema.TypeName{Name: outputType.Name}
+		inputTypeName := &schema.TypeName{Name: inputType.Name}
+		pluralOutputTypeName := &schema.NonNull{OfType: &schema.List{OfType: &schema.NonNull{OfType: &schema.TypeName{Name: outputType.Name}}}}
+		pluralInputTypeName := &schema.NonNull{OfType: &schema.List{OfType: &schema.NonNull{OfType: &schema.TypeName{Name: inputType.Name}}}}
+
+		args := schema.InputValueList{
+			&schema.InputValue{
+				Desc: schema.Description{Text: "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."},
+				Name: "order_by",
+				Type: &schema.NonNull{OfType: &schema.TypeName{Name: orderByType.Name}},
+			},
+			&schema.InputValue{
+				Desc: schema.Description{Text: ""},
+				Name: "where",
+				Type: &schema.NonNull{OfType: &schema.TypeName{Name: expressionType.Name}},
+			},
+			&schema.InputValue{
+				Desc: schema.Description{Text: ""},
+				Name: "limit",
+				Type: &schema.NonNull{OfType: &schema.TypeName{Name: "Int"}},
+			},
+			&schema.InputValue{
+				Desc: schema.Description{Text: ""},
+				Name: "offset",
+				Type: &schema.NonNull{OfType: &schema.TypeName{Name: "Int"}},
+			},
+			&schema.InputValue{
+				Desc: schema.Description{Text: ""},
+				Name: "first",
+				Type: &schema.NonNull{OfType: &schema.TypeName{Name: "Int"}},
+			},
+			&schema.InputValue{
+				Desc: schema.Description{Text: ""},
+				Name: "last",
+				Type: &schema.NonNull{OfType: &schema.TypeName{Name: "Int"}},
+			},
+			&schema.InputValue{
+				Desc: schema.Description{Text: ""},
+				Name: "before",
+				Type: &schema.TypeName{Name: "String"},
+			},
+			&schema.InputValue{
+				Desc: schema.Description{Text: ""},
+				Name: "after",
+				Type: &schema.TypeName{Name: "String"},
+			},
+		}
+		if ti.PrimaryCol != nil {
+			t := gqltype(*ti.PrimaryCol)
+			if _, ok := t.(*schema.NonNull); !ok {
+				t = &schema.NonNull{OfType: t}
+			}
+			args = append(args, &schema.InputValue{
+				Desc: schema.Description{Text: "Finds the record by the primary key"},
+				Name: "id",
+				Type: t,
+			})
+		}
+
+		if ti.TSVCol != nil {
+			args = append(args, &schema.InputValue{
+				Desc: schema.Description{Text: "Performs full text search using a TSV index"},
+				Name: "search",
+				Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+			})
+		}
+
+		query.Fields = append(query.Fields, &schema.Field{
+			Desc: schema.Description{Text: ""},
+			Name: singularName,
+			Type: outputTypeName,
+			Args: args,
+		})
+		query.Fields = append(query.Fields, &schema.Field{
+			Desc: schema.Description{Text: ""},
+			Name: pluralName,
+			Type: pluralOutputTypeName,
+			Args: args,
+		})
+
+		mutationArgs := append(args, schema.InputValueList{
+			&schema.InputValue{
+				Desc: schema.Description{Text: ""},
+				Name: "insert",
+				Type: inputTypeName,
+			},
+			&schema.InputValue{
+				Desc: schema.Description{Text: ""},
+				Name: "update",
+				Type: inputTypeName,
+			},
+
+			&schema.InputValue{
+				Desc: schema.Description{Text: ""},
+				Name: "upsert",
+				Type: inputTypeName,
+			},
+		}...)
+
+		mutation.Fields = append(mutation.Fields, &schema.Field{
+			Name: singularName,
+			Args: mutationArgs,
+			Type: outputType,
+		})
+		mutation.Fields = append(mutation.Fields, &schema.Field{
+			Name: pluralName,
+			Args: append(mutationArgs, schema.InputValueList{
+				&schema.InputValue{
+					Desc: schema.Description{Text: ""},
+					Name: "inserts",
+					Type: pluralInputTypeName,
+				},
+				&schema.InputValue{
+					Desc: schema.Description{Text: ""},
+					Name: "updates",
+					Type: pluralInputTypeName,
+				},
+				&schema.InputValue{
+					Desc: schema.Description{Text: ""},
+					Name: "upserts",
+					Type: pluralInputTypeName,
+				},
+			}...),
+			Type: outputType,
+		})
+	}
+
+	for typeName := range scalarExpressionTypesNeeded {
+		expressionType := &schema.InputObject{
+			Name: typeName + "Expression",
+			Fields: schema.InputValueList{
+				&schema.InputValue{
+					Name: "eq",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "equals",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "neq",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "not_equals",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "gt",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "greater_than",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "lt",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "lesser_than",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "gte",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "greater_or_equals",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "lte",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "lesser_or_equals",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "in",
+					Type: &schema.NonNull{OfType: &schema.List{OfType: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}}}},
+				},
+				&schema.InputValue{
+					Name: "nin",
+					Type: &schema.NonNull{OfType: &schema.List{OfType: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}}}},
+				},
+				&schema.InputValue{
+					Name: "not_in",
+					Type: &schema.NonNull{OfType: &schema.List{OfType: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}}}},
+				},
+
+				&schema.InputValue{
+					Name: "like",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+				},
+				&schema.InputValue{
+					Name: "nlike",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+				},
+				&schema.InputValue{
+					Name: "not_like",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+				},
+				&schema.InputValue{
+					Name: "ilike",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+				},
+				&schema.InputValue{
+					Name: "nilike",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+				},
+				&schema.InputValue{
+					Name: "not_ilike",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+				},
+				&schema.InputValue{
+					Name: "similar",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+				},
+				&schema.InputValue{
+					Name: "nsimilar",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+				},
+				&schema.InputValue{
+					Name: "not_similar",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+				},
+				&schema.InputValue{
+					Name: "has_key",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}},
+				},
+				&schema.InputValue{
+					Name: "has_key_any",
+					Type: &schema.NonNull{OfType: &schema.List{OfType: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}}}},
+				},
+				&schema.InputValue{
+					Name: "has_key_all",
+					Type: &schema.NonNull{OfType: &schema.List{OfType: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}}}},
+				},
+				&schema.InputValue{
+					Name: "contains",
+					Type: &schema.NonNull{OfType: &schema.List{OfType: &schema.NonNull{OfType: &schema.TypeName{Name: typeName}}}},
+				},
+				&schema.InputValue{
+					Name: "contained_in",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "String"}},
+				},
+				&schema.InputValue{
+					Name: "is_null",
+					Type: &schema.NonNull{OfType: &schema.TypeName{Name: "Boolean"}},
+				},
+			},
+		}
+		engineSchema.Types[expressionType.Name] = expressionType
+	}
+
+	if err := engineSchema.ResolveTypes(); err != nil {
+		return err
+	}
+
+	engine.Resolver = resolvers.Func(func(request *resolvers.ResolveRequest, next resolvers.Resolution) resolvers.Resolution {
+		resolver := resolvers.MetadataResolver.Resolve(request, next)
+		if resolver != nil {
+			return resolver
+		}
+		resolver = resolvers.MethodResolver.Resolve(request, next) // needed by the MetadataResolver
+		if resolver != nil {
+			return resolver
+		}
+
+		return nil
+	})
+
+	sg.ge = engine
+	return nil
+}

core/prepare.go

@@ -0,0 +1,169 @@
+package core
+
+import (
+	"bytes"
+	"database/sql"
+	"fmt"
+	"hash/maphash"
+	"io"
+	"strings"
+	"sync"
+
+	"github.com/dosco/super-graph/core/internal/allow"
+	"github.com/dosco/super-graph/core/internal/qcode"
+)
+
+type query struct {
+	sync.Once
+	sd      *sql.Stmt
+	ai      allow.Item
+	qt      qcode.QType
+	err     error
+	st      stmt
+	roleArg bool
+}
+
+func (sg *SuperGraph) prepare(q *query, role string) {
+	var stmts []stmt
+	var err error
+
+	qb := []byte(q.ai.Query)
+	vars := []byte(q.ai.Vars)
+
+	switch q.qt {
+	case qcode.QTQuery:
+		if sg.abacEnabled {
+			stmts, err = sg.buildMultiStmt(qb, vars)
+		} else {
+			stmts, err = sg.buildRoleStmt(qb, vars, role)
+		}
+
+	case qcode.QTMutation:
+		stmts, err = sg.buildRoleStmt(qb, vars, role)
+	}
+
+	if err != nil {
+		sg.log.Printf("WRN %s %s: %v", q.qt, q.ai.Name, err)
+	}
+
+	q.st = stmts[0]
+	q.roleArg = len(stmts) > 1
+
+	q.sd, err = sg.db.Prepare(q.st.sql)
+	if err != nil {
+		q.err = fmt.Errorf("prepare failed: %v: %s", err, q.st.sql)
+	}
+}
+
+func (sg *SuperGraph) initPrepared() error {
+	if sg.allowList.IsPersist() {
+		return nil
+	}
+
+	if err := sg.prepareRoleStmt(); err != nil {
+		return fmt.Errorf("role query: %w", err)
+	}
+
+	sg.queries = make(map[uint64]*query)
+
+	list, err := sg.allowList.Load()
+	if err != nil {
+		return err
+	}
+
+	h := maphash.Hash{}
+	h.SetSeed(sg.hashSeed)
+
+	for _, v := range list {
+		if v.Query == "" {
+			continue
+		}
+
+		qt := qcode.GetQType(v.Query)
+
+		switch qt {
+		case qcode.QTQuery:
+			sg.queries[queryID(&h, v.Name, "user")] = &query{ai: v, qt: qt}
+			sg.queries[queryID(&h, v.Name, "anon")] = &query{ai: v, qt: qt}
+
+		case qcode.QTMutation:
+			for _, role := range sg.conf.Roles {
+				sg.queries[queryID(&h, v.Name, role.Name)] = &query{ai: v, qt: qt}
+			}
+		}
+	}
+
+	return nil
+}
+
+// nolint: errcheck
+func (sg *SuperGraph) prepareRoleStmt() error {
+	var err error
+
+	if !sg.abacEnabled {
+		return nil
+	}
+
+	rq := strings.ReplaceAll(sg.conf.RolesQuery, "$user_id", "$1")
+	w := &bytes.Buffer{}
+
+	io.WriteString(w, `SELECT (CASE WHEN EXISTS (`)
+	io.WriteString(w, rq)
+	io.WriteString(w, `) THEN `)
+
+	io.WriteString(w, `(SELECT (CASE`)
+	for _, role := range sg.conf.Roles {
+		if role.Match == "" {
+			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 $2 END) FROM (`)
+	io.WriteString(w, rq)
+	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; `)
+
+	sg.getRole, err = sg.db.Prepare(w.String())
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (sg *SuperGraph) initAllowList() error {
+	var ac allow.Config
+	var err error
+
+	if sg.conf.AllowListFile == "" {
+		sg.conf.AllowListFile = "allow.list"
+	}
+
+	// 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, Log: sg.log}
+	}
+
+	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 queryID(h *maphash.Hash, name, role string) uint64 {
+	h.WriteString(name)
+	h.WriteString(role)
+	v := h.Sum64()
+	h.Reset()
+
+	return v
+}

core/remote.go

@@ -1,31 +1,28 @@
-package serv
+package core
 
 import (
 	"bytes"
 	"errors"
 	"fmt"
+	"hash/maphash"
 	"net/http"
 	"sync"
 
-	"github.com/cespare/xxhash/v2"
+	"github.com/dosco/super-graph/core/internal/qcode"
 	"github.com/dosco/super-graph/jsn"
-	"github.com/dosco/super-graph/qcode"
 )
 
-func execRemoteJoin(st *stmt, data []byte, hdr http.Header) ([]byte, error) {
+func (sg *SuperGraph) execRemoteJoin(st *stmt, data []byte, hdr http.Header) ([]byte, error) {
 	var err error
 
-	if len(data) == 0 || st.skipped == 0 {
-		return data, nil
-	}
-
 	sel := st.qc.Selects
-	h := xxhash.New()
+	h := maphash.Hash{}
+	h.SetSeed(sg.hashSeed)
 
 	// fetch the field name used within the db response json
 	// that are used to mark insertion points and the mapping between
 	// those field names and their select objects
-	fids, sfmap := parentFieldIds(h, sel, st.skipped)
+	fids, sfmap := sg.parentFieldIds(&h, sel, st.md.Skipped())
 
 	// fetch the field values of the marked insertion points
 	// these values contain the id to be used with fetching remote data
@@ -34,10 +31,10 @@ func execRemoteJoin(st *stmt, data []byte, hdr http.Header) ([]byte, error) {
 
 	switch {
 	case len(from) == 1:
-		to, err = resolveRemote(hdr, h, from[0], sel, sfmap)
+		to, err = sg.resolveRemote(hdr, &h, from[0], sel, sfmap)
 
 	case len(from) > 1:
-		to, err = resolveRemotes(hdr, h, from, sel, sfmap)
+		to, err = sg.resolveRemotes(hdr, &h, from, sel, sfmap)
 
 	default:
 		return nil, errors.New("something wrong no remote ids found in db response")
@@ -57,9 +54,9 @@ func execRemoteJoin(st *stmt, data []byte, hdr http.Header) ([]byte, error) {
 	return ob.Bytes(), nil
 }
 
-func resolveRemote(
+func (sg *SuperGraph) resolveRemote(
 	hdr http.Header,
-	h *xxhash.Digest,
+	h *maphash.Hash,
 	field jsn.Field,
 	sel []qcode.Select,
 	sfmap map[uint64]*qcode.Select) ([]jsn.Field, error) {
@@ -70,7 +67,8 @@ func resolveRemote(
 	to := toA[:1]
 
 	// use the json key to find the related Select object
-	k1 := xxhash.Sum64(field.Key)
+	_, _ = h.Write(field.Key)
+	k1 := h.Sum64()
 
 	s, ok := sfmap[k1]
 	if !ok {
@@ -82,7 +80,7 @@ func resolveRemote(
 	// to find the resolver to use for this relationship
 	k2 := mkkey(h, s.Name, p.Name)
 
-	r, ok := rmap[k2]
+	r, ok := sg.rmap[k2]
 	if !ok {
 		return nil, nil
 	}
@@ -119,9 +117,9 @@ func resolveRemote(
 	return to, nil
 }
 
-func resolveRemotes(
+func (sg *SuperGraph) resolveRemotes(
 	hdr http.Header,
-	h *xxhash.Digest,
+	h *maphash.Hash,
 	from []jsn.Field,
 	sel []qcode.Select,
 	sfmap map[uint64]*qcode.Select) ([]jsn.Field, error) {
@@ -138,7 +136,8 @@ func resolveRemotes(
 	for i, id := range from {
 
 		// use the json key to find the related Select object
-		k1 := xxhash.Sum64(id.Key)
+		_, _ = h.Write(id.Key)
+		k1 := h.Sum64()
 
 		s, ok := sfmap[k1]
 		if !ok {
@@ -150,7 +149,7 @@ func resolveRemotes(
 		// to find the resolver to use for this relationship
 		k2 := mkkey(h, s.Name, p.Name)
 
-		r, ok := rmap[k2]
+		r, ok := sg.rmap[k2]
 		if !ok {
 			return nil, nil
 		}
@@ -195,3 +194,59 @@ func resolveRemotes(
 
 	return to, cerr
 }
+
+func (sg *SuperGraph) parentFieldIds(h *maphash.Hash, sel []qcode.Select, skipped uint32) (
+	[][]byte,
+	map[uint64]*qcode.Select) {
+
+	c := 0
+	for i := range sel {
+		s := &sel[i]
+		if isSkipped(skipped, uint32(s.ID)) {
+			c++
+		}
+	}
+
+	// list of keys (and it's related value) to extract from
+	// the db json response
+	fm := make([][]byte, c)
+
+	// mapping between the above extracted key and a Select
+	// object
+	sm := make(map[uint64]*qcode.Select, c)
+	n := 0
+
+	for i := range sel {
+		s := &sel[i]
+
+		if !isSkipped(skipped, uint32(s.ID)) {
+			continue
+		}
+
+		p := sel[s.ParentID]
+		k := mkkey(h, s.Name, p.Name)
+
+		if r, ok := sg.rmap[k]; ok {
+			fm[n] = r.IDField
+			n++
+
+			_, _ = h.Write(r.IDField)
+			sm[h.Sum64()] = s
+		}
+	}
+
+	return fm, sm
+}
+
+func isSkipped(n, pos uint32) bool {
+	return ((n & (1 << pos)) != 0)
+}
+
+func colsToList(cols []qcode.Column) []string {
+	var f []string
+
+	for i := range cols {
+		f = append(f, cols[i].Name)
+	}
+	return f
+}

core/resolve.go

@@ -1,19 +1,14 @@
-package serv
+package core
 
 import (
 	"fmt"
+	"hash/maphash"
 	"io/ioutil"
 	"net/http"
-	"net/http/httputil"
 	"strings"
 
-	"github.com/cespare/xxhash/v2"
+	"github.com/dosco/super-graph/core/internal/psql"
 	"github.com/dosco/super-graph/jsn"
-	"github.com/dosco/super-graph/psql"
-)
-
-var (
-	rmap map[uint64]*resolvFn
 )
 
 type resolvFn struct {
@@ -22,24 +17,27 @@ type resolvFn struct {
 	Fn      func(h http.Header, id []byte) ([]byte, error)
 }
 
-func initResolvers() {
+func (sg *SuperGraph) initResolvers() error {
 	var err error
-	rmap = make(map[uint64]*resolvFn)
+	sg.rmap = make(map[uint64]resolvFn)
 
-	for _, t := range conf.Tables {
-		err = initRemotes(t)
+	for _, t := range sg.conf.Tables {
+		err = sg.initRemotes(t)
 		if err != nil {
 			break
 		}
 	}
 
 	if err != nil {
-		errlog.Fatal().Err(err).Msg("failed to initialize resolvers")
+		return fmt.Errorf("failed to initialize resolvers: %v", err)
 	}
+
+	return nil
 }
 
-func initRemotes(t configTable) error {
-	h := xxhash.New()
+func (sg *SuperGraph) initRemotes(t Table) error {
+	h := maphash.Hash{}
+	h.SetSeed(sg.hashSeed)
 
 	for _, r := range t.Remotes {
 		// defines the table column to be used as an id in the
@@ -48,8 +46,8 @@ func initRemotes(t configTable) error {
 
 		// if no table column specified in the config then
 		// use the primary key of the table as the id
-		if len(idcol) == 0 {
-			pcol, err := pcompile.IDColumn(t.Name)
+		if idcol == "" {
+			pcol, err := sg.pc.IDColumn(t.Name)
 			if err != nil {
 				return err
 			}
@@ -64,7 +62,7 @@ func initRemotes(t configTable) error {
 		val.Left.Col = idcol
 		val.Right.Col = idk
 
-		err := pcompile.AddRelationship(strings.ToLower(r.Name), t.Name, val)
+		err := sg.pc.AddRelationship(sanitize(r.Name), t.Name, val)
 		if err != nil {
 			return err
 		}
@@ -78,23 +76,24 @@ func initRemotes(t configTable) error {
 			path = append(path, []byte(p))
 		}
 
-		rf := &resolvFn{
+		rf := resolvFn{
 			IDField: []byte(idk),
 			Path:    path,
 			Fn:      fn,
 		}
 
 		// index resolver obj by parent and child names
-		rmap[mkkey(h, r.Name, t.Name)] = rf
+		sg.rmap[mkkey(&h, r.Name, t.Name)] = rf
 
 		// index resolver obj by IDField
-		rmap[xxhash.Sum64(rf.IDField)] = rf
+		_, _ = h.Write(rf.IDField)
+		sg.rmap[h.Sum64()] = rf
 	}
 
 	return nil
 }
 
-func buildFn(r configRemote) func(http.Header, []byte) ([]byte, error) {
+func buildFn(r Remote) func(http.Header, []byte) ([]byte, error) {
 	reqURL := strings.Replace(r.URL, "$id", "%s", 1)
 	client := &http.Client{}
 
@@ -117,29 +116,26 @@ func buildFn(r configRemote) func(http.Header, []byte) ([]byte, error) {
 			req.Header.Set(v, hdr.Get(v))
 		}
 
-		logger.Debug().Str("uri", uri).Msg("Remote Join")
-
 		res, err := client.Do(req)
 		if err != nil {
-			errlog.Error().Err(err).Msgf("Failed to connect to: %s", uri)
-			return nil, err
+			return nil, fmt.Errorf("failed to connect to '%s': %v", uri, err)
 		}
 		defer res.Body.Close()
 
-		if r.Debug {
-			reqDump, err := httputil.DumpRequestOut(req, true)
-			if err != nil {
-				return nil, err
-			}
+		// if r.Debug {
+		// reqDump, err := httputil.DumpRequestOut(req, true)
+		// if err != nil {
+		// 	return nil, err
+		// }
 
-			resDump, err := httputil.DumpResponse(res, true)
-			if err != nil {
-				return nil, err
-			}
+		// resDump, err := httputil.DumpResponse(res, true)
+		// if err != nil {
+		// 	return nil, err
+		// }
 
-			logger.Debug().Msgf("Remote Request Debug:\n%s\n%s",
-				reqDump, resDump)
-		}
+		// logger.Debug().Msgf("Remote Request Debug:\n%s\n%s",
+		// 	reqDump, resDump)
+		// }
 
 		if res.StatusCode != 200 {
 			return nil,

core/utils.go

@@ -0,0 +1,13 @@
+package core
+
+import "hash/maphash"
+
+// nolint: errcheck
+func mkkey(h *maphash.Hash, k1, k2 string) uint64 {
+	h.WriteString(k1)
+	h.WriteString(k2)
+	v := h.Sum64()
+	h.Reset()
+
+	return v
+}

docs/.vuepress/components/HomeLayout.vue

@@ -1,267 +0,0 @@
-<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/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="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/guide/.vuepress/components/Card.vue

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

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

@@ -0,0 +1,431 @@
+<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 inefficient 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.Fatal(err)
+  }
+
+  sg, err := core.NewSuperGraph(nil, db)
+  if err != nil {
+    log.Fatal(err)
+  }
+
+  graphqlQuery := `
+    query {
+      posts {
+      id
+      title
+    }
+  }`
+
+  res, err := sg.GraphQL(context.Background(), graphqlQuery, nil)
+  if err != nil {
+    log.Fatal(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/guide/.vuepress/config.js

@@ -1,6 +1,6 @@
 let ogprefix = 'og: http://ogp.me/ns#'
 let title = 'Super Graph'
-let description = 'An instant GraphQL API for your app. No code needed.'
+let description = 'Fetch data without code'
 let color = '#f42525'
 
 module.exports = {
@@ -15,7 +15,7 @@ module.exports = {
       { text: 'Internals', link: '/internals' },
       { text: 'Github', link: 'https://github.com/dosco/super-graph' },
       { text: 'Docker', link: 'https://hub.docker.com/r/dosco/super-graph/builds' },
-      { text: 'Join Chat', link: 'https://discord.gg/NKdXBc' },
+      { text: 'Join Chat', link: 'https://discord.com/invite/23Wh7c' },
     ],
     serviceWorker: {
       updatePopup: true