Remove extra link from README

Update docs, getting started guide and mutations
Fix return values for bulk mutations and delete
2019-10-04 22:43:41 -04:00 · 2019-10-04 22:20:54 -04:00 · 2019-10-03 10:24:11 -04:00 · 2019-10-03 03:08:01 -04:00 · 2019-10-02 11:31:49 -04:00 · 2019-10-01 18:14:59 -04:00
25 changed files with 1165 additions and 374 deletions
--- a/README.md
+++ b/README.md
@ -5,6 +5,7 @@
 ![MIT license](https://img.shields.io/github/license/dosco/super-graph.svg)
 ![Docker build](https://img.shields.io/docker/cloud/build/dosco/super-graph.svg)
 ![Cloud native](https://img.shields.io/badge/cloud--native-enabled-blue.svg)
+[![Discord Chat](https://img.shields.io/discord/628796009539043348.svg)](https://discord.gg/6pSWCTZ)  

 Get an instant high performance GraphQL API for Postgres. No code needed. GraphQL is automatically transformed into efficient database queries.

@ -45,7 +46,9 @@ This compiler is what sits at the heart of Super Graph with layers of useful fun

 ## Contact me

-[twitter.com/dosco](https://twitter.com/dosco)
+[twitter/dosco](https://twitter.com/dosco)
+
+[chat/super-graph](https://discord.gg/6pSWCTZ)

 ## License

--- a/config/allow.list
+++ b/config/allow.list
@ -1,28 +1,46 @@
 # http://localhost:8080/

-query {
-  me {
+variables {
+	"update": {
+		"name": "Wu-Tang",
+		"description": "No description needed"
+	},
+  "product_id": 1
+}
+
+mutation {
+  products(id: $product_id, update: $update) {
    id
-    email
-    full_name
+    name
+    description
  }
 }

 variables {
-	"update": {
-		"name": "Hellooooo",
-		"description": "World",
+	"data": {
+		"email": "gfk@myspace.com",
+		"full_name": "Ghostface Killah",
 		"created_at": "now",
 		"updated_at": "now"
-	},
-	"user": 123
+	}
 }

 mutation {
-  products(update: $update, where: {id: {eq: 134}}) {
+  user(insert: $data) {
+    id
+  }
+}
+
+variables {
+	"data": {
+		"product_id": 5
+	}
+}
+
+mutation {
+  products(id: $product_id, delete: true) {
    id
    name
-    description
  }
 }

@ -40,18 +58,32 @@ query {
 }

 variables {
-	"update": {
-		"name": "Hellooooo",
-		"description": "World"
-	},
-	"user": 123
+	"data": [
+		{
+			"name": "Protect Ya Neck",
+			"created_at": "now",
+			"updated_at": "now"
+		},
+		{
+			"name": "Enter the Wu-Tang",
+			"created_at": "now",
+			"updated_at": "now"
+		}
+	]
 }

 mutation {
-  products(update: $update, where: {id: {eq: 134}}) {
+  products(insert: $data) {
    id
    name
-    description
+  }
+}
+
+query {
+  me {
+    id
+    email
+    full_name
  }
 }

@ -69,19 +101,4 @@ mutation {
    name
    description
  }
-}
-
-query {
-  users {
-    id
-    email
-    picture: avatar
-    products(limit: 2, where: {price: {gt: 10}}) {
-      id
-      name
-      description
-    }
-  }
-}
-
-
+}
--- a/config/dev.yml
+++ b/config/dev.yml
@ -22,7 +22,7 @@ enable_tracing: true

 # Watch the config folder and reload Super Graph
 # with the new configs when a change is detected
-reload_on_config_change: true
+reload_on_config_change: false

 # File that points to the database seeding script
 # seed_file: seed.js
--- a/docs/.vuepress/components/HomeLayout.vue
+++ b/docs/.vuepress/components/HomeLayout.vue
@ -112,7 +112,7 @@
        </div>
      </div>

-      <div class="overflow-hidden h-0 bg-indigo-900" style="height: 730px">
+      <div class="overflow-hidden bg-indigo-900" style="height: 730px">
        <div class="container mx-auto py-20">
        <img src="/super-graph-web-ui.png">
        </div>
@ -125,7 +125,7 @@
          </h1>
          <div class="text-2xl md:text-3xl">
            <small class="text-sm">Download the Docker compose config for the demo</small>
-            <pre>&#8227; curl -o demo.yml https://bit.ly/2mq05lW</pre>
+            <pre>&#8227; curl -L -o demo.yml https://bit.ly/2mq05lW</pre>

            <small class="text-sm">Setup the demo database</small>
            <pre>&#8227; docker-compose -f demo.yml run rails_app rake db:create db:migrate db:seed</pre>
@ -138,22 +138,6 @@

            <small class="text-sm">Try the super graph web ui</small>
            <pre>&#8227; open http://localhost:8080</pre>
-            
-            <pre>
-            ## Try a query
-            query {
-              users {
-                id
-                email
-                picture : avatar
-                products(limit: 2, where: { price: { gt: 10 } }) {
-                  id
-                  name
-                  description
-                }
-              }
-            }
-            </pre>
          </div>
        </div>
      </div>
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@ -9,6 +9,8 @@ module.exports = {
      { text: 'Deploy', link: '/deploy' },
      { 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' },
+
    ],
    serviceWorker: {
      updatePopup: true
--- a/docs/README.md
+++ b/docs/README.md
@ -0,0 +1,30 @@
+---
+layout: HomeLayout
+
+home: true
+heroText: "Super Graph"
+heroImage: /super-graph-web-ui-half.png
+heroImageMobile: /super-graph-web-ui.png
+tagline: Build web products faster. Instant APIs for your apps
+longTagline: Get an instant high performance GraphQL API for Postgres. No code needed. GraphQL is automatically transformed into efficient database queries.
+actionText: Get Started, Free, Open Source →
+actionLink: /guide
+
+description: 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.
+
+features:
+- title: Simple
+  details: Easy config file, quick to deploy, No code needed. It just works.
+- title: High Performance
+  details: Compiles your GraphQL into a fast SQL query in realtime.
+- title: Ruby-on-Rails
+  details: Can read Rails cookies and supports rails database conventions.
+- title: Serverless
+  details: Instant startup for scale to zero environments like Google Cloud Run, App Engine, AWS Lambda
+- title: Go Lang
+  details: Go is a language created at Google to build fast and secure web services.
+- title: Free and Open Source
+  details: Not a VC funded startup. Not even a startup just good old open source code
+
+footer: MIT Licensed | Copyright © 2018-present Vikram Rangnekar
+---
--- a/docs/guide.md
+++ b/docs/guide.md
@ -4,30 +4,37 @@ sidebar: auto

 # Guide to Super Graph

-Without writing a line of code get an instant high-performance GraphQL API for your Ruby-on-Rails app. Super Graph will automatically understand your apps database and expose a secure, fast and complete GraphQL API for it. Built in support for Rails authentication and JWT tokens.
+Get an instant high performance GraphQL API for Postgres. No code needed. GraphQL is automatically transformed into efficient database queries. Also Designed to integrate with your Rails apps.
+

 ## Features
- Automatically learns Postgres schemas and relationships
- Supports Belongs-To, One-To-Many and Many-To-Many table relationships
+
 - Works with Rails database schemas
- Full text search and aggregations
+- Automatically learns schemas and relationships
+- Belongs-To, One-To-Many and Many-To-Many table relationships
+- Full text search and Aggregations
 - Rails Auth supported (Redis, Memcache, Cookie)
 - JWT tokens supported (Auth0, etc)
- Join database queries with remote data sources (APIs like Stripe, Twitter, etc) 
- Generates highly optimized and fast Postgres SQL queries
- Uses prepared statements for very fast Postgres queries
+- Join with remote REST APIs
+- Highly optimized and fast Postgres SQL queries
+- Support GraphQL queries and mutations
 - Configure with a simple config file
 - High performance GO codebase
 - Tiny docker image and low memory requirements
+- Database migrations tool
+- Write database seeding scripts in Javascript

-## Try it out
+## Try the demo app

 ```bash
-# download super graph source
-git clone https://github.com/dosco/super-graph.git
+# download the Docker compose config for the demo
+curl -L -o demo.yml https://bit.ly/2mq05lW

 # setup the demo rails app & database and run it
-./demo start
+docker-compose -f demo.yml run rails_app rake db:create db:migrate db:seed
+
+# run the demo
+docker-compose -f demo.yml up

 # signin to the demo app (user1@demo.com / 123456)
 open http://localhost:3000
@ -43,7 +50,7 @@ docker website [https://docs.docker.com/docker-for-mac/install/](https://docs.do

 #### Trying out GraphQL

-We currently support the `query` action which is used for fetching data. Support for `mutation` and `subscriptions` is work in progress. For example the below GraphQL query would fetch two products that belong to the current user where the price is greater than 10
+We currently fully support queries and mutations. Support for `subscriptions` is work in progress. For example the below GraphQL query would fetch two products that belong to the current user where the price is greater than 10.

 #### GQL Query

@ -65,6 +72,27 @@ query {
 }
 ```

+In another example the below GraphQL mutation would insert a product into the database. The first part of the below example is the variable data and the second half is the GraphQL mutation. For mutations data has to always ben passed as a variable.
+
+```json
+{
+  "data": { 
+    "name": "Art of Computer Programming",
+    "description": "The Art of Computer Programming (TAOCP) is a comprehensive monograph written by computer scientist Donald Knuth",
+    "price": 30.5
+  }
+}
+```
+
+```graphql
+mutation {
+  product(insert: $data) {
+    id
+    name
+  }
+}
+```
+
 The above GraphQL query returns the JSON result below. It handles all
 kinds of complexity without you having to writing a line of code.

@ -109,6 +137,325 @@ curl 'http://localhost:8080/api/v1/graphql' \
  -H 'content-type: application/json' \
  -H 'X-User-ID: 5' \
  --data-binary '{"query":"{ products { name price users { email }}}"}'
+```
+
+## Get Started
+
+Super Graph can generate your initial app for you. The generated app will have config files, database migrations and seed files among other things like docker related files.
+
+You can then add your database schema to the migrations, maybe create some seed data using the seed script and launch Super Graph. You're now good to go and can start working on your UI frontend in React, Vue or whatever.
+
+```bash
+# use the below command to download and install Super Graph. You will need Go 1.13 or above
+GO111MODULE=on go get -u github.com/dosco/super-graph
+
+# create a new app and change to it's directory
+super-graph new blog; cd blog
+
+# setup the app database and seed it with fake data. Docker compose will start a Postgres database for your app
+docker-compose run blog_api ./super-graph db:setup
+
+# and finally launch Super Graph configured for your app
+docker-compose up
+```
+
+Lets take a look at the files generated by Super Graph when you create a new app
+
+```bash
+super-graph new blog
+
+> created 'blog'
+> created 'blog/Dockerfile'
+> created 'blog/docker-compose.yml'
+> created 'blog/config'
+> created 'blog/config/dev.yml'
+> created 'blog/config/prod.yml'
+> created 'blog/config/seed.js'
+> created 'blog/config/migrations'
+> created 'blog/config/migrations/100_init.sql'
+> app 'blog' initialized
+```
+
+### Docker files
+
+Docker Compose is a great way to run multiple services while developing on your desktop or laptop. In our case we need Postgres and Super Graph to both be running and the `docker-compose.yml` is configured to do just that. The Super Graph service is named after your app postfixed with `_api`. The Dockerfile can be used build a containr of your app for production deployment.
+
+```bash
+docker-compose run blog_api ./super-graph help
+```
+
+### Config files
+
+All the config files needs to configure Super Graph for your app are contained in this folder for starters you have two `dev.yaml` and `prod.yaml`. When the `GO_ENV` environment variable is set to `development` then `dev.yaml` is used and the prod one when it's set to `production`. Stage and Test are the other two environment options, but you can set the `GO_ENV` to whatever you like (eg. `alpha-test`) and Super Graph will look for a yaml file with that name to load config from.
+
+### Seed.js
+
+Having data flowing through your API makes building your frontend UI so much easier. When creafting say a user profile wouldn't it be nice for the API to return a fake user with name, picture and all. This is why having the ability to seed your database is important. Seeding cn also be used in production to setup some initial users like the admins or to add an initial set of products to a ecommerce store.
+
+Super Graph makes this easy by allowing you to write your seeding script in plan old Javascript. The below file that auto-generated for new apps uses our built-in functions `fake` and `graphql` to generate fake data and use GraphQL mutations to insert it into the database.
+
+```javascript
+// Example script to seed database
+
+var users = [];
+
+for (i = 0; i < 10; i++) {
+  var data = {
+    full_name: fake.name(),
+    email: fake.email()
+  }
+
+  var res = graphql(" \
+  mutation { \
+    user(insert: $data) { \
+      id \
+    } \
+  }", { data: data })
+
+  users.push(res.user)
+}
+```
+
+You can generate the following fake data for your seeding purposes. Below is the list of fake data functions supported by the built-in fake data library. For example `fake.image_url()` will generate a fake image url or `fake.shuffle_strings(['hello', 'world', 'cool'])` will generate a randomly shuffled version of that array of strings or `fake.rand_string(['hello', 'world', 'cool'])` will return a random string from the array provided.
+
+```
+// Person
+person
+name
+name_prefix
+name_suffix
+first_name
+last_name
+gender
+ssn
+contact
+email
+phone
+phone_formatted
+username
+password
+
+// Address
+address
+city
+country
+country_abr
+state
+state_abr
+status_code
+street
+street_name
+street_number
+street_prefix
+street_suffix
+zip
+latitude
+latitude_in_range
+longitude
+longitude_in_range
+
+// Beer
+beer_alcohol
+beer_hop
+beer_ibu
+beer_blg
+beer_malt
+beer_name
+beer_style
+beer_yeast
+
+// Cars
+vehicle
+vehicle_type
+car_maker
+car_model
+fuel_type
+transmission_gear_type
+
+// Text
+word
+sentence
+paragrph
+question
+quote
+
+// Misc
+generate
+boolean
+uuid
+
+// Colors
+color
+hex_color
+rgb_color
+safe_color
+
+// Internet
+url
+image_url
+domain_name
+domain_suffix
+ipv4_address
+ipv6_address
+simple_status_code
+http_method
+user_agent
+user_agent_firefox
+user_agent_chrome
+user_agent_opera
+user_agent_safari
+
+// Date / Time
+date
+date_range
+nano_second
+second
+minute
+hour
+month
+day
+weekday
+year
+timezone
+timezone_abv
+timezone_full
+timezone_offset
+
+// Payment
+price
+credit_card
+credit_card_cvv
+credit_card_number
+credit_card_number_luhn
+credit_card_type
+currency
+currency_long
+currency_short
+
+// Company
+bs
+buzzword
+company
+company_suffix
+job
+job_description
+job_level
+job_title
+
+// Hacker
+hacker_abbreviation
+hacker_adjective
+hacker_ingverb
+hacker_noun
+hacker_phrase
+hacker_verb
+
+//Hipster
+hipster_word
+hipster_paragraph
+hipster_sentence
+
+// File
+extension
+mine_type
+
+// Numbers
+number
+numerify
+int8
+int16
+int32
+int64
+uint8
+uint16
+uint32
+uint64
+float32
+float32_range
+float64
+float64_range
+shuffle_ints
+mac_address
+
+//String
+digit
+letter
+lexify
+rand_string
+shuffle_strings
+numerify
+```
+
+### Migrations
+
+Easy database migrations is the most important thing when building products backend by a relational database. We make it super easy to manage and migrate your database.
+
+```bash
+super-graph db:new create_users
+> created migration 'config/migrations/101_create_users.sql'
+```
+
+Migrations in Super Graph are plain old Postgres SQL. Here's an example for the above migration.
+
+```sql
+-- Write your migrate up statements here
+
+CREATE TABLE public.users (
+  id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  full_name  text,
+  email      text UNIQUE NOT NULL CHECK (length(email) < 255),
+  created_at timestamptz NOT NULL NOT NULL DEFAULT NOW(),
+  updated_at timestamptz NOT NULL NOT NULL DEFAULT NOW()
+);
+
+---- create above / drop below ----
+
+-- Write your down migrate statements here. If this migration is irreversible
+-- then delete the separator line above.
+
+DROP TABLE public.users
+```
+
+We would encourage you to leverage triggers to maintain consistancy of your data for example here are a couple triggers that you can add to you init migration and across your tables.
+
+```sql
+-- This trigger script will set the updated_at column everytime a row is updated
+CREATE OR REPLACE FUNCTION trigger_set_updated_at()
+RETURNS TRIGGER SET SCHEMA 'public' LANGUAGE 'plpgsql' AS $$
+BEGIN
+  new.updated_at = now();
+  RETURN new;
+END;
+$$;
+
+...
+
+-- An exmple of adding this trigger to the users table
+CREATE TRIGGER set_updated_at BEFORE UPDATE ON public.users
+  FOR EACH ROW EXECUTE PROCEDURE trigger_set_updated_at();
+```
+
+```sql
+-- This trigger script will set the user_id column to the current
+-- Super Graph user.id value everytime a row is created or updated
+CREATE OR REPLACE FUNCTION trigger_set_user_id()
+RETURNS TRIGGER SET SCHEMA 'public' LANGUAGE 'plpgsql' AS $$
+BEGIN
+  IF TG_OP = 'UPDATE' THEN
+    new.user_id = old.user_id;
+  ELSE
+    new.user_id = current_setting('user.id')::int;
+  END IF;
+
+  RETURN new;
+END;
+$$;
+
+...
+
+-- An exmple of adding this trigger to the blog_posts table
+CREATE TRIGGER set_user_id BEFORE INSERT OR UPDATE ON public.blog_posts
+  FOR EACH ROW EXECUTE PROCEDURE trigger_set_user_id();

 ```

@ -150,7 +497,7 @@ query {
 }
 ```

-### Complex queries (Where)
+### Advanced queries

 Super Graph support complex queries where you can add filters, ordering,offsets and limits on the query.

@ -187,7 +534,7 @@ contains | column: { contains: [1, 2, 4] } | Is this array/json column a subset
 contained_in | column: { contains: "{'a':1, 'b':2}" } | Is this array/json column a subset of these value
 is_null | column: { is_null: true } | Is column value null or not

-### Aggregation (Max, Count, etc)
+### Aggregations

 You will often find the need to fetch aggregated values from the database such as `count`, `max`, `min`, etc. This is simple to do with GraphQL, just prefix the aggregation name to the field name that you want to aggregrate like `count_id`. The below query will group products by name and find the minimum price for each group. Notice the `min_price` field we're adding `min_` to price.

@ -239,6 +586,141 @@ query {
 }
 ```

+## Mutations
+
+In GraphQL mutations is the operation type for when you need to modify data. Super Graph supports the `insert`, `update` and `delete` database operations. Here are some examples.
+
+When using mutations the data must be passed as variables since Super Graphs compiles the query into an prepared statement in the database for maximum speed. Prepared statements are are functions in your code when called they accept arguments and your variables are passed in as those arguments.
+
+### Insert
+
+```json
+{
+  "data": { 
+    "name": "Art of Computer Programming",
+    "description": "The Art of Computer Programming (TAOCP) is a comprehensive monograph written by computer scientist Donald Knuth",
+    "price": 30.5
+  }
+}
+```
+
+```graphql
+mutation {
+  product(insert: $data) {
+    id
+    name
+  }
+}
+```
+
+### Bulk insert
+
+```json
+{
+  "data": [{ 
+    "name": "Art of Computer Programming",
+    "description": "The Art of Computer Programming (TAOCP) is a comprehensive monograph written by computer scientist Donald Knuth",
+    "price": 30.5
+  },
+  { 
+    "name": "Compilers: Principles, Techniques, and Tools",
+    "description": "Known to professors, students, and developers worldwide as the 'Dragon Book' is available in a new edition",
+    "price": 93.74
+  }]
+}
+```
+
+```graphql
+mutation {
+  product(insert: $data) {
+    id
+    name
+  }
+}
+```
+
+### Update
+
+```json
+{
+  "data": { 
+    "price": 200.0
+  },
+  "product_id": 5
+}
+```
+
+```graphql
+mutation {
+  product(update: $data, id: $product_id) {
+    id
+    name
+  }
+}
+```
+
+### Bulk update
+
+```json
+{
+  "data": { 
+    "price": 500.0
+  },
+  "gt_product_id": 450.0,
+  "lt_product_id:": 550.0
+}
+```
+
+```graphql
+mutation {
+  product(update: $data, where: { 
+      price: { gt: $gt_product_id, lt: lt_product_id } 
+  }) {
+    id
+    name
+  }
+}
+```
+
+### Delete
+
+```json
+{
+  "data": { 
+    "price": 500.0
+  },
+  "product_id": 5
+}
+```
+
+```graphql
+mutation {
+  product(delete: true, id: $product_id) {
+    id
+    name
+  }
+}
+```
+
+### Bulk delete
+
+```json
+{
+  "data": { 
+    "price": 500.0
+  }
+}
+```
+
+```graphql
+mutation {
+  product(delete: true, where: { price: { eq: { 500.0 } } }) {
+    id
+    name
+  }
+}
+```
+
 ### Using variables

 Variables (`$product_id`) and their values (`"product_id": 5`) can be passed along side the GraphQL query. Using variables makes for better client side code as well as improved server side SQL query caching. The build-in web-ui also supports setting variables. Not having to manipulate your GraphQL query string to insert values into it makes for cleaner
--- a/migrate/migrate_test.go
+++ b/migrate/migrate_test.go
@ -1,14 +1,11 @@
 package migrate_test

 import (
-	"fmt"
-	"testing"
-
-	"github.com/jackc/pgx"
-	"github.com/jackc/tern/migrate"
 	. "gopkg.in/check.v1"
 )

+/*
+
 type MigrateSuite struct {
 	conn *pgx.Conn
 }
@ -352,3 +349,4 @@ func Example_OnStartMigrationProgressLogging() {
 	// Output:
 	// Migrating up: create a table
 }
+*/
--- a/psql/insert.go
+++ b/psql/insert.go
@ -10,6 +10,8 @@ import (
 	"github.com/dosco/super-graph/qcode"
 )

+var zeroPaging = qcode.Paging{}
+
 func (co *Compiler) compileMutation(qc *qcode.QCode, w *bytes.Buffer, vars Variables) (uint32, error) {
 	if len(qc.Selects) == 0 {
 		return 0, errors.New("empty query")
@ -38,6 +40,12 @@ func (co *Compiler) compileMutation(qc *qcode.QCode, w *bytes.Buffer, vars Varia
 		return 0, errors.New("valid mutations are 'insert' and 'update'")
 	}

+	root.Paging = zeroPaging
+	root.DistinctOn = root.DistinctOn[:]
+	root.OrderBy = root.OrderBy[:]
+	root.Where = nil
+	root.Args = nil
+
 	return c.compileQuery(qc, w)
 }

@ -166,7 +174,10 @@ func (c *compilerContext) renderDelete(qc *qcode.QCode, w *bytes.Buffer, vars Va
 		return 0, err
 	}

-	c.w.WriteString(`DELETE FROM `)
+	c.w.WriteString(`WITH `)
+	quoted(c.w, ti.Name)
+
+	c.w.WriteString(` AS (DELETE FROM `)
 	c.w.WriteString(ti.Name)
 	io.WriteString(c.w, ` WHERE `)

--- a/psql/insert_test.go
+++ b/psql/insert_test.go
@ -2,7 +2,6 @@ package psql

 import (
 	"encoding/json"
-	"fmt"
 	"testing"
 )

@ -13,7 +12,7 @@ func simpleInsert(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  RETURNING *) SELECT json_object_agg('user', sel_json_0) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "user_0"."id" AS "id") AS "sel_0")) AS "sel_json_0" FROM (SELECT "user"."id" FROM "users" AS "user" WHERE ((("user"."id") = {{user_id}})) LIMIT ('1') :: integer) AS "user_0" LIMIT ('1') :: integer) AS "done_1337";`
+	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  RETURNING *) SELECT json_object_agg('user', sel_json_0) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "users_0"."id" AS "id") AS "sel_0")) AS "sel_json_0" FROM (SELECT "users"."id" FROM "users") AS "users_0") AS "done_1337";`

 	vars := map[string]json.RawMessage{
 		"data": json.RawMessage(`{"email": "reannagreenholt@orn.com", "full_name": "Flo Barton"}`),
@ -24,8 +23,6 @@ func simpleInsert(t *testing.T) {
 		t.Fatal(err)
 	}

-	fmt.Println(">", string(resSQL))
-
 	if string(resSQL) != sql {
 		t.Fatal(errNotExpected)
 	}
@ -39,7 +36,7 @@ func singleInsert(t *testing.T) {
 		}
 	}`

-	sql := `WITH product AS (WITH input AS (SELECT {{insert}}::json AS j) INSERT INTO product (name, description) SELECT name, description FROM input i, json_populate_record(NULL::product, i.j) t  RETURNING *) SELECT json_object_agg('product', product) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "product_0"."id" AS "id", "product_0"."name" AS "name") AS "sel_0")) AS "product" FROM (SELECT "product"."id", "product"."name" FROM "products" AS "product" WHERE ((("product"."price") > 0) AND (("product"."price") < 8) AND (("id") = 15)) LIMIT ('1') :: integer) AS "product_0" LIMIT ('1') :: integer) AS "done_1337";`
+	sql := `WITH "products" AS (WITH "input" AS (SELECT {{insert}}::json AS j) INSERT INTO products (name, description) SELECT name, description FROM input i, json_populate_record(NULL::products, i.j) t  RETURNING *) SELECT json_object_agg('product', sel_json_0) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", "products"."name" FROM "products") AS "products_0") AS "done_1337";`

 	vars := map[string]json.RawMessage{
 		"insert": json.RawMessage(` { "name": "my_name", "woo": { "hoo": "goo" }, "description": "my_desc"  }`),
@ -63,7 +60,7 @@ func bulkInsert(t *testing.T) {
 		}
 	}`

-	sql := `WITH product AS (WITH input AS (SELECT {{insert}}::json AS j) INSERT INTO product (name, description) SELECT name, description FROM input i, json_populate_recordset(NULL::product, i.j) t  RETURNING *) SELECT json_object_agg('product', product) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "product_0"."id" AS "id", "product_0"."name" AS "name") AS "sel_0")) AS "product" FROM (SELECT "product"."id", "product"."name" FROM "products" AS "product" WHERE ((("product"."price") > 0) AND (("product"."price") < 8) AND (("id") = 15)) LIMIT ('1') :: integer) AS "product_0" LIMIT ('1') :: integer) AS "done_1337";`
+	sql := `WITH "products" AS (WITH "input" AS (SELECT {{insert}}::json AS j) INSERT INTO products (name, description) SELECT name, description FROM input i, json_populate_recordset(NULL::products, i.j) t  RETURNING *) SELECT json_object_agg('product', sel_json_0) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", "products"."name" FROM "products") AS "products_0") AS "done_1337";`

 	vars := map[string]json.RawMessage{
 		"insert": json.RawMessage(` [{ "name": "my_name", "woo": { "hoo": "goo" }, "description": "my_desc"  }]`),
@ -87,7 +84,7 @@ func singleUpdate(t *testing.T) {
 		}
 	}`

-	sql := `WITH product AS (WITH input AS (SELECT {{update}}::json AS j) UPDATE product SET (name, description) = (SELECT name, description FROM input i, json_populate_record(NULL::product, i.j) t) WHERE (("product"."price") > 0) AND (("product"."price") < 8) AND (("product"."id") = 1) AND (("id") = 15) RETURNING *) SELECT json_object_agg('product', product) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "product_0"."id" AS "id", "product_0"."name" AS "name") AS "sel_0")) AS "product" FROM (SELECT "product"."id", "product"."name" FROM "products" AS "product" WHERE ((("product"."price") > 0) AND (("product"."price") < 8) AND (("product"."id") = 1) AND (("id") = 15)) LIMIT ('1') :: integer) AS "product_0" LIMIT ('1') :: integer) AS "done_1337";`
+	sql := `WITH "products" AS (WITH "input" AS (SELECT {{update}}::json AS j) UPDATE products SET (name, description) = (SELECT name, description FROM input i, json_populate_record(NULL::products, i.j) t) WHERE (("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."id") = 1) AND (("products"."id") = 15) RETURNING *) SELECT json_object_agg('product', sel_json_0) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", "products"."name" FROM "products") AS "products_0") AS "done_1337";`

 	vars := map[string]json.RawMessage{
 		"update": json.RawMessage(` { "name": "my_name", "woo": { "hoo": "goo" }, "description": "my_desc"  }`),
@ -111,7 +108,7 @@ func delete(t *testing.T) {
 		}
 	}`

-	sql := `DELETE FROM product WHERE (("product"."price") > 0) AND (("product"."price") < 8) AND (("product"."id") = 1) RETURNING *) SELECT json_object_agg('product', product) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "product_0"."id" AS "id", "product_0"."name" AS "name") AS "sel_0")) AS "product" FROM (SELECT "product"."id", "product"."name" FROM "products" AS "product" WHERE ((("product"."price") > 0) AND (("product"."price") < 8) AND (("product"."id") = 1)) LIMIT ('1') :: integer) AS "product_0" LIMIT ('1') :: integer) AS "done_1337";`
+	sql := `WITH "products" AS (DELETE FROM products WHERE (("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."id") = 1) RETURNING *) SELECT json_object_agg('product', sel_json_0) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", "products"."name" FROM "products") AS "products_0") AS "done_1337";`

 	vars := map[string]json.RawMessage{
 		"update": json.RawMessage(` { "name": "my_name", "woo": { "hoo": "goo" }, "description": "my_desc"  }`),
@ -133,5 +130,4 @@ func TestCompileInsert(t *testing.T) {
 	t.Run("bulkInsert", bulkInsert)
 	t.Run("singleUpdate", singleUpdate)
 	t.Run("delete", delete)
-
 }
--- a/psql/select.go
+++ b/psql/select.go
@ -192,15 +192,15 @@ func (c *compilerContext) processChildren(sel *qcode.Select, ti *DBTableInfo) (u
 			fallthrough
 		case RelBelongTo:
 			if _, ok := colmap[rel.Col2]; !ok {
-				cols = append(cols, &qcode.Column{sel.Table, rel.Col2, rel.Col2})
+				cols = append(cols, &qcode.Column{ti.Name, rel.Col2, rel.Col2})
 			}
 		case RelOneToManyThrough:
 			if _, ok := colmap[rel.Col1]; !ok {
-				cols = append(cols, &qcode.Column{sel.Table, rel.Col1, rel.Col1})
+				cols = append(cols, &qcode.Column{ti.Name, rel.Col1, rel.Col1})
 			}
 		case RelRemote:
 			if _, ok := colmap[rel.Col1]; !ok {
-				cols = append(cols, &qcode.Column{sel.Table, rel.Col1, rel.Col2})
+				cols = append(cols, &qcode.Column{ti.Name, rel.Col1, rel.Col2})
 			}
 			skipped |= (1 << uint(id))

@ -225,7 +225,7 @@ func (c *compilerContext) renderSelect(sel *qcode.Select, ti *DBTableInfo) (uint
 		c.w.WriteString(`"`)

 		if hasOrder {
-			err := c.renderOrderBy(sel)
+			err := c.renderOrderBy(sel, ti)
 			if err != nil {
 				return skipped, err
 			}
@ -241,7 +241,7 @@ func (c *compilerContext) renderSelect(sel *qcode.Select, ti *DBTableInfo) (uint
 	c.w.WriteString(`SELECT `)

 	if len(sel.DistinctOn) != 0 {
-		c.renderDistinctOn(sel)
+		c.renderDistinctOn(sel, ti)
 	}

 	c.w.WriteString(`row_to_json((`)
@ -252,11 +252,11 @@ func (c *compilerContext) renderSelect(sel *qcode.Select, ti *DBTableInfo) (uint
 	c.w.WriteString(`" FROM (SELECT `)

 	// Combined column names
-	c.renderColumns(sel)
+	c.renderColumns(sel, ti)

-	c.renderRemoteRelColumns(sel)
+	c.renderRemoteRelColumns(sel, ti)

-	err := c.renderJoinedColumns(sel, skipped)
+	err := c.renderJoinedColumns(sel, ti, skipped)
 	if err != nil {
 		return skipped, err
 	}
@ -271,7 +271,7 @@ func (c *compilerContext) renderSelect(sel *qcode.Select, ti *DBTableInfo) (uint
 	// END-ROW-TO-JSON

 	if hasOrder {
-		c.renderOrderByColumns(sel)
+		c.renderOrderByColumns(sel, ti)
 	}
 	// END-SELECT

@ -289,23 +289,25 @@ func (c *compilerContext) renderSelectClose(sel *qcode.Select, ti *DBTableInfo)
 	hasOrder := len(sel.OrderBy) != 0

 	if hasOrder {
-		err := c.renderOrderBy(sel)
+		err := c.renderOrderBy(sel, ti)
 		if err != nil {
 			return err
 		}
 	}

-	if len(sel.Paging.Limit) != 0 {
-		//fmt.Fprintf(w, ` LIMIT ('%s') :: integer`, c.sel.Paging.Limit)
-		c.w.WriteString(` LIMIT ('`)
-		c.w.WriteString(sel.Paging.Limit)
-		c.w.WriteString(`') :: integer`)
+	if sel.Action == 0 {
+		if len(sel.Paging.Limit) != 0 {
+			//fmt.Fprintf(w, ` LIMIT ('%s') :: integer`, c.sel.Paging.Limit)
+			c.w.WriteString(` LIMIT ('`)
+			c.w.WriteString(sel.Paging.Limit)
+			c.w.WriteString(`') :: integer`)

-	} else if ti.Singular {
-		c.w.WriteString(` LIMIT ('1') :: integer`)
+		} else if ti.Singular {
+			c.w.WriteString(` LIMIT ('1') :: integer`)

-	} else {
-		c.w.WriteString(` LIMIT ('20') :: integer`)
+		} else {
+			c.w.WriteString(` LIMIT ('20') :: integer`)
+		}
 	}

 	if len(sel.Paging.Offset) != 0 {
@ -367,18 +369,18 @@ func (c *compilerContext) renderJoinTable(sel *qcode.Select) error {
 	return nil
 }

-func (c *compilerContext) renderColumns(sel *qcode.Select) {
+func (c *compilerContext) renderColumns(sel *qcode.Select, ti *DBTableInfo) {
 	for i, col := range sel.Cols {
 		if i != 0 {
 			io.WriteString(c.w, ", ")
 		}
 		//fmt.Fprintf(w, `"%s_%d"."%s" AS "%s"`,
 		//c.sel.Table, c.sel.ID, col.Name, col.FieldName)
-		colWithTableIDAlias(c.w, sel.Table, sel.ID, col.Name, col.FieldName)
+		colWithTableIDAlias(c.w, ti.Name, sel.ID, col.Name, col.FieldName)
 	}
 }

-func (c *compilerContext) renderRemoteRelColumns(sel *qcode.Select) {
+func (c *compilerContext) renderRemoteRelColumns(sel *qcode.Select, ti *DBTableInfo) {
 	i := 0

 	for _, id := range sel.Children {
@ -393,13 +395,13 @@ func (c *compilerContext) renderRemoteRelColumns(sel *qcode.Select) {
 		}
 		//fmt.Fprintf(w, `"%s_%d"."%s" AS "%s"`,
 		//c.sel.Table, c.sel.ID, rel.Col1, rel.Col2)
-		colWithTableID(c.w, sel.Table, sel.ID, rel.Col1)
+		colWithTableID(c.w, ti.Name, sel.ID, rel.Col1)
 		alias(c.w, rel.Col2)
 		i++
 	}
 }

-func (c *compilerContext) renderJoinedColumns(sel *qcode.Select, skipped uint32) error {
+func (c *compilerContext) renderJoinedColumns(sel *qcode.Select, ti *DBTableInfo, skipped uint32) error {
 	colsRendered := len(sel.Cols) != 0

 	for _, id := range sel.Children {
@ -411,11 +413,12 @@ func (c *compilerContext) renderJoinedColumns(sel *qcode.Select, skipped uint32)
 		if skipThis {
 			continue
 		}
-		sel := &c.s[id]
+		childSel := &c.s[id]

 		//fmt.Fprintf(w, `"%s_%d_join"."%s" AS "%s"`,
 		//s.Table, s.ID, s.Table, s.FieldName)
-		colWithTableIDSuffixAlias(c.w, sel.Table, sel.ID, "_join", sel.Table, sel.FieldName)
+		colWithTableIDSuffixAlias(c.w, childSel.Table, childSel.ID,
+			"_join", childSel.Table, childSel.FieldName)
 	}

 	return nil
@ -447,7 +450,7 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo,
 					//fmt.Fprintf(w, `ts_rank("%s"."%s", to_tsquery('%s')) AS %s`,
 					//c.sel.Table, cn, arg.Val, col.Name)
 					c.w.WriteString(`ts_rank(`)
-					colWithTable(c.w, sel.Table, cn)
+					colWithTable(c.w, ti.Name, cn)
 					c.w.WriteString(`, to_tsquery('`)
 					c.w.WriteString(arg.Val)
 					c.w.WriteString(`')`)
@ -460,7 +463,7 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo,
 					//fmt.Fprintf(w, `ts_headline("%s"."%s", to_tsquery('%s')) AS %s`,
 					//c.sel.Table, cn, arg.Val, col.Name)
 					c.w.WriteString(`ts_headlinek(`)
-					colWithTable(c.w, sel.Table, cn)
+					colWithTable(c.w, ti.Name, cn)
 					c.w.WriteString(`, to_tsquery('`)
 					c.w.WriteString(arg.Val)
 					c.w.WriteString(`')`)
@ -481,7 +484,7 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo,
 					//fmt.Fprintf(w, `%s("%s"."%s") AS %s`, fn, c.sel.Table, cn, col.Name)
 					c.w.WriteString(fn)
 					c.w.WriteString(`(`)
-					colWithTable(c.w, sel.Table, cn)
+					colWithTable(c.w, ti.Name, cn)
 					c.w.WriteString(`)`)
 					alias(c.w, col.Name)
 				}
@ -489,7 +492,7 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo,
 		} else {
 			groupBy = append(groupBy, i)
 			//fmt.Fprintf(w, `"%s"."%s"`, c.sel.Table, cn)
-			colWithTable(c.w, sel.Table, cn)
+			colWithTable(c.w, ti.Name, cn)
 		}

 		if i < len(sel.Cols)-1 || len(childCols) != 0 {
@ -510,15 +513,10 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo,

 	c.w.WriteString(` FROM `)

-	if c.schema.IsAlias(sel.Table) || ti.Singular {
-		//fmt.Fprintf(w, ` FROM "%s" AS "%s"`, tn, c.sel.Table)
-		tableWithAlias(c.w, ti.Name, sel.Table)
-	} else {
-		//fmt.Fprintf(w, ` FROM "%s"`, c.sel.Table)
-		c.w.WriteString(`"`)
-		c.w.WriteString(ti.Name)
-		c.w.WriteString(`"`)
-	}
+	//fmt.Fprintf(w, ` FROM "%s"`, c.sel.Table)
+	c.w.WriteString(`"`)
+	c.w.WriteString(ti.Name)
+	c.w.WriteString(`"`)

 	// if tn, ok := c.tmap[sel.Table]; ok {
 	// 	//fmt.Fprintf(w, ` FROM "%s" AS "%s"`, tn, c.sel.Table)
@ -545,7 +543,7 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo,

 		c.w.WriteString(` WHERE (`)

-		if err := c.renderRelationship(sel); err != nil {
+		if err := c.renderRelationship(sel, ti); err != nil {
 			return err
 		}

@ -567,22 +565,24 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo,
 					c.w.WriteString(`, `)
 				}
 				//fmt.Fprintf(w, `"%s"."%s"`, c.sel.Table, c.sel.Cols[id].Name)
-				colWithTable(c.w, sel.Table, sel.Cols[id].Name)
+				colWithTable(c.w, ti.Name, sel.Cols[id].Name)
 			}
 		}
 	}

-	if len(sel.Paging.Limit) != 0 {
-		//fmt.Fprintf(w, ` LIMIT ('%s') :: integer`, c.sel.Paging.Limit)
-		c.w.WriteString(` LIMIT ('`)
-		c.w.WriteString(sel.Paging.Limit)
-		c.w.WriteString(`') :: integer`)
+	if sel.Action == 0 {
+		if len(sel.Paging.Limit) != 0 {
+			//fmt.Fprintf(w, ` LIMIT ('%s') :: integer`, c.sel.Paging.Limit)
+			c.w.WriteString(` LIMIT ('`)
+			c.w.WriteString(sel.Paging.Limit)
+			c.w.WriteString(`') :: integer`)

-	} else if ti.Singular {
-		c.w.WriteString(` LIMIT ('1') :: integer`)
+		} else if ti.Singular {
+			c.w.WriteString(` LIMIT ('1') :: integer`)

-	} else {
-		c.w.WriteString(` LIMIT ('20') :: integer`)
+		} else {
+			c.w.WriteString(` LIMIT ('20') :: integer`)
+		}
 	}

 	if len(sel.Paging.Offset) != 0 {
@ -594,11 +594,11 @@ func (c *compilerContext) renderBaseSelect(sel *qcode.Select, ti *DBTableInfo,

 	//fmt.Fprintf(w, `) AS "%s_%d"`, c.sel.Table, c.sel.ID)
 	c.w.WriteString(`)`)
-	aliasWithID(c.w, sel.Table, sel.ID)
+	aliasWithID(c.w, ti.Name, sel.ID)
 	return nil
 }

-func (c *compilerContext) renderOrderByColumns(sel *qcode.Select) {
+func (c *compilerContext) renderOrderByColumns(sel *qcode.Select, ti *DBTableInfo) {
 	colsRendered := len(sel.Cols) != 0

 	for i := range sel.OrderBy {
@ -611,13 +611,13 @@ func (c *compilerContext) renderOrderByColumns(sel *qcode.Select) {
 		//fmt.Fprintf(w, `"%s_%d"."%s" AS "%s_%d_%s_ob"`,
 		//c.sel.Table, c.sel.ID, c,
 		//c.sel.Table, c.sel.ID, c)
-		colWithTableID(c.w, sel.Table, sel.ID, col)
+		colWithTableID(c.w, ti.Name, sel.ID, col)
 		c.w.WriteString(` AS `)
 		tableIDColSuffix(c.w, sel.Table, sel.ID, col, "_ob")
 	}
 }

-func (c *compilerContext) renderRelationship(sel *qcode.Select) error {
+func (c *compilerContext) renderRelationship(sel *qcode.Select, ti *DBTableInfo) error {
 	parent := c.s[sel.ParentID]

 	rel, err := c.schema.GetRel(sel.Table, parent.Table)
@ -630,7 +630,7 @@ func (c *compilerContext) renderRelationship(sel *qcode.Select) error {
 		//fmt.Fprintf(w, `(("%s"."%s") = ("%s_%d"."%s"))`,
 		//c.sel.Table, rel.Col1, c.parent.Table, c.parent.ID, rel.Col2)
 		c.w.WriteString(`((`)
-		colWithTable(c.w, sel.Table, rel.Col1)
+		colWithTable(c.w, ti.Name, rel.Col1)
 		c.w.WriteString(`) = (`)
 		colWithTableID(c.w, parent.Table, parent.ID, rel.Col2)
 		c.w.WriteString(`))`)
@ -639,7 +639,7 @@ func (c *compilerContext) renderRelationship(sel *qcode.Select) error {
 		//fmt.Fprintf(w, `(("%s"."%s") = ("%s_%d"."%s"))`,
 		//c.sel.Table, rel.Col1, c.parent.Table, c.parent.ID, rel.Col2)
 		c.w.WriteString(`((`)
-		colWithTable(c.w, sel.Table, rel.Col1)
+		colWithTable(c.w, ti.Name, rel.Col1)
 		c.w.WriteString(`) = (`)
 		colWithTableID(c.w, parent.Table, parent.ID, rel.Col2)
 		c.w.WriteString(`))`)
@ -648,7 +648,7 @@ func (c *compilerContext) renderRelationship(sel *qcode.Select) error {
 		//fmt.Fprintf(w, `(("%s"."%s") = ("%s"."%s"))`,
 		//c.sel.Table, rel.Col1, rel.Through, rel.Col2)
 		c.w.WriteString(`((`)
-		colWithTable(c.w, sel.Table, rel.Col1)
+		colWithTable(c.w, ti.Name, rel.Col1)
 		c.w.WriteString(`) = (`)
 		colWithTable(c.w, rel.Through, rel.Col2)
 		c.w.WriteString(`))`)
@ -683,6 +683,7 @@ func (c *compilerContext) renderWhere(sel *qcode.Select, ti *DBTableInfo) error
 			default:
 				return fmt.Errorf("11: unexpected value %v (%t)", intf, intf)
 			}
+
 		case *qcode.Exp:
 			switch val.Op {
 			case qcode.OpAnd, qcode.OpOr:
@ -693,109 +694,109 @@ func (c *compilerContext) renderWhere(sel *qcode.Select, ti *DBTableInfo) error
 					}
 				}
 				qcode.FreeExp(val)
-				continue
+
 			case qcode.OpNot:
 				st.Push(val.Children[0])
 				st.Push(qcode.OpNot)
 				qcode.FreeExp(val)
-				continue
-			}
-
-			if val.NestedCol {
-				//fmt.Fprintf(w, `(("%s") `, val.Col)
-				c.w.WriteString(`(("`)
-				c.w.WriteString(val.Col)
-				c.w.WriteString(`") `)
-
-			} else if len(val.Col) != 0 {
-				//fmt.Fprintf(w, `(("%s"."%s") `, c.sel.Table, val.Col)
-				c.w.WriteString(`((`)
-				colWithTable(c.w, sel.Table, val.Col)
-				c.w.WriteString(`) `)
-			}
-			valExists := true
-
-			switch val.Op {
-			case qcode.OpEquals:
-				c.w.WriteString(`=`)
-			case qcode.OpNotEquals:
-				c.w.WriteString(`!=`)
-			case qcode.OpGreaterOrEquals:
-				c.w.WriteString(`>=`)
-			case qcode.OpLesserOrEquals:
-				c.w.WriteString(`<=`)
-			case qcode.OpGreaterThan:
-				c.w.WriteString(`>`)
-			case qcode.OpLesserThan:
-				c.w.WriteString(`<`)
-			case qcode.OpIn:
-				c.w.WriteString(`IN`)
-			case qcode.OpNotIn:
-				c.w.WriteString(`NOT IN`)
-			case qcode.OpLike:
-				c.w.WriteString(`LIKE`)
-			case qcode.OpNotLike:
-				c.w.WriteString(`NOT LIKE`)
-			case qcode.OpILike:
-				c.w.WriteString(`ILIKE`)
-			case qcode.OpNotILike:
-				c.w.WriteString(`NOT ILIKE`)
-			case qcode.OpSimilar:
-				c.w.WriteString(`SIMILAR TO`)
-			case qcode.OpNotSimilar:
-				c.w.WriteString(`NOT SIMILAR TO`)
-			case qcode.OpContains:
-				c.w.WriteString(`@>`)
-			case qcode.OpContainedIn:
-				c.w.WriteString(`<@`)
-			case qcode.OpHasKey:
-				c.w.WriteString(`?`)
-			case qcode.OpHasKeyAny:
-				c.w.WriteString(`?|`)
-			case qcode.OpHasKeyAll:
-				c.w.WriteString(`?&`)
-			case qcode.OpIsNull:
-				if strings.EqualFold(val.Val, "true") {
-					c.w.WriteString(`IS NULL)`)
-				} else {
-					c.w.WriteString(`IS NOT NULL)`)
-				}
-				valExists = false
-			case qcode.OpEqID:
-				if len(ti.PrimaryCol) == 0 {
-					return fmt.Errorf("no primary key column defined for %s", sel.Table)
-				}
-				//fmt.Fprintf(w, `(("%s") =`, c.ti.PrimaryCol)
-				c.w.WriteString(`(("`)
-				c.w.WriteString(ti.PrimaryCol)
-				c.w.WriteString(`") =`)
-
-			case qcode.OpTsQuery:
-				if len(ti.TSVCol) == 0 {
-					return fmt.Errorf("no tsv column defined for %s", sel.Table)
-				}
-				//fmt.Fprintf(w, `(("%s") @@ to_tsquery('%s'))`, c.ti.TSVCol, val.Val)
-				c.w.WriteString(`(("`)
-				c.w.WriteString(ti.TSVCol)
-				c.w.WriteString(`") @@ to_tsquery('`)
-				c.w.WriteString(val.Val)
-				c.w.WriteString(`'))`)
-				valExists = false

 			default:
-				return fmt.Errorf("[Where] unexpected op code %d", val.Op)
-			}
+				if val.NestedCol {
+					//fmt.Fprintf(w, `(("%s") `, val.Col)
+					c.w.WriteString(`(("`)
+					c.w.WriteString(val.Col)
+					c.w.WriteString(`") `)

-			if valExists {
-				if val.Type == qcode.ValList {
-					c.renderList(val)
-				} else {
-					c.renderVal(val, c.vars)
+				} else if len(val.Col) != 0 {
+					//fmt.Fprintf(w, `(("%s"."%s") `, c.sel.Table, val.Col)
+					c.w.WriteString(`((`)
+					colWithTable(c.w, ti.Name, val.Col)
+					c.w.WriteString(`) `)
 				}
-				c.w.WriteString(`)`)
-			}
+				valExists := true

-			qcode.FreeExp(val)
+				switch val.Op {
+				case qcode.OpEquals:
+					c.w.WriteString(`=`)
+				case qcode.OpNotEquals:
+					c.w.WriteString(`!=`)
+				case qcode.OpGreaterOrEquals:
+					c.w.WriteString(`>=`)
+				case qcode.OpLesserOrEquals:
+					c.w.WriteString(`<=`)
+				case qcode.OpGreaterThan:
+					c.w.WriteString(`>`)
+				case qcode.OpLesserThan:
+					c.w.WriteString(`<`)
+				case qcode.OpIn:
+					c.w.WriteString(`IN`)
+				case qcode.OpNotIn:
+					c.w.WriteString(`NOT IN`)
+				case qcode.OpLike:
+					c.w.WriteString(`LIKE`)
+				case qcode.OpNotLike:
+					c.w.WriteString(`NOT LIKE`)
+				case qcode.OpILike:
+					c.w.WriteString(`ILIKE`)
+				case qcode.OpNotILike:
+					c.w.WriteString(`NOT ILIKE`)
+				case qcode.OpSimilar:
+					c.w.WriteString(`SIMILAR TO`)
+				case qcode.OpNotSimilar:
+					c.w.WriteString(`NOT SIMILAR TO`)
+				case qcode.OpContains:
+					c.w.WriteString(`@>`)
+				case qcode.OpContainedIn:
+					c.w.WriteString(`<@`)
+				case qcode.OpHasKey:
+					c.w.WriteString(`?`)
+				case qcode.OpHasKeyAny:
+					c.w.WriteString(`?|`)
+				case qcode.OpHasKeyAll:
+					c.w.WriteString(`?&`)
+				case qcode.OpIsNull:
+					if strings.EqualFold(val.Val, "true") {
+						c.w.WriteString(`IS NULL)`)
+					} else {
+						c.w.WriteString(`IS NOT NULL)`)
+					}
+					valExists = false
+				case qcode.OpEqID:
+					if len(ti.PrimaryCol) == 0 {
+						return fmt.Errorf("no primary key column defined for %s", ti.Name)
+					}
+					//fmt.Fprintf(w, `(("%s") =`, c.ti.PrimaryCol)
+					c.w.WriteString(`((`)
+					colWithTable(c.w, ti.Name, ti.PrimaryCol)
+					//c.w.WriteString(ti.PrimaryCol)
+					c.w.WriteString(`) =`)
+				case qcode.OpTsQuery:
+					if len(ti.TSVCol) == 0 {
+						return fmt.Errorf("no tsv column defined for %s", ti.Name)
+					}
+					//fmt.Fprintf(w, `(("%s") @@ to_tsquery('%s'))`, c.ti.TSVCol, val.Val)
+					c.w.WriteString(`(("`)
+					c.w.WriteString(ti.TSVCol)
+					c.w.WriteString(`") @@ to_tsquery('`)
+					c.w.WriteString(val.Val)
+					c.w.WriteString(`'))`)
+					valExists = false
+
+				default:
+					return fmt.Errorf("[Where] unexpected op code %d", val.Op)
+				}
+
+				if valExists {
+					if val.Type == qcode.ValList {
+						c.renderList(val)
+					} else {
+						c.renderVal(val, c.vars)
+					}
+					c.w.WriteString(`)`)
+				}
+
+				qcode.FreeExp(val)
+			}

 		default:
 			return fmt.Errorf("12: unexpected value %v (%t)", intf, intf)
@ -806,7 +807,7 @@ func (c *compilerContext) renderWhere(sel *qcode.Select, ti *DBTableInfo) error
 	return nil
 }

-func (c *compilerContext) renderOrderBy(sel *qcode.Select) error {
+func (c *compilerContext) renderOrderBy(sel *qcode.Select, ti *DBTableInfo) error {
 	c.w.WriteString(` ORDER BY `)
 	for i := range sel.OrderBy {
 		if i != 0 {
@ -817,27 +818,27 @@ func (c *compilerContext) renderOrderBy(sel *qcode.Select) error {
 		switch ob.Order {
 		case qcode.OrderAsc:
 			//fmt.Fprintf(w, `"%s_%d.ob.%s" ASC`, sel.Table, sel.ID, ob.Col)
-			tableIDColSuffix(c.w, sel.Table, sel.ID, ob.Col, "_ob")
+			tableIDColSuffix(c.w, ti.Name, sel.ID, ob.Col, "_ob")
 			c.w.WriteString(` ASC`)
 		case qcode.OrderDesc:
 			//fmt.Fprintf(w, `"%s_%d.ob.%s" DESC`, sel.Table, sel.ID, ob.Col)
-			tableIDColSuffix(c.w, sel.Table, sel.ID, ob.Col, "_ob")
+			tableIDColSuffix(c.w, ti.Name, sel.ID, ob.Col, "_ob")
 			c.w.WriteString(` DESC`)
 		case qcode.OrderAscNullsFirst:
 			//fmt.Fprintf(w, `"%s_%d.ob.%s" ASC NULLS FIRST`, sel.Table, sel.ID, ob.Col)
-			tableIDColSuffix(c.w, sel.Table, sel.ID, ob.Col, "_ob")
+			tableIDColSuffix(c.w, ti.Name, sel.ID, ob.Col, "_ob")
 			c.w.WriteString(` ASC NULLS FIRST`)
 		case qcode.OrderDescNullsFirst:
 			//fmt.Fprintf(w, `%s_%d.ob.%s DESC NULLS FIRST`, sel.Table, sel.ID, ob.Col)
-			tableIDColSuffix(c.w, sel.Table, sel.ID, ob.Col, "_ob")
+			tableIDColSuffix(c.w, ti.Name, sel.ID, ob.Col, "_ob")
 			c.w.WriteString(` DESC NULLLS FIRST`)
 		case qcode.OrderAscNullsLast:
 			//fmt.Fprintf(w, `"%s_%d.ob.%s ASC NULLS LAST`, sel.Table, sel.ID, ob.Col)
-			tableIDColSuffix(c.w, sel.Table, sel.ID, ob.Col, "_ob")
+			tableIDColSuffix(c.w, ti.Name, sel.ID, ob.Col, "_ob")
 			c.w.WriteString(` ASC NULLS LAST`)
 		case qcode.OrderDescNullsLast:
 			//fmt.Fprintf(w, `%s_%d.ob.%s DESC NULLS LAST`, sel.Table, sel.ID, ob.Col)
-			tableIDColSuffix(c.w, sel.Table, sel.ID, ob.Col, "_ob")
+			tableIDColSuffix(c.w, ti.Name, sel.ID, ob.Col, "_ob")
 			c.w.WriteString(` DESC NULLS LAST`)
 		default:
 			return fmt.Errorf("13: unexpected value %v", ob.Order)
@ -846,14 +847,14 @@ func (c *compilerContext) renderOrderBy(sel *qcode.Select) error {
 	return nil
 }

-func (c *compilerContext) renderDistinctOn(sel *qcode.Select) {
+func (c *compilerContext) renderDistinctOn(sel *qcode.Select, ti *DBTableInfo) {
 	io.WriteString(c.w, `DISTINCT ON (`)
 	for i := range sel.DistinctOn {
 		if i != 0 {
 			c.w.WriteString(`, `)
 		}
 		//fmt.Fprintf(w, `"%s_%d.ob.%s"`, c.sel.Table, c.sel.ID, c.sel.DistinctOn[i])
-		tableIDColSuffix(c.w, sel.Table, sel.ID, sel.DistinctOn[i], "_ob")
+		tableIDColSuffix(c.w, ti.Name, sel.ID, sel.DistinctOn[i], "_ob")
 	}
 	c.w.WriteString(`) `)
 }
@ -876,10 +877,9 @@ func (c *compilerContext) renderList(ex *qcode.Exp) {
 	c.w.WriteString(`)`)
 }

-func (c *compilerContext) renderVal(ex *qcode.Exp,
-	vars map[string]string) {
-
+func (c *compilerContext) renderVal(ex *qcode.Exp, vars map[string]string) {
 	io.WriteString(c.w, ` `)
+
 	switch ex.Type {
 	case qcode.ValBool, qcode.ValInt, qcode.ValFloat:
 		if len(ex.Val) != 0 {
--- a/psql/select_test.go
+++ b/psql/select_test.go
@ -58,45 +58,45 @@ func TestMain(m *testing.M) {

 	columns := [][]*DBColumn{
 		[]*DBColumn{
-			&DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 2, Name: "full_name", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 3, Name: "phone", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 4, Name: "email", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 5, Name: "encrypted_password", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 6, Name: "reset_password_token", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 7, Name: "reset_password_sent_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 8, Name: "remember_created_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 9, Name: "created_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 10, Name: "updated_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)}},
+			&DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 2, Name: "full_name", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 3, Name: "phone", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 4, Name: "email", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 5, Name: "encrypted_password", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 6, Name: "reset_password_token", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 7, Name: "reset_password_sent_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 8, Name: "remember_created_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 9, Name: "created_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 10, Name: "updated_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)}},
 		[]*DBColumn{
-			&DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 2, Name: "full_name", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 3, Name: "phone", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 4, Name: "avatar", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 5, Name: "email", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 6, Name: "encrypted_password", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 7, Name: "reset_password_token", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 8, Name: "reset_password_sent_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 9, Name: "remember_created_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 10, Name: "created_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 11, Name: "updated_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)}},
+			&DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 2, Name: "full_name", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 3, Name: "phone", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 4, Name: "avatar", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 5, Name: "email", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 6, Name: "encrypted_password", Type: "character varying", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 7, Name: "reset_password_token", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 8, Name: "reset_password_sent_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 9, Name: "remember_created_at", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 10, Name: "created_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 11, Name: "updated_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)}},
 		[]*DBColumn{
-			&DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 2, Name: "name", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 3, Name: "description", Type: "text", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 4, Name: "price", Type: "numeric(7,2)", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 5, Name: "user_id", Type: "bigint", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "users", FKeyColID: []int{1}},
-			&DBColumn{ID: 6, Name: "created_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 7, Name: "updated_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 8, Name: "tsv", Type: "tsvector", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)}},
+			&DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 2, Name: "name", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 3, Name: "description", Type: "text", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 4, Name: "price", Type: "numeric(7,2)", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 5, Name: "user_id", Type: "bigint", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "users", FKeyColID: []int16{1}},
+			&DBColumn{ID: 6, Name: "created_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 7, Name: "updated_at", Type: "timestamp without time zone", NotNull: true, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 8, Name: "tsv", Type: "tsvector", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)}},
 		[]*DBColumn{
-			&DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 2, Name: "customer_id", Type: "bigint", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "customers", FKeyColID: []int{1}},
-			&DBColumn{ID: 3, Name: "product_id", Type: "bigint", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "products", FKeyColID: []int{1}},
-			&DBColumn{ID: 4, Name: "sale_type", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 5, Name: "quantity", Type: "integer", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 6, Name: "due_date", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)},
-			&DBColumn{ID: 7, Name: "returned", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int(nil)}},
+			&DBColumn{ID: 1, Name: "id", Type: "bigint", NotNull: true, PrimaryKey: true, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 2, Name: "customer_id", Type: "bigint", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "customers", FKeyColID: []int16{1}},
+			&DBColumn{ID: 3, Name: "product_id", Type: "bigint", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "products", FKeyColID: []int16{1}},
+			&DBColumn{ID: 4, Name: "sale_type", Type: "character varying", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 5, Name: "quantity", Type: "integer", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 6, Name: "due_date", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)},
+			&DBColumn{ID: 7, Name: "returned", Type: "timestamp without time zone", NotNull: false, PrimaryKey: false, UniqueKey: false, FKeyTable: "", FKeyColID: []int16(nil)}},
 	}

 	schema := &DBSchema{
@ -126,6 +126,7 @@ func TestMain(m *testing.M) {
 }

 func compileGQLToPSQL(gql string, vars Variables) ([]byte, error) {
+
 	qc, err := qcompile.Compile([]byte(gql))
 	if err != nil {
 		return nil, err
@ -154,7 +155,7 @@ func withComplexArgs(t *testing.T) {
 			# no duplicate prices returned
 			distinct: [ price ]
 			
-			# only items with an id >= 30 and < 30 are returned
+			# only items with an id >= 20 and < 28 are returned
 			where: { id: { and: { greater_or_equals: 20, lt: 28 } } }) {
 			id
 			NAME
@ -162,7 +163,7 @@ func withComplexArgs(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("products" ORDER BY "products_0_price_ob" DESC), '[]') AS "products" FROM (SELECT DISTINCT ON ("products_0_price_ob") row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price") AS "sel_0")) AS "products", "products_0"."price" AS "products_0_price_ob" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."id") < 28) AND (("products"."id") >= 20)) LIMIT ('30') :: integer) AS "products_0" ORDER BY "products_0_price_ob" DESC LIMIT ('30') :: integer) AS "products_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("sel_json_0" ORDER BY "products_0_price_ob" DESC), '[]') AS "products" FROM (SELECT DISTINCT ON ("products_0_price_ob") row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price") AS "sel_0")) AS "sel_json_0", "products_0"."price" AS "products_0_price_ob" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."id") < 28) AND (("products"."id") >= 20)) LIMIT ('30') :: integer) AS "products_0" ORDER BY "products_0_price_ob" DESC LIMIT ('30') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -190,7 +191,7 @@ func withWhereMultiOr(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("products"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price") AS "sel_0")) AS "products" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."price") < 20) OR (("products"."price") > 10) OR NOT (("products"."id") IS NULL)) LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "products_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("sel_json_0"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."price") < 20) OR (("products"."price") > 10) OR NOT (("products"."id") IS NULL)) LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -216,7 +217,7 @@ func withWhereIsNull(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("products"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price") AS "sel_0")) AS "products" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."price") > 10) AND NOT (("products"."id") IS NULL)) LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "products_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("sel_json_0"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."price") > 10) AND NOT (("products"."id") IS NULL)) LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -242,7 +243,7 @@ func withWhereAndList(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("products"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price") AS "sel_0")) AS "products" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."price") > 10) AND NOT (("products"."id") IS NULL)) LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "products_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("sel_json_0"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name", "products_0"."price" AS "price") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", "products"."name", "products"."price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."price") > 10) AND NOT (("products"."id") IS NULL)) LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -262,7 +263,7 @@ func fetchByID(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('product', product) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "product_0"."id" AS "id", "product_0"."name" AS "name") AS "sel_0")) AS "product" FROM (SELECT "product"."id", "product"."name" FROM "products" AS "product" WHERE ((("product"."price") > 0) AND (("product"."price") < 8) AND (("id") = 15)) LIMIT ('1') :: integer) AS "product_0" LIMIT ('1') :: integer) AS "done_1337";`
+	sql := `SELECT json_object_agg('product', sel_json_0) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", "products"."name" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."id") = 15)) LIMIT ('1') :: integer) AS "products_0" LIMIT ('1') :: integer) AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -282,7 +283,7 @@ func searchQuery(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("products"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name") AS "sel_0")) AS "products" FROM (SELECT "products"."id", "products"."name" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("tsv") @@ to_tsquery('Imperial'))) LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "products_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("sel_json_0"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", "products"."name" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("tsv") @@ to_tsquery('Imperial'))) LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -305,7 +306,7 @@ func oneToMany(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('users', users) FROM (SELECT coalesce(json_agg("users"), '[]') AS "users" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "users_0"."email" AS "email", "products_1_join"."products" AS "products") AS "sel_0")) AS "users" FROM (SELECT "users"."email", "users"."id" FROM "users" WHERE ((("users"."id") = {{user_id}})) LIMIT ('20') :: integer) AS "users_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(json_agg("products"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_1" FROM (SELECT "products_1"."name" AS "name", "products_1"."price" AS "price") AS "sel_1")) AS "products" FROM (SELECT "products"."name", "products"."price" FROM "products" WHERE ((("products"."user_id") = ("users_0"."id"))) LIMIT ('20') :: integer) AS "products_1" LIMIT ('20') :: integer) AS "products_1") AS "products_1_join" ON ('true') LIMIT ('20') :: integer) AS "users_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('users', users) FROM (SELECT coalesce(json_agg("sel_json_0"), '[]') AS "users" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "users_0"."email" AS "email", "products_1_join"."products" AS "products") AS "sel_0")) AS "sel_json_0" FROM (SELECT "users"."email", "users"."id" FROM "users" WHERE ((("users"."id") = {{user_id}})) LIMIT ('20') :: integer) AS "users_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(json_agg("sel_json_1"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_1" FROM (SELECT "products_1"."name" AS "name", "products_1"."price" AS "price") AS "sel_1")) AS "sel_json_1" FROM (SELECT "products"."name", "products"."price" FROM "products" WHERE ((("products"."user_id") = ("users_0"."id"))) LIMIT ('20') :: integer) AS "products_1" LIMIT ('20') :: integer) AS "sel_json_agg_1") AS "products_1_join" ON ('true') LIMIT ('20') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -328,7 +329,7 @@ func belongsTo(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("products"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."name" AS "name", "products_0"."price" AS "price", "users_1_join"."users" AS "users") AS "sel_0")) AS "products" FROM (SELECT "products"."name", "products"."price", "products"."user_id" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8)) LIMIT ('20') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(json_agg("users"), '[]') AS "users" FROM (SELECT row_to_json((SELECT "sel_1" FROM (SELECT "users_1"."email" AS "email") AS "sel_1")) AS "users" FROM (SELECT "users"."email" FROM "users" WHERE ((("users"."id") = ("products_0"."user_id"))) LIMIT ('20') :: integer) AS "users_1" LIMIT ('20') :: integer) AS "users_1") AS "users_1_join" ON ('true') LIMIT ('20') :: integer) AS "products_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("sel_json_0"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."name" AS "name", "products_0"."price" AS "price", "users_1_join"."users" AS "users") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."name", "products"."price", "products"."user_id" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8)) LIMIT ('20') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(json_agg("sel_json_1"), '[]') AS "users" FROM (SELECT row_to_json((SELECT "sel_1" FROM (SELECT "users_1"."email" AS "email") AS "sel_1")) AS "sel_json_1" FROM (SELECT "users"."email" FROM "users" WHERE ((("users"."id") = ("products_0"."user_id"))) LIMIT ('20') :: integer) AS "users_1" LIMIT ('20') :: integer) AS "sel_json_agg_1") AS "users_1_join" ON ('true') LIMIT ('20') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -351,7 +352,7 @@ func manyToMany(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("products"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."name" AS "name", "customers_1_join"."customers" AS "customers") AS "sel_0")) AS "products" FROM (SELECT "products"."name", "products"."id" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8)) LIMIT ('20') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(json_agg("customers"), '[]') AS "customers" FROM (SELECT row_to_json((SELECT "sel_1" FROM (SELECT "customers_1"."email" AS "email", "customers_1"."full_name" AS "full_name") AS "sel_1")) AS "customers" FROM (SELECT "customers"."email", "customers"."full_name" FROM "customers" LEFT OUTER JOIN "purchases" ON (("purchases"."product_id") = ("products_0"."id")) WHERE ((("customers"."id") = ("purchases"."customer_id"))) LIMIT ('20') :: integer) AS "customers_1" LIMIT ('20') :: integer) AS "customers_1") AS "customers_1_join" ON ('true') LIMIT ('20') :: integer) AS "products_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("sel_json_0"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."name" AS "name", "customers_1_join"."customers" AS "customers") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."name", "products"."id" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8)) LIMIT ('20') :: integer) AS "products_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(json_agg("sel_json_1"), '[]') AS "customers" FROM (SELECT row_to_json((SELECT "sel_1" FROM (SELECT "customers_1"."email" AS "email", "customers_1"."full_name" AS "full_name") AS "sel_1")) AS "sel_json_1" FROM (SELECT "customers"."email", "customers"."full_name" FROM "customers" LEFT OUTER JOIN "purchases" ON (("purchases"."product_id") = ("products_0"."id")) WHERE ((("customers"."id") = ("purchases"."customer_id"))) LIMIT ('20') :: integer) AS "customers_1" LIMIT ('20') :: integer) AS "sel_json_agg_1") AS "customers_1_join" ON ('true') LIMIT ('20') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -374,7 +375,7 @@ func manyToManyReverse(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('customers', customers) FROM (SELECT coalesce(json_agg("customers"), '[]') AS "customers" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "customers_0"."email" AS "email", "customers_0"."full_name" AS "full_name", "products_1_join"."products" AS "products") AS "sel_0")) AS "customers" FROM (SELECT "customers"."email", "customers"."full_name", "customers"."id" FROM "customers" LIMIT ('20') :: integer) AS "customers_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(json_agg("products"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_1" FROM (SELECT "products_1"."name" AS "name") AS "sel_1")) AS "products" FROM (SELECT "products"."name" FROM "products" LEFT OUTER JOIN "purchases" ON (("purchases"."customer_id") = ("customers_0"."id")) WHERE ((("products"."id") = ("purchases"."product_id"))) LIMIT ('20') :: integer) AS "products_1" LIMIT ('20') :: integer) AS "products_1") AS "products_1_join" ON ('true') LIMIT ('20') :: integer) AS "customers_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('customers', customers) FROM (SELECT coalesce(json_agg("sel_json_0"), '[]') AS "customers" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "customers_0"."email" AS "email", "customers_0"."full_name" AS "full_name", "products_1_join"."products" AS "products") AS "sel_0")) AS "sel_json_0" FROM (SELECT "customers"."email", "customers"."full_name", "customers"."id" FROM "customers" LIMIT ('20') :: integer) AS "customers_0" LEFT OUTER JOIN LATERAL (SELECT coalesce(json_agg("sel_json_1"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_1" FROM (SELECT "products_1"."name" AS "name") AS "sel_1")) AS "sel_json_1" FROM (SELECT "products"."name" FROM "products" LEFT OUTER JOIN "purchases" ON (("purchases"."customer_id") = ("customers_0"."id")) WHERE ((("products"."id") = ("purchases"."product_id"))) LIMIT ('20') :: integer) AS "products_1" LIMIT ('20') :: integer) AS "sel_json_agg_1") AS "products_1_join" ON ('true') LIMIT ('20') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -394,7 +395,7 @@ func aggFunction(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("products"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."name" AS "name", "products_0"."count_price" AS "count_price") AS "sel_0")) AS "products" FROM (SELECT "products"."name", count("products"."price") AS "count_price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8)) GROUP BY "products"."name" LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "products_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("sel_json_0"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."name" AS "name", "products_0"."count_price" AS "count_price") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."name", count("products"."price") AS "count_price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8)) GROUP BY "products"."name" LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -414,7 +415,7 @@ func aggFunctionWithFilter(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("products"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."max_price" AS "max_price") AS "sel_0")) AS "products" FROM (SELECT "products"."id", max("products"."price") AS "max_price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."id") > 10)) GROUP BY "products"."id" LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "products_0") AS "done_1337";`
+	sql := `SELECT json_object_agg('products', products) FROM (SELECT coalesce(json_agg("sel_json_0"), '[]') AS "products" FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."max_price" AS "max_price") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", max("products"."price") AS "max_price" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."id") > 10)) GROUP BY "products"."id" LIMIT ('20') :: integer) AS "products_0" LIMIT ('20') :: integer) AS "sel_json_agg_0") AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -434,7 +435,7 @@ func queryWithVariables(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('product', product) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "product_0"."id" AS "id", "product_0"."name" AS "name") AS "sel_0")) AS "product" FROM (SELECT "product"."id", "product"."name" FROM "products" AS "product" WHERE ((("product"."price") > 0) AND (("product"."price") < 8) AND (("product"."price") = {{product_price}}) AND (("id") = {{product_id}})) LIMIT ('1') :: integer) AS "product_0" LIMIT ('1') :: integer) AS "done_1337";`
+	sql := `SELECT json_object_agg('product', sel_json_0) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "products_0"."id" AS "id", "products_0"."name" AS "name") AS "sel_0")) AS "sel_json_0" FROM (SELECT "products"."id", "products"."name" FROM "products" WHERE ((("products"."price") > 0) AND (("products"."price") < 8) AND (("products"."price") = {{product_price}}) AND (("products"."id") = {{product_id}})) LIMIT ('1') :: integer) AS "products_0" LIMIT ('1') :: integer) AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -453,7 +454,7 @@ func syntheticTables(t *testing.T) {
 		}
 	}`

