wpetit
/
super-graph
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add ability to set filters per operation / action

This commit is contained in:
Vikram Rangnekar 2019-10-06 16:28:10 -04:00
parent 450d77ccbd
commit 9299855d8a
17 changed files with 446 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
config/allow.list
View File

@ -5,7 +5,7 @@ variables {
"name": "Wu-Tang", "name": "Wu-Tang",
"description": "No description needed" "description": "No description needed"
}, },
"product_id": 1 "product_id": 1
} }
mutation { 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 { variables {
"data": { "data": {
"email": "gfk@myspace.com", "email": "gfk@myspace.com",
@ -31,19 +136,6 @@ mutation {
} }
} }
variables {
"data": {
"product_id": 5
}
}
mutation {
products(id: $product_id, delete: true) {
id
name
}
}
query { query {
users { users {
id 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
}
}

71
config/dev.yml
View File

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

67
config/prod.yml
View File

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

2
psql/insert.go
View File

@ -51,7 +51,7 @@ func (co *Compiler) compileMutation(qc *qcode.QCode, w *bytes.Buffer, vars Varia
} }
default: default:
return 0, errors.New("valid mutations are 'insert' and 'update'") return 0, errors.New("valid mutations are 'insert', 'update', 'upsert' and 'delete'")
} }
io.WriteString(c.w, ` RETURNING *) `) io.WriteString(c.w, ` RETURNING *) `)

6
psql/insert_test.go
View File

@ -36,10 +36,10 @@ func singleInsert(t *testing.T) {
} }
}` }`
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";` sql := `WITH "products" AS (WITH "input" AS (SELECT {{insert}}::json AS j) INSERT INTO "products" (name, description, user_id) SELECT name, description, user_id 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{ vars := map[string]json.RawMessage{
"insert": json.RawMessage(` { "name": "my_name", "woo": { "hoo": "goo" }, "description": "my_desc" }`), "insert": json.RawMessage(` { "name": "my_name", "woo": { "hoo": "goo" }, "description": "my_desc", "user_id": 5 }`),
} }
resSQL, err := compileGQLToPSQL(gql, vars) resSQL, err := compileGQLToPSQL(gql, vars)
@ -132,7 +132,7 @@ func singleUpdate(t *testing.T) {
} }
}` }`
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";` 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"."user_id") = {{user_id}}) 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{ vars := map[string]json.RawMessage{
"update": json.RawMessage(` { "name": "my_name", "woo": { "hoo": "goo" }, "description": "my_desc" }`), "update": json.RawMessage(` { "name": "my_name", "woo": { "hoo": "goo" }, "description": "my_desc" }`),

30
psql/select_test.go
View File

@ -25,17 +25,27 @@ func TestMain(m *testing.M) {
DefaultFilter: []string{ DefaultFilter: []string{
`{ user_id: { _eq: $user_id } }`, `{ user_id: { _eq: $user_id } }`,
}, },
FilterMap: map[string][]string{ FilterMap: qcode.Filters{
"users": []string{ All: map[string][]string{
"{ id: { eq: $user_id } }", "users": []string{
"{ id: { eq: $user_id } }",
},
"products": []string{
"{ price: { gt: 0 } }",
"{ price: { lt: 8 } }",
},
"customers": []string{},
"mes": []string{
"{ id: { eq: $user_id } }",
},
}, },
"products": []string{ Query: map[string][]string{
"{ price: { gt: 0 } }", "users": []string{},
"{ price: { lt: 8 } }",
}, },
"customers": []string{}, Update: map[string][]string{
"mes": []string{ "products": []string{
"{ id: { eq: $user_id } }", "{ user_id: { eq: $user_id } }",
},
}, },
}, },
Blocklist: []string{ Blocklist: []string{
@ -306,7 +316,7 @@ func oneToMany(t *testing.T) {
} }
}` }`
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";` 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" 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) resSQL, err := compileGQLToPSQL(gql, nil)
if err != nil { if err != nil {

137
qcode/qcode.go
View File

@ -145,16 +145,30 @@ const (
OrderDescNullsLast OrderDescNullsLast
) )
type Filters struct {
All map[string][]string
Query map[string][]string
Insert map[string][]string
Update map[string][]string
Delete map[string][]string
}
type Config struct { type Config struct {
DefaultFilter []string DefaultFilter []string
FilterMap map[string][]string FilterMap Filters
Blocklist []string Blocklist []string
KeepArgs bool KeepArgs bool
} }
type Compiler struct { type Compiler struct {
fl *Exp df *Exp
fm map[string]*Exp fm struct {
all map[string]*Exp
query map[string]*Exp
insert map[string]*Exp
update map[string]*Exp
delete map[string]*Exp
}
bl map[string]struct{} bl map[string]struct{}
ka bool ka bool
} }
@ -169,20 +183,59 @@ var expPool = sync.Pool{
} }
func NewCompiler(c Config) (*Compiler, error) { func NewCompiler(c Config) (*Compiler, error) {
bl := make(map[string]struct{}, len(c.Blocklist)) var err error
co := &Compiler{ka: c.KeepArgs}
co.bl = make(map[string]struct{}, len(c.Blocklist))
for i := range c.Blocklist { for i := range c.Blocklist {
bl[c.Blocklist[i]] = struct{}{} co.bl[c.Blocklist[i]] = struct{}{}
} }
fl, err := compileFilter(c.DefaultFilter) co.df, err = compileFilter(c.DefaultFilter)
if err != nil { if err != nil {
return nil, err return nil, err
} }
fm := make(map[string]*Exp, len(c.FilterMap)) co.fm.all, err = buildFilters(c.FilterMap.All)
if err != nil {
return nil, err
}
for k, v := range c.FilterMap { co.fm.query, err = buildFilters(c.FilterMap.Query)
if err != nil {
return nil, err
}
co.fm.insert, err = buildFilters(c.FilterMap.Insert)
if err != nil {
return nil, err
}
co.fm.update, err = buildFilters(c.FilterMap.Update)
if err != nil {
return nil, err
}
co.fm.delete, err = buildFilters(c.FilterMap.Delete)
if err != nil {
return nil, err
}
seedExp := [100]Exp{}
for i := range seedExp {
seedExp[i].doFree = true
expPool.Put(&seedExp[i])
}
return co, nil
}
func buildFilters(filMap map[string][]string) (map[string]*Exp, error) {
fm := make(map[string]*Exp, len(filMap))
for k, v := range filMap {
fil, err := compileFilter(v) fil, err := compileFilter(v)
if err != nil { if err != nil {
return nil, err return nil, err
@ -194,13 +247,7 @@ func NewCompiler(c Config) (*Compiler, error) {
fm[plural] = fil fm[plural] = fil
} }
seedExp := [100]Exp{} return fm, nil
for i := range seedExp {
seedExp[i].doFree = true
expPool.Put(&seedExp[i])
}
return &Compiler{fl, fm, bl, c.KeepArgs}, nil
} }
func (com *Compiler) Compile(query []byte) (*QCode, error) { func (com *Compiler) Compile(query []byte) (*QCode, error) {
@ -308,34 +355,52 @@ func (com *Compiler) compileQuery(op *Operation) ([]Select, error) {
id++ id++
} }
var ok bool if id == 0 {
return nil, errors.New("invalid query")
}
var fil *Exp var fil *Exp
if id > 0 { root := &selects[0]
root := &selects[0]
fil, ok = com.fm[root.Table]
if !ok || fil == nil { switch op.Type {
fil = com.fl case opQuery:
fil, _ = com.fm.query[root.Table]
case opMutate:
switch root.Action {
case ActionInsert:
fil, _ = com.fm.insert[root.Table]
case ActionUpdate:
fil, _ = com.fm.update[root.Table]
case ActionDelete:
fil, _ = com.fm.delete[root.Table]
case ActionUpsert:
fil, _ = com.fm.insert[root.Table]
} }
}
if fil != nil && fil.Op != OpNop { if fil == nil {
if root.Where != nil { fil, _ = com.fm.all[root.Table]
ow := root.Where }
root.Where = expPool.Get().(*Exp) if fil == nil {
root.Where.Reset() fil = com.df
root.Where.Op = OpAnd }
root.Where.Children = root.Where.childrenA[:2]
root.Where.Children[0] = fil if fil != nil && fil.Op != OpNop {
root.Where.Children[1] = ow if root.Where != nil {
} else { ow := root.Where
root.Where = fil
} root.Where = expPool.Get().(*Exp)
root.Where.Reset()
root.Where.Op = OpAnd
root.Where.Children = root.Where.childrenA[:2]
root.Where.Children[0] = fil
root.Where.Children[1] = ow
} else {
root.Where = fil
} }
} else {
return nil, errors.New("invalid query")
} }
return selects[:id], nil return selects[:id], nil

45
serv/cmd.go
View File

@ -124,6 +124,13 @@ e.g. db:migrate -+1
Run: cmdNew, Run: cmdNew,
}) })
rootCmd.AddCommand(&cobra.Command{
Use: fmt.Sprintf("conf:dump [%s]", strings.Join(viper.SupportedExts, "|")),
Short: "Dump config to file",
Long: "Dump current config to a file in the selected format",
Run: cmdConfDump,
})
rootCmd.Flags().StringVar(&confPath, rootCmd.Flags().StringVar(&confPath,
"path", "./config", "path to config files") "path", "./config", "path to config files")
@ -144,35 +151,7 @@ func initLog() *zerolog.Logger {
} }
func initConf() (*config, error) { func initConf() (*config, error) {
vi := viper.New() vi := newConfig()
vi.SetEnvPrefix("SG")
vi.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
vi.AutomaticEnv()
vi.AddConfigPath(confPath)
vi.AddConfigPath("./config")
vi.SetConfigName(getConfigName())
vi.SetDefault("host_port", "0.0.0.0:8080")
vi.SetDefault("web_ui", false)
vi.SetDefault("enable_tracing", false)
vi.SetDefault("auth_fail_block", "always")
vi.SetDefault("seed_file", "seed.js")
vi.SetDefault("database.type", "postgres")
vi.SetDefault("database.host", "localhost")
vi.SetDefault("database.port", 5432)
vi.SetDefault("database.user", "postgres")
vi.SetDefault("database.schema", "public")
vi.SetDefault("env", "development")
vi.BindEnv("env", "GO_ENV")
vi.BindEnv("HOST", "HOST")
vi.BindEnv("PORT", "PORT")
vi.SetDefault("auth.rails.max_idle", 80)
vi.SetDefault("auth.rails.max_active", 12000)
if err := vi.ReadInConfig(); err != nil { if err := vi.ReadInConfig(); err != nil {
return nil, err return nil, err
@ -184,12 +163,16 @@ func initConf() (*config, error) {
return nil, fmt.Errorf("unable to decode config, %v", err) return nil, fmt.Errorf("unable to decode config, %v", err)
} }
if len(c.Tables) == 0 {
c.Tables = c.DB.Tables
}
for k, v := range c.Inflections { for k, v := range c.Inflections {
flect.AddPlural(k, v) flect.AddPlural(k, v)
} }
for i := range c.DB.Tables { for i := range c.Tables {
t := c.DB.Tables[i] t := c.Tables[i]
t.Name = flect.Pluralize(strings.ToLower(t.Name)) t.Name = flect.Pluralize(strings.ToLower(t.Name))
} }

29
serv/cmd_conf.go Normal file
View File

@ -0,0 +1,29 @@
package serv
import (
"fmt"
"os"
"github.com/spf13/cobra"
)
func cmdConfDump(cmd *cobra.Command, args []string) {
if len(args) != 1 {
cmd.Help()
os.Exit(1)
}
fname := fmt.Sprintf("%s.%s", getConfigName(), args[0])
vi := newConfig()
if err := vi.ReadInConfig(); err != nil {
logger.Fatal().Err(err).Send()
}
if err := vi.WriteConfigAs(fname); err != nil {
logger.Fatal().Err(err).Send()
}
logger.Info().Msgf("config dumped to ./%s", fname)
}

1
serv/cmd_migrate.go
View File

@ -245,6 +245,7 @@ func cmdDBMigrate(cmd *cobra.Command, args []string) {
// } // }
// os.Exit(1) // os.Exit(1)
} }
logger.Info().Msg("migration done") logger.Info().Msg("migration done")
} }

1
serv/cmd_new.go
View File

@ -141,5 +141,6 @@ func ifNotExists(filePath string, doFn func(string) error) {
if err != nil { if err != nil {
logger.Fatal().Err(err).Msgf("unable to create '%s'", filePath) logger.Fatal().Err(err).Msgf("unable to create '%s'", filePath)
} }
logger.Info().Msgf("created '%s'", filePath) logger.Info().Msgf("created '%s'", filePath)
} }

