Fix issue with upgrading to postgres 12 docker image #36

* fix "Try the demo app" in docs

* fix "Get Started" setup in docs

Makefile

@@ -35,7 +35,7 @@ $(GORICE):
 
 $(WEB_BUILD_DIR):
 	@echo "First install Yarn and create a build of the web UI found under ./web"
-	@echo "Command: cd web && yarn build"
+	@echo "Command: cd web && yarn && yarn build"
 	@exit 1
 
 $(GITCHGLOG):
@@ -77,7 +77,7 @@ clean:
 run: clean
 	@go run $(BUILD_FLAGS) main.go $(ARGS)
 
-install:
+install: gen
 	@echo $(GOPATH)
 	@echo "Commit Hash: `git rev-parse HEAD`"
 	@echo "Old Hash: `shasum $(GOPATH)/bin/$(BINARY) 2>/dev/null | cut -c -32`"

config/dev.yml

@@ -93,7 +93,7 @@ database:
   port: 5432
   dbname: app_development
   user: postgres
-  password: ''
+  password: postgres
 
   #schema: "public"
   #pool_size: 10

config/prod.yml

@@ -54,7 +54,7 @@ database:
   port: 5432
   dbname: app_production
   user: postgres
-  password: ''
+  password: postgres
   #pool_size: 10
   #max_retries: 0
   #log_level: "debug" 

docker-compose.yml

@@ -1,7 +1,10 @@
 version: '3.4'
 services:
   db:
-    image: postgres
+    image: postgres:12
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     ports:
       - "5432:5432"
 

docs/guide.md

@@ -34,6 +34,12 @@ Super Graph has a rich feature set like integrating with your existing Ruby on R
 # clone the repository
 git clone https://github.com/dosco/super-graph
 
+# run db in background
+docker-compose up -d db
+
+# see logs and wait until DB is really UP
+docker-compose logs db
+
 # setup the demo rails app & database and run it
 docker-compose run rails_app rake db:create db:migrate db:seed
 
@@ -137,7 +143,7 @@ What if I told you Super Graph will fetch all this data with a single SQL query
 
 ```graphql
 query {
-    products(limit 5, where: { price: { gt: 12 } }) {
+    products(limit: 5, where: { price: { gt: 12 } }) {
       id
       name
       description
@@ -153,7 +159,7 @@ query {
       }
   }
   purchases(
-      limit 10, 
+      limit: 10, 
       order_by: { created_at: desc } , 
       where: { user_id: { eq: $user_id } }
     ) {
@@ -216,7 +222,7 @@ You can then add your database schema to the migrations, maybe create some seed
 git clone https://github.com/dosco/super-graph && cd super-graph && make install
 ```
 
-And then create and launch you're new app
+And then create and launch your new app
 
 ```bash
 # create a new app and change to it's directory
@@ -1133,7 +1139,7 @@ query {
 
 ## 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
+Variables (`$product_id`) and their values (`"product_id": 5`) can be passed along side the GraphQL query. Using variables makes for better client side code as well as improved server side SQL query caching. The built-in web-ui also supports setting variables. Not having to manipulate your GraphQL query string to insert values into it makes for cleaner
 and better client side code.
 
 ```javascript
@@ -1552,7 +1558,7 @@ roles:
 
 This configuration is relatively simple to follow the `roles_query` parameter is the query that must be run to help figure out a users role. This query can be as complex as you like and include joins with other tables. 
 
-The individual roles are defined under the `roles` parameter and this includes each table the role has a custom setting for. The role is dynamically matched using the `match` parameter for example in the above case `users.id = 1` means that when the `roles_query` is executed a user with the id `1` willbe assigned the admin role and those that don't match get the `user` role if authenticated successfully or the `anon` role.
+The individual roles are defined under the `roles` parameter and this includes each table the role has a custom setting for. The role is dynamically matched using the `match` parameter for example in the above case `users.id = 1` means that when the `roles_query` is executed a user with the id `1` will be assigned the admin role and those that don't match get the `user` role if authenticated successfully or the `anon` role.
 
 ## Remote Joins
 
@@ -1767,7 +1773,7 @@ database:
   port: 5432
   dbname: app_development
   user: postgres
-  password: ''
+  password: postgres
 
   #schema: "public"
   #pool_size: 10

docs/internals.md

@@ -13,7 +13,7 @@ Super Graph code is made up of a number of packages. We have done our best to ke
 
 ## QCODE
 