-	sql := `SELECT json_object_agg('me', me) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "me_0"."email" AS "email") AS "sel_0")) AS "me" FROM (SELECT "me"."email" FROM "users" AS "me" WHERE ((("me"."id") = {{user_id}})) LIMIT ('1') :: integer) AS "me_0" LIMIT ('1') :: integer) AS "done_1337";`
+	sql := `SELECT json_object_agg('me', sel_json_0) FROM (SELECT row_to_json((SELECT "sel_0" FROM (SELECT "users_0"."email" AS "email") AS "sel_0")) AS "sel_json_0" FROM (SELECT "users"."email" FROM "users" WHERE ((("users"."id") = {{user_id}})) LIMIT ('1') :: integer) AS "users_0" LIMIT ('1') :: integer) AS "done_1337";`

 	resSQL, err := compileGQLToPSQL(gql, nil)
 	if err != nil {
@ -478,8 +479,9 @@ func TestCompileSelect(t *testing.T) {
 	t.Run("manyToManyReverse", manyToManyReverse)
 	t.Run("aggFunction", aggFunction)
 	t.Run("aggFunctionWithFilter", aggFunctionWithFilter)
-	t.Run("queryWithVariables", queryWithVariables)
 	t.Run("syntheticTables", syntheticTables)
+	t.Run("queryWithVariables", queryWithVariables)
+
 }

 var benchGQL = []byte(`query {
--- a/qcode/qcode.go
+++ b/qcode/qcode.go
@ -164,7 +164,7 @@ var opMap = map[parserType]QType{
 }

 var expPool = sync.Pool{
-	New: func() interface{} { return new(Exp) },
+	New: func() interface{} { return &Exp{doFree: true} },
 }

 func NewCompiler(c Config) (*Compiler, error) {
@ -195,6 +195,7 @@ func NewCompiler(c Config) (*Compiler, error) {

 	seedExp := [100]Exp{}
 	for i := range seedExp {
+		seedExp[i].doFree = true
 		expPool.Put(&seedExp[i])
 	}

@ -318,7 +319,6 @@ func (com *Compiler) compileQuery(op *Operation) ([]Select, error) {
 		}

 		if fil != nil && fil.Op != OpNop {
-
 			if root.Where != nil {
 				ow := root.Where

@ -695,7 +695,7 @@ func newExp(st *util.Stack, node *Node, usePool bool) (*Exp, error) {
 		ex = expPool.Get().(*Exp)
 		ex.Reset()
 	} else {
-		ex = &Exp{}
+		ex = &Exp{doFree: false}
 	}
 	ex.Children = ex.childrenA[:0]

@ -881,7 +881,7 @@ func compileFilter(filter []string) (*Exp, error) {
 	st := util.NewStack()

 	if len(filter) == 0 {
-		return &Exp{Op: OpNop}, nil
+		return &Exp{Op: OpNop, doFree: false}, nil
 	}

 	for i := range filter {
@ -893,10 +893,11 @@ func compileFilter(filter []string) (*Exp, error) {
 		if err != nil {
 			return nil, err
 		}
+
 		if fl == nil {
 			fl = f
 		} else {
-			fl = &Exp{Op: OpAnd, Children: []*Exp{fl, f}}
+			fl = &Exp{Op: OpAnd, Children: []*Exp{fl, f}, doFree: false}
 		}
 	}
 	return fl, nil
@ -986,6 +987,7 @@ func (t ExpOp) String() string {
 }

 func FreeExp(ex *Exp) {
+	//	fmt.Println(">", ex.doFree)
 	if ex.doFree {
 		expPool.Put(ex)
 	}
--- a/rails-app/Dockerfile
+++ b/rails-app/Dockerfile
@ -1,4 +1,4 @@
-FROM ruby:2.5
+FROM ruby:2.5.7
 RUN apt-get update -qq && apt-get install -y nodejs postgresql-client
 RUN mkdir /app
 WORKDIR /app
--- a/rails-app/Gemfile
+++ b/rails-app/Gemfile
@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }

-ruby '2.5.6'
+ruby '2.5.7'

 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0.0.rc1'
--- a/rails-app/Gemfile.lock
+++ b/rails-app/Gemfile.lock
@ -0,0 +1,274 @@
+GIT
+  remote: https://github.com/stympy/faker.git
+  revision: e7c898c05306409cedf5b795a622a326ec87e279
+  branch: master
+  specs:
+    faker (2.5.0)
+      i18n (~> 1.6.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    archive-zip (0.12.0)
+      io-like (~> 0.3.0)
+    bcrypt (3.1.13)
+    bindex (0.8.1)
+    bootsnap (1.4.5)
+      msgpack (~> 1.0)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.29.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
+    childprocess (2.0.0)
+      rake (< 13.0)
+    chromedriver-helper (2.1.1)
+      archive-zip (~> 0.10)
+      nokogiri (~> 1.8)
+    coffee-rails (4.2.2)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    devise (4.7.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
+    erubi (1.9.0)
+    execjs (2.7.0)
+    ffi (1.11.1)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    io-like (0.3.0)
+    jbuilder (2.9.1)
+      activesupport (>= 4.2.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.3.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.12.2)
+    msgpack (1.3.1)
+    nio4r (2.5.2)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    orm_adapter (0.5.0)
+    pg (1.1.4)
+    public_suffix (4.0.1)
+    puma (3.12.1)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.2.0)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (12.3.3)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    redis (4.1.3)
+    redis-actionpack (5.1.0)
+      actionpack (>= 4.0, < 7)
+      redis-rack (>= 1, < 3)
+      redis-store (>= 1.1.0, < 2)
+    redis-activesupport (5.2.0)
+      activesupport (>= 3, < 7)
+      redis-store (>= 1.3, < 2)
+    redis-rack (2.0.6)
+      rack (>= 1.5, < 3)
+      redis-store (>= 1.2, < 2)
+    redis-rails (5.0.2)
+      redis-actionpack (>= 5.0, < 6)
+      redis-activesupport (>= 5.0, < 6)
+      redis-store (>= 1.2, < 2)
+    redis-store (1.8.0)
+      redis (>= 4, < 5)
+    regexp_parser (1.6.0)
+    responders (3.0.0)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
+    ruby_dep (1.5.0)
+    rubyzip (2.0.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.1.0)
+      railties (>= 5.2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (3.142.5)
+      childprocess (>= 0.5, < 3.0)
+      rubyzip (>= 1.2.2)
+    spring (2.1.0)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    turbolinks (5.2.1)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uglifier (4.2.0)
+      execjs (>= 0.3.0, < 3)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    web-console (4.0.1)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 6.0.0)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.1.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bootsnap (>= 1.1.0)
+  byebug
+  capybara (>= 2.15)
+  chromedriver-helper
+  coffee-rails (~> 4.2)
+  devise
+  faker!
+  jbuilder (~> 2.5)
+  listen (>= 3.0.5, < 3.2)
+  pg (>= 0.18, < 2.0)
+  puma (~> 3.11)
+  rails (~> 6.0.0.rc1)
+  redis-rails
+  sass-rails (~> 5.0)
+  selenium-webdriver
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  turbolinks (~> 5)
+  tzinfo-data
+  uglifier (>= 1.3.0)
+  web-console (>= 3.3.0)
+
+RUBY VERSION
+   ruby 2.5.7p206
+
+BUNDLED WITH
+   1.17.3
--- a/serv/allow.go
+++ b/serv/allow.go
@ -97,9 +97,23 @@ func (al *allowList) add(req *gqlReq) {
 		return
 	}

+	var query string
+
+	for i := 0; i < len(req.Query); i++ {
+		c := req.Query[i]
+		if c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' {
+			query = req.Query
+			break
+
+		} else if c == '{' {
+			query = "query " + req.Query
+			break
+		}
+	}
+
 	al.saveChan <- &allowItem{
 		uri:  req.ref,
-		gql:  req.Query,
+		gql:  query,
 		vars: req.Vars,
 	}
 }
--- a/serv/cmd.go
+++ b/serv/cmd.go
@ -133,7 +133,8 @@ e.g. db:migrate -+1
 }

 func initLog() *zerolog.Logger {
-	logger := zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).
+	out := zerolog.ConsoleWriter{Out: os.Stderr}
+	logger := zerolog.New(out).
 		With().
 		Timestamp().
 		Caller().
--- a/serv/cmd_migrate.go
+++ b/serv/cmd_migrate.go
@ -292,7 +292,7 @@ func cmdDBStatus(cmd *cobra.Command, args []string) {
 	}

 	fmt.Println("status:  ", status)
-	fmt.Println("version:  %d of %d\n", mver, len(m.Migrations))
+	fmt.Printf("version:  %d of %d\n", mver, len(m.Migrations))
 	fmt.Println("host:    ", conf.DB.Host)
 	fmt.Println("database:", conf.DB.DBName)
 }
--- a/serv/cmd_test.go
+++ b/serv/cmd_test.go
@ -1,9 +1,6 @@
 package serv_test

-import (
-	"testing"
-)
-
+/*
 func TestErrorLineExtract(t *testing.T) {
 	tests := []struct {
 		source   string
@ -102,3 +99,4 @@ error`,
 		}
 	}
 }
