Add server command, delete query and version (#143)

* Add server command, delete query and version

Signed-off-by: Javi Fontan <[email protected]>

* Use net.JoinHostPort instead of fmt.Sprintf

It supports IPv6

Signed-off-by: Javi Fontan <[email protected]>

Author: jfontan

README.md

@@ -4,58 +4,36 @@
 
 ## Installation
 
-Check the [Releases](https://github.com/sqle/gitquery/releases) page to download
+Check the [Releases](https://github.com/src-d/gitquery/releases) page to download
 the gitquery binary.
 
 ## Usage
 
 ```bash
 Usage:
-  gitquery [OPTIONS] <query | shell | version>
+  gitquery [OPTIONS] <server | version>
 
 Help Options:
   -h, --help  Show this help message
 
 Available commands:
-  query    Execute a SQL query a repository.
-  shell    Start an interactive session.
+  server   Start SQL server.
   version  Show the version information.
 ```
 
-For example:
+A MySQL client is needed to connect to the server. For example:
 
 ```bash
-$ cd my_git_repo
-$ gitquery query 'SELECT hash, author_email, author_name FROM commits LIMIT 2;' 
+$ mysql -u root -h 127.0.0.1
+MySQL [(none)]> SELECT hash, author_email, author_name FROM commits LIMIT 2;
 SELECT hash, author_email, author_name FROM commits LIMIT 2;
 +------------------------------------------+---------------------+-----------------------+
-|                   HASH                   |    AUTHOR EMAIL     |      AUTHOR NAME      |
+| hash                                     | author_email        | author_name           |
 +------------------------------------------+---------------------+-----------------------+
 | 003dc36e0067b25333cb5d3a5ccc31fd028a1c83 | [email protected]       | Santiago M. Mola      |
 | 01ace9e4d144aaeb50eb630fed993375609bcf55 | [email protected]       | Antonio Navarro Perez |
 +------------------------------------------+---------------------+-----------------------+
-```
-
-You can use the interactive shell like you usually do to explore tables in postgreSQL per example:
-
-```bash
-$ gitquery shell
-
-           gitQL SHELL
-           -----------
-You must end your queries with ';'
-
-!> SELECT hash, author_email, author_name FROM commits LIMIT 2;
-
---> Executing query: SELECT hash, author_email, author_name FROM commits LIMIT 2;
-
-+------------------------------------------+---------------------+-----------------------+
-|                   HASH                   |    AUTHOR EMAIL     |      AUTHOR NAME      |
-+------------------------------------------+---------------------+-----------------------+
-| 003dc36e0067b25333cb5d3a5ccc31fd028a1c83 | [email protected]       | Santiago M. Mola      |
-| 01ace9e4d144aaeb50eb630fed993375609bcf55 | [email protected]       | Antonio Navarro Perez |
-+------------------------------------------+---------------------+-----------------------+
-!>  
+2 rows in set (0.01 sec)
 ```
 
 ## Tables
@@ -83,4 +61,4 @@ We are continuously adding more functionality to gitquery. We support a subset o
 
 ## License
 
-gitquery is licensed under the [MIT License](https://github.com/sqle/gitquery/blob/master/LICENSE).
+gitquery is licensed under the [MIT License](https://github.com/src-d/gitquery/blob/master/LICENSE).

cmd/gitquery/main.go

@@ -13,8 +13,7 @@ const (
 
 func main() {
 	parser := flags.NewNamedParser(name, flags.Default)
-	parser.AddCommand("query", "Execute a SQL query a repository.", "", &CmdQuery{})
-	parser.AddCommand("shell", "Start an interactive session.", "", &CmdShell{})
+	parser.AddCommand("server", "Start SQL server.", "", &CmdServer{})
 	parser.AddCommand("version", "Show the version information.", "", &CmdVersion{})
 
 	_, err := parser.Parse()

cmd/gitquery/query.go

@@ -0,0 +1,66 @@
+package main
+
+import (
+	"net"
+	"strconv"
+
+	"github.com/src-d/gitquery"
+	"github.com/src-d/gitquery/internal/function"
+	sqle "gopkg.in/src-d/go-mysql-server.v0"
+	"gopkg.in/src-d/go-mysql-server.v0/server"
+	"gopkg.in/src-d/go-vitess.v0/mysql"
+)
+
+// CmdServer defines server command
+type CmdServer struct {
+	cmd
+
+	Git      string `short:"g" long:"git" description:"Path where the git repositories are located, one per dir"`
+	Host     string `short:"h" long:"host" default:"localhost" description:"Host where the server is going to listen"`
+	Port     int    `short:"p" long:"port" default:"3306" description:"Port where the server is going to listen"`
+	User     string `short:"u" long:"user" default:"root" description:"User name used for connection"`
+	Password string `short:"P" long:"password" default:"" description:"Password used for connection"`
+
+	engine *sqle.Engine
+	name   string
+}
+
+func (c *CmdServer) buildDatabase() error {
+	if c.engine == nil {
+		c.engine = sqle.New()
+	}
+
+	c.print("opening %q repository...\n", c.Git)
+
+	var err error
+
+	pool := gitquery.NewRepositoryPool()
+	err = pool.AddDir(c.Git)
+	if err != nil {
+		return err
+	}
+
+	c.engine.AddDatabase(gitquery.NewDatabase(c.name, &pool))
+	function.Register(c.engine.Catalog)
+	return nil
+}
+
+// Execute starts the server
+func (c *CmdServer) Execute(args []string) error {
+	if err := c.buildDatabase(); err != nil {
+		return err
+	}
+
+	auth := mysql.NewAuthServerStatic()
+	auth.Entries[c.User] = []*mysql.AuthServerStaticEntry{
+		{Password: c.Password},
+	}
+
+	hostString := net.JoinHostPort(c.Host, strconv.Itoa(c.Port))
+	s, err := server.NewServer("tcp", hostString, auth, c.engine)
+	if err != nil {
+		return err
+	}
+
+	return s.Start()
+}