Move sql query logging from info to debug

docs/guide.md

@@ -1358,7 +1358,7 @@ roles:
             - updated_at: "now"
 
         delete:
-          deny: true
+          block: true
 
   - name: admin
     match: id = 1000

serv/cmd.go

@@ -110,6 +110,13 @@ e.g. db:migrate -+1
 		Run:   cmdDBSetup,
 	})
 
+	rootCmd.AddCommand(&cobra.Command{
+		Use:   "db:reset",
+		Short: "Reset database",
+		Long:  "This command will drop, create, migrate and seed the database (won't run in production)",
+		Run:   cmdDBReset,
+	})
+
 	rootCmd.AddCommand(&cobra.Command{
 		Use:   "new APP-NAME",
 		Short: "Create a new application",
@@ -276,3 +283,13 @@ func initCompiler() {
 		logger.Fatal().Err(err).Msg("failed to initialized resolvers")
 	}
 }
+
+func initConfOnce() {
+	var err error
+
+	if conf == nil {
+		if conf, err = initConf(); err != nil {
+			logger.Fatal().Err(err).Msg("failed to read config")
+		}
+	}
+}

serv/cmd_migrate.go

@@ -36,6 +36,7 @@ var newMigrationText = `-- Write your migrate up statements here
 `
 
 func cmdDBSetup(cmd *cobra.Command, args []string) {
+	initConfOnce()
 	cmdDBCreate(cmd, []string{})
 	cmdDBMigrate(cmd, []string{"up"})
 
@@ -54,13 +55,19 @@ func cmdDBSetup(cmd *cobra.Command, args []string) {
 	logger.Warn().Msgf("failed to read seed file '%s'", sfile)
 }
 
-func cmdDBCreate(cmd *cobra.Command, args []string) {
+func cmdDBReset(cmd *cobra.Command, args []string) {
-	var err error
+	initConfOnce()
 
-	if conf, err = initConf(); err != nil {
+	if conf.Production {
-		logger.Fatal().Err(err).Msg("failed to read config")
+		logger.Fatal().Msg("db:reset does not work in production")
+		return
 	}
+	cmdDBDrop(cmd, []string{})
+	cmdDBSetup(cmd, []string{})
+}
 
+func cmdDBCreate(cmd *cobra.Command, args []string) {
+	initConfOnce()
 	ctx := context.Background()
 
 	conn, err := initDB(conf, false)
@@ -80,12 +87,7 @@ func cmdDBCreate(cmd *cobra.Command, args []string) {
 }
 
 func cmdDBDrop(cmd *cobra.Command, args []string) {
-	var err error
+	initConfOnce()
-
-	if conf, err = initConf(); err != nil {
-		logger.Fatal().Err(err).Msg("failed to read config")
-	}
-
 	ctx := context.Background()
 
 	conn, err := initDB(conf, false)
@@ -110,12 +112,7 @@ func cmdDBNew(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 
-	var err error
+	initConfOnce()
-
-	if conf, err = initConf(); err != nil {
-		logger.Fatal().Err(err).Msg("failed to read config")
-	}
-
 	name := args[0]
 
 	m, err := migrate.FindMigrations(conf.MigrationsPath)
@@ -144,19 +141,14 @@ func cmdDBNew(cmd *cobra.Command, args []string) {
 }
 
 func cmdDBMigrate(cmd *cobra.Command, args []string) {
-	var err error
-
 	if len(args) == 0 {
 		cmd.Help()
 		os.Exit(1)
 	}
 
+	initConfOnce()
 	dest := args[0]
 
-	if conf, err = initConf(); err != nil {
-		logger.Fatal().Err(err).Msg("failed to read config")
-	}
-
 	conn, err := initDB(conf, true)
 	if err != nil {
 		logger.Fatal().Err(err).Msg("failed to connect to database")
@@ -251,11 +243,7 @@ func cmdDBMigrate(cmd *cobra.Command, args []string) {
 }
 
 func cmdDBStatus(cmd *cobra.Command, args []string) {
-	var err error
+	initConfOnce()
-
-	if conf, err = initConf(); err != nil {
-		logger.Fatal().Err(err).Msg("failed to read config")
-	}
 
 	conn, err := initDB(conf, true)
 	if err != nil {

serv/cmd_seed.go

@@ -62,7 +62,7 @@ func cmdDBSeed(cmd *cobra.Command, args []string) {
 func graphQLFunc(query string, data interface{}, opt map[string]string) map[string]interface{} {
 	b, err := json.Marshal(data)
 	if err != nil {
-		logger.Fatal().Err(err).Msg("failed to json serialize")
+		logger.Fatal().Err(err).Send()
 	}
 
 	ctx := context.Background()
@@ -94,7 +94,7 @@ func graphQLFunc(query string, data interface{}, opt map[string]string) map[stri
 	_, err = t.ExecuteFunc(buf, argMap(c))
 
 	if err == errNoUserID {
-		logger.Fatal().Msg("query requires a user_id")
+		logger.Fatal().Err(err).Msg("query requires a user_id")
 	}
 
 	if err != nil {
@@ -109,9 +109,11 @@ func graphQLFunc(query string, data interface{}, opt map[string]string) map[stri
 	}
 	defer tx.Rollback(c)
 
-	// if err := c.setLocalUserID(tx); err != nil {
+	if conf.DB.SetUserID {
-	// 	return nil, 0, err
+		if err := c.setLocalUserID(tx); err != nil {
-	// }
+			logger.Fatal().Err(err).Send()
+		}
+	}
 
 	var root []byte
 
@@ -125,14 +127,14 @@ func graphQLFunc(query string, data interface{}, opt map[string]string) map[stri
 
 	res, err := c.execRemoteJoin(st.qc, st.skipped, root)
 	if err != nil {
-		logger.Fatal().Err(err).Msg("remote join failed")
+		logger.Fatal().Err(err).Send()
 	}
 
 	val := make(map[string]interface{})
 
 	err = json.Unmarshal(res, &val)
 	if err != nil {
-		logger.Fatal().Err(err).Msg("failed to deserialize json")
+		logger.Fatal().Err(err).Send()
 	}
 
 	return val

serv/config.go

@@ -64,10 +64,9 @@ type config struct {
 		User       string
 		Password   string
 		Schema     string
-		PoolSize   int32  `mapstructure:"pool_size"`
+		PoolSize   int32 `mapstructure:"pool_size"`
-		MaxRetries int    `mapstructure:"max_retries"`
+		MaxRetries int   `mapstructure:"max_retries"`
-		LogLevel   string `mapstructure:"log_level"`
+		SetUserID  bool  `mapstructure:"set_user_id"`
-		SetUserID  bool   `mapstructure:"set_user_id"`
 
 		Vars map[string]string `mapstructure:"variables"`
 

serv/sqllog.go

@@ -28,9 +28,7 @@ func (pl *Logger) Log(ctx context.Context, level pgx.LogLevel, msg string, data
 		zlevel = zerolog.ErrorLevel
 	case pgx.LogLevelWarn:
 		zlevel = zerolog.WarnLevel
-	case pgx.LogLevelInfo:
+	case pgx.LogLevelDebug, pgx.LogLevelInfo:
-		zlevel = zerolog.InfoLevel
-	case pgx.LogLevelDebug:
 		zlevel = zerolog.DebugLevel
 	default:
 		zlevel = zerolog.DebugLevel

tmpl/dev.yml

@@ -3,7 +3,7 @@ host_port: 0.0.0.0:8080
 web_ui: true
 
 # debug, info, warn, error, fatal, panic
-log_level: "debug"
+log_level: "info"
 
 # When production mode is 'true' only queries 
 # from the allow list are permitted.
@@ -184,7 +184,7 @@ roles:
             - updated_at: "now"
 
         delete:
-          deny: true
+          block: true
 
   - name: admin
     match: id = 1000

tmpl/prod.yml

@@ -7,7 +7,7 @@ host_port: 0.0.0.0:8080
 web_ui: false
 
 # debug, info, warn, error, fatal, panic, disable
-log_level: "info"
+log_level: "warn"
 # When production mode is 'true' only queries 
 # from the allow list are permitted.
 # When it's 'false' all queries are saved to the