2
serv/cmd_seed.go
View File

@ -52,6 +52,8 @@ func cmdDBSeed(cmd *cobra.Command, args []string) {
if err != nil { if err != nil {
logger.Fatal().Err(err).Msg("failed to execute script") logger.Fatal().Err(err).Msg("failed to execute script")
} }
logger.Info().Msg("seed script done")
} }
//func runFunc(call goja.FunctionCall) { //func runFunc(call goja.FunctionCall) {

83
serv/config.go
View File

@ -3,7 +3,7 @@ package serv
import ( import (
"strings" "strings"
"github.com/gobuffalo/flect" "github.com/spf13/viper"
) )
type config struct { type config struct {
@ -69,14 +69,20 @@ type config struct {
Tables []configTable Tables []configTable
} `mapstructure:"database"` } `mapstructure:"database"`
Tables []configTable
} }
type configTable struct { type configTable struct {
Name string Name string
Filter []string Filter []string
Table string FilterQuery []string `mapstructure:"filter_query"`
Blocklist []string FilterInsert []string `mapstructure:"filter_insert"`
Remotes []configRemote FilterUpdate []string `mapstructure:"filter_update"`
FilterDelete []string `mapstructure:"filter_delete"`
Table string
Blocklist []string
Remotes []configRemote
} }
type configRemote struct { type configRemote struct {
@ -92,6 +98,40 @@ type configRemote struct {
} `mapstructure:"set_headers"` } `mapstructure:"set_headers"`
} }
func newConfig() *viper.Viper {
vi := viper.New()
vi.SetEnvPrefix("SG")
vi.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
vi.AutomaticEnv()
vi.AddConfigPath(confPath)
vi.AddConfigPath("./config")
vi.SetConfigName(getConfigName())
vi.SetDefault("host_port", "0.0.0.0:8080")
vi.SetDefault("web_ui", false)
vi.SetDefault("enable_tracing", false)
vi.SetDefault("auth_fail_block", "always")
vi.SetDefault("seed_file", "seed.js")
vi.SetDefault("database.type", "postgres")
vi.SetDefault("database.host", "localhost")
vi.SetDefault("database.port", 5432)
vi.SetDefault("database.user", "postgres")
vi.SetDefault("database.schema", "public")
vi.SetDefault("env", "development")
vi.BindEnv("env", "GO_ENV")
vi.BindEnv("HOST", "HOST")
vi.BindEnv("PORT", "PORT")
vi.SetDefault("auth.rails.max_idle", 80)
vi.SetDefault("auth.rails.max_active", 12000)
return vi
}
func (c *config) getVariables() map[string]string { func (c *config) getVariables() map[string]string {
vars := make(map[string]string, len(c.DB.vars)) vars := make(map[string]string, len(c.DB.vars))
@ -113,10 +153,10 @@ func (c *config) getVariables() map[string]string {
} }
func (c *config) getAliasMap() map[string][]string { func (c *config) getAliasMap() map[string][]string {
m := make(map[string][]string, len(c.DB.Tables)) m := make(map[string][]string, len(c.Tables))
for i := range c.DB.Tables { for i := range c.Tables {
t := c.DB.Tables[i] t := c.Tables[i]
if len(t.Table) == 0 { if len(t.Table) == 0 {
continue continue
@ -127,28 +167,3 @@ func (c *config) getAliasMap() map[string][]string {
} }
return m return m
} }
func (c *config) getFilterMap() map[string][]string {
m := make(map[string][]string, len(c.DB.Tables))
for i := range c.DB.Tables {
t := c.DB.Tables[i]
if len(t.Filter) == 0 {
continue
}
singular := flect.Singularize(t.Name)
plural := flect.Pluralize(t.Name)
if t.Filter[0] == "none" {
m[singular] = []string{}
m[plural] = []string{}
} else {
m[singular] = t.Filter
m[plural] = t.Filter
}
}
return m
}

2
serv/reso.go
View File

@ -25,7 +25,7 @@ type resolvFn struct {
func initResolvers() error { func initResolvers() error {
rmap = make(map[uint64]*resolvFn) rmap = make(map[uint64]*resolvFn)
for _, t := range conf.DB.Tables { for _, t := range conf.Tables {
err := initRemotes(t) err := initRemotes(t)
if err != nil { if err != nil {
return err return err

44
serv/serv.go
View File

@ -12,6 +12,7 @@ import (
rice "github.com/GeertJohan/go.rice" rice "github.com/GeertJohan/go.rice"
"github.com/dosco/super-graph/psql" "github.com/dosco/super-graph/psql"
"github.com/dosco/super-graph/qcode" "github.com/dosco/super-graph/qcode"
"github.com/gobuffalo/flect"
) )
func initCompilers(c *config) (*qcode.Compiler, *psql.Compiler, error) { func initCompilers(c *config) (*qcode.Compiler, *psql.Compiler, error) {
@ -20,13 +21,46 @@ func initCompilers(c *config) (*qcode.Compiler, *psql.Compiler, error) {
return nil, nil, err return nil, nil, err
} }
qc, err := qcode.NewCompiler(qcode.Config{ conf := qcode.Config{
DefaultFilter: c.DB.Defaults.Filter, DefaultFilter: c.DB.Defaults.Filter,
FilterMap: c.getFilterMap(), FilterMap: qcode.Filters{
Blocklist: c.DB.Defaults.Blocklist, All: make(map[string][]string, len(c.Tables)),
KeepArgs: false, Query: make(map[string][]string, len(c.Tables)),
}) Insert: make(map[string][]string, len(c.Tables)),
Update: make(map[string][]string, len(c.Tables)),
Delete: make(map[string][]string, len(c.Tables)),
},
Blocklist: c.DB.Defaults.Blocklist,
KeepArgs: false,
}
for i := range c.Tables {
t := c.Tables[i]
singular := flect.Singularize(t.Name)
plural := flect.Pluralize(t.Name)
setFilter := func(fm map[string][]string, fil []string) {
switch {
case len(fil) == 0:
return
case fil[0] == "none" || len(fil[0]) == 0:
fm[singular] = []string{}
fm[plural] = []string{}
default:
fm[singular] = t.Filter
fm[plural] = t.Filter
}
}
setFilter(conf.FilterMap.All, t.Filter)
setFilter(conf.FilterMap.Query, t.FilterQuery)
setFilter(conf.FilterMap.Insert, t.FilterInsert)
setFilter(conf.FilterMap.Update, t.FilterUpdate)
setFilter(conf.FilterMap.Delete, t.FilterDelete)
}
qc, err := qcode.NewCompiler(conf)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }

3
tmpl/dev.yml
View File

@ -115,6 +115,9 @@ database:
- name: users - name: users
# This filter will overwrite defaults.filter # This filter will overwrite defaults.filter
# filter: ["{ id: { eq: $user_id } }"] # 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 # - name: products
# # Multiple filters are AND'd together # # Multiple filters are AND'd together

5
tmpl/prod.yml
View File

@ -108,7 +108,10 @@ database:
tables: tables:
- name: users - name: users
# This filter will overwrite defaults.filter # This filter will overwrite defaults.filter
filter: ["{ id: { eq: $user_id } }"] # 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 - name: products
# Multiple filters are AND'd together # Multiple filters are AND'd together