Add ability to set filters per operation / action

Move rails-app to examples folder

config/allow.list

@@ -5,7 +5,7 @@ variables {
 		"name": "Wu-Tang",
 		"description": "No description needed"
 	},
-  "product_id": 1
+	"product_id": 1
 }
 
 mutation {
@@ -16,6 +16,111 @@ mutation {
   }
 }
 
+variables {
+	"data": {
+		"product_id": 5
+	}
+}
+
+mutation {
+  products(id: $product_id, delete: true) {
+    id
+    name
+  }
+}
+
+variables {
+	"data": [
+		{
+			"name": "Gumbo1",
+			"created_at": "now",
+			"updated_at": "now"
+		},
+		{
+			"name": "Gumbo2",
+			"created_at": "now",
+			"updated_at": "now"
+		}
+	]
+}
+
+mutation {
+  products(id: 199, delete: true) {
+    id
+    name
+  }
+}
+
+variables {
+	"data": [
+		{
+			"name": "Gumbo1",
+			"created_at": "now",
+			"updated_at": "now"
+		},
+		{
+			"name": "Gumbo2",
+			"created_at": "now",
+			"updated_at": "now"
+		}
+	]
+}
+
+query {
+  products {
+    id
+    name
+  }
+}
+
+
+variables {
+	"update": {
+		"name": "Helloo",
+		"description": "World \u003c\u003e"
+	},
+	"user": 123
+}
+
+mutation {
+  products(id: 5, update: $update) {
+    id
+    name
+    description
+  }
+}
+
+variables {
+	"data": [
+		{
+			"name": "Gumbo1",
+			"created_at": "now",
+			"updated_at": "now"
+		},
+		{
+			"name": "Gumbo2",
+			"created_at": "now",
+			"updated_at": "now"
+		}
+	]
+}
+
+query {
+  product {
+    id
+    name
+  }
+}
+
+
+query {
+  me {
+    id
+    email
+    full_name
+  }
+}
+
 variables {
 	"data": {
 		"email": "gfk@myspace.com",
@@ -31,19 +136,6 @@ mutation {
   }
 }
 
-variables {
-	"data": {
-		"product_id": 5
-	}
-}
-
-mutation {
-  products(id: $product_id, delete: true) {
-    id
-    name
-  }
-}
-
 query {
   users {
     id
@@ -79,26 +171,3 @@ mutation {
   }
 }
 
-query {
-  me {
-    id
-    email
-    full_name
-  }
-}
-
-variables {
-	"update": {
-		"name": "Helloo",
-		"description": "World \u003c\u003e"
-	},
-	"user": 123
-}
-
-mutation {
-  products(id: 5, update: $update) {
-    id
-    name
-    description
-  }
-}

config/dev.yml

@@ -111,42 +111,45 @@ database:
       - encrypted
       - token
 
-  tables:
-    - name: users
-      # This filter will overwrite defaults.filter
-      # filter: ["{ id: { eq: $user_id } }"]
+tables:
+  - name: users
+    # This filter will overwrite defaults.filter
+    # filter: ["{ id: { eq: $user_id } }"]
+    # filter_query: ["{ id: { eq: $user_id } }"]
+    filter_update: ["{ id: { eq: $user_id } }"]
+    filter_delete: ["{ id: { eq: $user_id } }"]
 
-    # - name: products
-    #   # Multiple filters are AND'd together
-    #   filter: [
-    #     "{ price: { gt: 0 } }",
-    #     "{ price: { lt: 8 } }"
-    #   ]
+  # - name: products
+  #   # Multiple filters are AND'd together
+  #   filter: [
+  #     "{ price: { gt: 0 } }",
+  #     "{ price: { lt: 8 } }"
+  #   ]
 
-    - name: customers
-      # No filter is used for this field not
-      # even defaults.filter
-      filter: none
+  - name: customers
+    # No filter is used for this field not
+    # even defaults.filter
+    filter: none
 
-      remotes:
-        - name: payments
-          id: stripe_id
-          url: http://rails_app:3000/stripe/$id
-          path: data
-          # debug: true
-          pass_headers: 
-            - cookie
-          set_headers:
-            - name: Host
-              value: 0.0.0.0
-            # - name: Authorization
-            #   value: Bearer <stripe_api_key>
+    remotes:
+      - name: payments
+        id: stripe_id
+        url: http://rails_app:3000/stripe/$id
+        path: data
+        # debug: true
+        pass_headers: 
+          - cookie
+        set_headers:
+          - name: Host
+            value: 0.0.0.0
+          # - name: Authorization
+          #   value: Bearer <stripe_api_key>
 
-    - # You can create new fields that have a
-      # real db table backing them
-      name: me
-      table: users
-      filter: ["{ id: { eq: $user_id } }"]
+  - # You can create new fields that have a
+    # real db table backing them
+    name: me
+    table: users
+    filter: ["{ id: { eq: $user_id } }"]
 
-    # - name: posts
-    #   filter: ["{ account_id: { _eq: $account_id } }"]
+  # - name: posts
+  #   filter: ["{ account_id: { _eq: $account_id } }"]

config/prod.yml

@@ -105,40 +105,43 @@ database:
       - encrypted
       - token
 
-  tables:
-    - name: users
-      # This filter will overwrite defaults.filter
-      filter: ["{ id: { eq: $user_id } }"]
+tables:
+  - name: users
+    # This filter will overwrite defaults.filter
+    # filter: ["{ id: { eq: $user_id } }"]
+    # filter_query: ["{ id: { eq: $user_id } }"]
+    filter_update: ["{ id: { eq: $user_id } }"]
+    filter_delete: ["{ id: { eq: $user_id } }"]
 
-    - name: products
-      # Multiple filters are AND'd together
-      filter: [
-        "{ price: { gt: 0 } }",
-        "{ price: { lt: 8 } }"
-      ] 
+  - name: products
+    # Multiple filters are AND'd together
+    filter: [
+      "{ price: { gt: 0 } }",
+      "{ price: { lt: 8 } }"
+    ] 
 
-    - name: customers
-      # No filter is used for this field not 
-      # even defaults.filter
-      filter: none
+  - name: customers
+    # No filter is used for this field not 
+    # even defaults.filter
+    filter: none
 
-      # remotes:
-      #   - name: payments
-      #     id: stripe_id
-      #     url: http://rails_app:3000/stripe/$id
-      #     path: data
-      #     # pass_headers: 
-      #     #   - cookie
-      #     #   - host
-      #     set_headers:
-      #       - name: Authorization
-      #         value: Bearer <stripe_api_key>
+    # remotes:
+    #   - name: payments
+    #     id: stripe_id
+    #     url: http://rails_app:3000/stripe/$id
+    #     path: data
+    #     # pass_headers: 
+    #     #   - cookie
+    #     #   - host
+    #     set_headers:
+    #       - name: Authorization
+    #         value: Bearer <stripe_api_key>
 
-    - # You can create new fields that have a
-      # real db table backing them
-      name: me
-      table: users
-      filter: ["{ id: { eq: $user_id } }"]
+  - # You can create new fields that have a
+    # real db table backing them
+    name: me
+    table: users
+    filter: ["{ id: { eq: $user_id } }"]
 
-    # - name: posts
-    #   filter: ["{ account_id: { _eq: $account_id } }"]
+  # - name: posts
+  #   filter: ["{ account_id: { _eq: $account_id } }"]

demo

@@ -1,13 +1,13 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ "$1" == "start" ]; then
   echo "Downloading pre-built docker images"
-  docker-compose -f rails-app/demo.yml pull
+  docker-compose -f examples/rails-app/demo.yml pull
   echo "Setting up and deploying Super Graph and the demo Rails app"
-  docker-compose -f rails-app/demo.yml run rails_app rake db:create db:migrate db:seed
-  docker-compose -f rails-app/demo.yml up
+  docker-compose -f examples/rails-app/demo.yml run rails_app rake db:create db:migrate db:seed
+  docker-compose -f examples/rails-app/demo.yml up
 elif [ "$1" == "stop" ]; then
-  docker-compose -f rails-app/demo.yml down
+  docker-compose -f examples/rails-app/demo.yml down
 else
   echo "./demo [start|stop]"
-fi
+fi

docker-compose.yml

@@ -12,10 +12,10 @@ services:
   #     - "6379:6379"
 
   rails_app:
-    build: rails-app/.
+    build: examples/rails-app/.
     command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
     volumes:
-      - ./rails-app:/app
+      - ./examples/rails-app:/app
       - /app/tmp
     ports:
       - "3000:3000"

docs/guide.md

@@ -588,7 +588,7 @@ 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.
+In GraphQL mutations is the operation type for when you need to modify data. Super Graph supports the `insert`, `update`, `upsert` and `delete` database operations. Here are some examples.
 
 When using mutations the data must be passed as variables since Super Graphs compiles the query into an prepared statement in the database for maximum speed. Prepared statements are are functions in your code when called they accept arguments and your variables are passed in as those arguments.
 
@@ -721,6 +721,56 @@ mutation {
 }
 ```
 
+### Upsert
+
+```json
+{
+  "data": { 
+    "id": 5,
+    "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(upsert: $data) {
+    id
+    name
+  }
+}
+```
+
+### Bulk upsert 
+
+```json
+{
+  "data": [{ 
+    "id": 5,
+    "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
+  },
+  { 
+    "id": 6,
+    "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(upsert: $data) {
+    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