+*/
--- a/serv/reload.go
+++ b/serv/reload.go
@ -105,7 +105,7 @@ func Do(log func(string, ...interface{}), additional ...dir) error {
 				// Panic, and Fatal :-/ Printf() is probably best.
 				log("reload error: %v", err)
 			case event := <-watcher.Events:
-				// Ensure that we use the correct events, as they are not uniform accross
+				// Ensure that we use the correct events, as they are not uniform across
 				// platforms. See https://github.com/fsnotify/fsnotify/issues/74
 				var trigger bool
 				switch runtime.GOOS {
--- a/serv/utils.go
+++ b/serv/utils.go
@ -56,7 +56,7 @@ func gqlHash(b string, vars []byte) string {
 		}
 	}

-	if vars == nil {
+	if vars == nil || len(vars) == 0 {
 		return hex.EncodeToString(h.Sum(nil))
 	}

--- a/serv/utils_test.go
+++ b/serv/utils_test.go
@ -61,6 +61,39 @@ func TestRelaxHash2(t *testing.T) {
 	}
 }

+func TestRelaxHash3(t *testing.T) {
+	var v1 = `users {
+			id
+			email
+			picture: avatar
+			products(limit: 2, where: {price: {gt: 10}}) {
+				id
+				name
+				description
+			}
+		}`
+
+	var v2 = `
+		users {
+			id
+			email
+			picture: avatar
+			products(limit: 2, where: {price: {gt: 10}}) {
+				id
+				name
+				description
+			}
+		}
+`
+
+	h1 := gqlHash(v1, nil)
+	h2 := gqlHash(v2, nil)
+
+	if strings.Compare(h1, h2) != 0 {
+		t.Fatal("Hashes don't match they should")
+	}
+}
+
 func TestRelaxHashWithVars1(t *testing.T) {
 	var q1 = `
 	products(
--- a/test.yml
+++ b/test.yml
@ -1,57 +0,0 @@
-app_name: Test App
-auth:
-  cookie: _app_session
-  header: X-User-ID
-  rails:
-    max_active: 12000
-    max_idle: 80
-    secret_key_base: 0a248500a64c01184edb4d7ad3a805488f8097ac761b76aaa6c17c01dcb7af03a2f18ba61b2868134b9c7b79a122bc0dadff4367414a2d173297bfea92be5566
-    version: 5.2
-  type: rails
-auth_fail_block: never
-database:
-  dbname: app_development
-  defaults:
-    blocklist:
-    - ar_internal_metadata
-    - schema_migrations
-    - secret
-    - password
-    - encrypted
-    - token
-  host: db
-  password: ""
-  port: 5432
-  schema: public
-  tables:
-  - name: users
-  - filter: none
-    name: customers
-    remotes:
-    - id: stripe_id
-      name: payments
-      pass_headers:
-      - cookie
-      path: data
-      set_headers:
-      - name: Host
-        value: 0.0.0.0
-      url: http://rails_app:3000/stripe/$id
-  - filter:
-    - '{ id: { eq: $user_id } }'
-    name: me
-    table: users
-  type: postgres
-  user: postgres
-  variables:
-    account_id: (select account_id from users where id = $user_id)
-enable_tracing: true
-env: development
-host_port: 0.0.0.0:8080
-log_level: debug
-migrations_path: ./config/migrations
-port: "8080"
-reload_on_config_change: true
-seed_file: seed.js
-use_allow_list: false
-web_ui: true
--- a/tmpl/100_init.sql
+++ b/tmpl/100_init.sql
@ -10,7 +10,8 @@ CREATE TABLE public.users (

 ---- create above / drop below ----

-- Write your migrate down statements here. If this migration is irreversible
-- Then delete the separator line above.
+-- Write your down migrate statements here. If this migration is irreversible
+-- then delete the separator line above.
+
+DROP TABLE public.users

-DROP TABLE public.users
Author	SHA1	Message	Date
Vikram Rangnekar	0fc1236266	Remove extra link from README	2019-10-04 22:43:41 -04:00
Vikram Rangnekar	52ee2cf6a3	Update docs, getting started guide and mutations	2019-10-04 22:20:54 -04:00
Vikram Rangnekar	50ba6732fe	Fix return values for bulk mutations and delete	2019-10-03 10:24:11 -04:00
Vikram Rangnekar	a8ad87115e	Fix issues with mutation SQL	2019-10-03 03:08:01 -04:00
Vikram Rangnekar	bcc443bd59	Fix broken demo app	2019-10-02 11:31:49 -04:00
Vikram Rangnekar	4e7f938f53	Merge pull request #6 from muesli/typo-fixes Fix typo in 'across'	2019-10-01 18:14:59 -04:00
Christian Muehlhaeuser	4683936de0	Fix typo in 'across' Simple, nit-picky typo fix.	2019-10-01 15:43:22 +00:00