Merge pull request #356 from erizocosmico/feature/readonly

cmd/gitbase: add readonly flag

Author: erizocosmico

Gopkg.lock

@@ -1,6 +1,10 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
+<<<<<<< HEAD
   revision = "dcc1c537eb7e2bc20ce69d03732e8aa8feaa8612"
+=======
+  revision = "4785fe821326846e344bb2a77c8bcc34d717096e"
+>>>>>>> vendor: upgrade go-mysql-server
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"

Gopkg.toml

@@ -18,6 +18,7 @@ import (
 	"github.com/uber/jaeger-client-go/config"
 	sqle "gopkg.in/src-d/go-mysql-server.v0"
 	"gopkg.in/src-d/go-mysql-server.v0/server"
+	"gopkg.in/src-d/go-mysql-server.v0/sql"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/analyzer"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/index/pilosa"
 	"gopkg.in/src-d/go-vitess.v0/mysql"
@@ -45,7 +46,7 @@ type Server struct {
 	IndexDir      string   `short:"i" long:"index" default:"/var/lib/gitbase/index" description:"Directory where the gitbase indexes information will be persisted." env:"GITBASE_INDEX_DIR"`
 	DisableSquash bool     `long:"no-squash" description:"Disables the table squashing."`
 	TraceEnabled  bool     `long:"trace" env:"GITBASE_TRACE" description:"Enables jaeger tracing"`
-
+	ReadOnly      bool     `short:"r" long:"readonly" description:"Only allow read queries. This disables creating and deleting indexes as well." env:"GITBASE_READONLY"`
 	// SkipGitErrors disables failing when Git errors are found.
 	SkipGitErrors bool
 
@@ -143,7 +144,13 @@ func (c *Server) Execute(args []string) error {
 
 func (c *Server) buildDatabase() error {
 	if c.engine == nil {
-		c.engine = sqle.NewDefault()
+		catalog := sql.NewCatalog()
+		ab := analyzer.NewBuilder(catalog)
+		if c.ReadOnly {
+			ab = ab.ReadOnly()
+		}
+		a := ab.Build()
+		c.engine = sqle.New(catalog, a)
 	}
 
 	c.pool = gitbase.NewRepositoryPool()

cmd/gitbase/command/server.go

@@ -14,4 +14,8 @@ To make some common tasks easier for the user, there are some functions to inter
 
 ## Standard functions
 
+<<<<<<< HEAD
 You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/dcc1c537eb7e2bc20ce69d03732e8aa8feaa8612#custom-functions).
+=======
+You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/4785fe821326846e344bb2a77c8bcc34d717096e#custom-functions).
+>>>>>>> vendor: upgrade go-mysql-server