-This package contains the core of the GraphQL conpiler it handling the lexing and parsing of the GraphQL query transforming it into an internal representation called
+This package contains the core of the GraphQL compiler it handling the lexing and parsing of the GraphQL query transforming it into an internal representation called
 `QCode`.
 
 This is the first step of the compiling process the `func NewCompiler(c Config)` function creates a new instance of this compiler which has it's own config. 
@@ -71,7 +71,7 @@ item{itemObjOpen, 16, 20} // {
 ...
 ```
 
-These tokens are then fed into the parser `parse.go` the parser does the work of generating an abstract syntax tree (AST) from the tokens. This AST is an internal representation (data structure) and is not exposed outside the package. Sinc the AST is a tree a stack `stack.go` is used to walk the tree and generate the QCode AST. The QCode data structure is also a tree (represented as an array). This is then returned to the caller of the compile function.
+These tokens are then fed into the parser `parse.go` the parser does the work of generating an abstract syntax tree (AST) from the tokens. This AST is an internal representation (data structure) and is not exposed outside the package. Since the AST is a tree a stack `stack.go` is used to walk the tree and generate the QCode AST. The QCode data structure is also a tree (represented as an array). This is then returned to the caller of the compile function.
 
 ```go
 type Operation struct {

examples/rails-app/config/database.yml

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

jsn/filter.go

@@ -27,14 +27,20 @@ func Filter(w *bytes.Buffer, b []byte, keys []string) error {
 
 	var k []byte
 	state := expectKey
+	instr := false
 
 	for i := 0; i < len(b); i++ {
 		if state == expectObjClose || state == expectListClose {
-			switch b[i] {
-			case '{', '[':
-				d++
-			case '}', ']':
-				d--
+			if b[i-1] != '\\' && b[i] == '"' {
+				instr = !instr
+			}
+			if !instr {
+				switch b[i] {
+				case '{', '[':
+					d++
+				case '}', ']':
+					d--
+				}
 			}
 		}
 

jsn/get.go

@@ -51,13 +51,20 @@ func Get(b []byte, keys [][]byte) []Field {
 	state := expectKey
 
 	n := 0
+	instr := false
+
 	for i := 0; i < len(b); i++ {
 		if state == expectObjClose || state == expectListClose {
-			switch b[i] {
-			case '{', '[':
-				d++
-			case '}', ']':
-				d--
+			if b[i-1] != '\\' && b[i] == '"' {
+				instr = !instr
+			}
+			if !instr {
+				switch b[i] {
+				case '{', '[':
+					d++
+				case '}', ']':
+					d--
+				}
 			}
 		}
 

jsn/json_test.go

@@ -2,6 +2,7 @@ package jsn
 
 import (
 	"bytes"
+	"io/ioutil"
 	"testing"
 )
 
@@ -161,6 +162,8 @@ var (
 
 	input6 = `
 	{"users" : [{"id" : 1, "email" : "vicram@gmail.com", "slug" : "vikram-rangnekar", "threads" : [], "threads_cursor" : null}, {"id" : 3, "email" : "marareilly@lang.name", "slug" : "raymundo-corwin", "threads" : [{"id" : 9, "title" : "Et alias et aut porro praesentium nam in voluptatem reiciendis quisquam perspiciatis inventore eos quia et et enim qui amet."}, {"id" : 25, "title" : "Ipsam quam nemo culpa tempore amet optio sit sed eligendi autem consequatur quaerat rem velit quibusdam quibusdam optio a voluptatem."}], "threads_cursor" : 25}], "users_cursor" : 3}`
+
+	input7, _ = ioutil.ReadFile("test.json")
 )
 
 func TestGet(t *testing.T) {
@@ -256,6 +259,15 @@ func TestGet2(t *testing.T) {
 	}
 }
 
+func TestGet3(t *testing.T) {
+	values := Get(input7, [][]byte{[]byte("data")})
+	v := values[0].Value
+
+	if !bytes.Equal(v[len(v)-11:], []byte(`Rangnekar"}`)) {
+		t.Fatal("corrupt ending")
+	}
+}
+
 func TestValue(t *testing.T) {
 	v1 := []byte("12345")
 	if !bytes.Equal(Value(v1), v1) {

jsn/keys.go

@@ -10,15 +10,20 @@ func Keys(b []byte) [][]byte {
 
 	st := NewStack()
 	ae := 0
+	instr := false
 
 	for i := 0; i < len(b); i++ {
-
 		if state == expectObjClose || state == expectListClose {
-			switch b[i] {
-			case '{', '[':
-				d++
-			case '}', ']':
-				d--
+			if b[i-1] != '\\' && b[i] == '"' {
+				instr = !instr
+			}
+			if !instr {
+				switch b[i] {
+				case '{', '[':
+					d++
+				case '}', ']':
+					d--
+				}
 			}
 		}
 

jsn/replace.go

@@ -32,6 +32,8 @@ func Replace(w *bytes.Buffer, b []byte, from, to []Field) error {
 	state := expectKey
 	ws, we := -1, len(b)
 
+	instr := false
+
 	for i := 0; i < len(b); i++ {
 		// skip any left padding whitespace
 		if ws == -1 && (b[i] == '{' || b[i] == '[') {
@@ -39,11 +41,16 @@ func Replace(w *bytes.Buffer, b []byte, from, to []Field) error {
 		}
 
 		if state == expectObjClose || state == expectListClose {
-			switch b[i] {
-			case '{', '[':
-				d++
-			case '}', ']':
-				d--
+			if b[i-1] != '\\' && b[i] == '"' {
+				instr = !instr
+			}
+			if !instr {
+				switch b[i] {
+				case '{', '[':
+					d++
+				case '}', ']':
+					d--
+				}
 			}
 		}
 

jsn/strip.go

@@ -11,14 +11,20 @@ func Strip(b []byte, path [][]byte) []byte {
 	pi := 0
 	pm := false
 	state := expectKey
+	instr := false
 
 	for i := 0; i < len(b); i++ {
 		if state == expectObjClose || state == expectListClose {
-			switch b[i] {
-			case '{', '[':
-				d++
-			case '}', ']':
-				d--
+			if b[i-1] != '\\' && b[i] == '"' {
+				instr = !instr
+			}
+			if !instr {
+				switch b[i] {
+				case '{', '[':
+					d++
+				case '}', ']':
+					d--
+				}
 			}
 		}
 

serv/args.go

@@ -39,11 +39,16 @@ func argMap(ctx context.Context, vars []byte) func(w io.Writer, tag string) (int
 
 		}
 		v := fields[0].Value
+
+		// Open and close quotes
 		if len(v) >= 2 && v[0] == '"' && v[len(v)-1] == '"' {
 			fields[0].Value = v[1 : len(v)-1]
 		}
 
 		if tag == "cursor" {
+			if bytes.EqualFold(v, []byte("null")) {
+				return io.WriteString(w, ``)
+			}
 			v1, err := decrypt(string(fields[0].Value))
 			if err != nil {
 				return 0, err
@@ -52,6 +57,8 @@ func argMap(ctx context.Context, vars []byte) func(w io.Writer, tag string) (int
 			return w.Write(v1)
 		}
 
+		fmt.Println(">>>", tag, string(v))
+
 		return w.Write(escQuote(fields[0].Value))
 	}
 }

serv/init.go

@@ -5,6 +5,7 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/dosco/super-graph/allow"
 	"github.com/dosco/super-graph/crypto"
@@ -135,7 +136,17 @@ func initDBPool(c *config) (*pgxpool.Pool, error) {
 		config.MaxConns = conf.DB.PoolSize
 	}
 
-	db, err := pgxpool.ConnectConfig(context.Background(), config)
+	var db *pgxpool.Pool
+	var err error
+
+	for i := 1; i < 10; i++ {
+		db, err = pgxpool.ConnectConfig(context.Background(), config)
+		if err == nil {
+			break
+		}
+		time.Sleep(time.Duration(i*100) * time.Millisecond)
+	}
+
 	if err != nil {
 		return nil, err
 	}

tmpl/dev.yml

@@ -109,7 +109,7 @@ database:
   port: 5432
   dbname: {% app_name_slug %}_development
   user: postgres
-  password: ''
+  password: postgres
 
   #schema: "public"
   #pool_size: 10

tmpl/docker-compose.yml

@@ -2,7 +2,10 @@ version: '3.4'
 services:
   # Postgres DB
   db:
-    image: postgres:11.5
+    image: postgres:12
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     ports:
       - "5432:5432"
 

tmpl/prod.yml

@@ -54,7 +54,7 @@ database:
   port: 5432
   dbname: {% app_name_slug %}_development
   user: postgres
-  password: ''
+  password: postgres
   #pool_size: 10
   #max_retries: 0
   #log_level: "debug"