Integration tests and docs fixes.

Signed-off-by: Juanjo Alvarez <[email protected]>

Author: Juanjo Alvarez

CHANGELOG.md

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Added BLAME function.
+
 ## [0.24.0-rc2] - 2019-10-02
 
 ## Fixed
@@ -263,7 +265,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - COUNT expression now returns an int64 number instead of int32 https://github.com/src-d/go-mysql-server/issues/642
 - Dockerfile: include zero-config MySQL client https://github.com/src-d/gitbase/pull/737
 - uast_extract function now returns a JSON for `pos` instead of a custom format https://github.com/src-d/gitbase/pull/715
-- Added BLAME function.
 
 #### Documentation
 - docs: expand optimization guide on early filtering (#837)

Gopkg.toml

@@ -8,7 +8,6 @@ To make some common tasks easier for the user, there are some functions to inter
 |:-------------|:-------------------------------------------------------------------------------------------------------------------------------|
 |`commit_stats(repository_id, [from_commit_hash], to_commit_hash) json`|returns the stats between two commits for a repository. If `from_commit_hash` is empty, it will compare the given `to_commit_hash` with its parent commit. Vendored files stats are not included in the result of this function. This function is more thoroughly explained later in this document.|
 |`commit_file_stats(repository_id, [from_commit_hash], to_commit_hash) json array`|returns an array with the stats of each file in `to_commit_hash` since the given `from_commit_hash`. If `from_commit_hash` is not given, the parent commit will be used. Vendored files stats are not included in the result of this function. This function is more thoroughly explained later in this document.|
-|`is_remote(reference_name)bool`| checks if the given reference name is from a remote one.                                                          |
 |`is_tag(reference_name)bool`| checks if the given reference name is a tag.                                                                         |
 |`is_vendor(file_path)bool`| checks if the given file name is a vendored file.                                                                         |
 |`language(path, [blob])text`| gets the language of a file given its path and the optional content of the file.                                    |
@@ -19,16 +18,15 @@ To make some common tasks easier for the user, there are some functions to inter
 |`uast_children(blob) blob`| returns a flattened array of the children UAST nodes from each one of the UAST nodes in the given array.              |
 |`loc(path, blob) json`| returns a JSON map, containing the lines of code of a file, separated in three categories: Code, Blank and Comment lines. |
 |`version() text`| returns the gitbase version in the following format `8.0.11-{GITBASE_VERSION}` for compatibility with MySQL versioning. |
-||||||| merged common ancestors
-|`is_remote(reference_name)bool`| check if the given reference name is from a remote one                                                          |
-|`is_tag(reference_name)bool`| check if the given reference name is a tag                                                                         |
-|`language(path, [blob])text`| gets the language of a file given its path and the optional content of the file                                    |
-|`uast(blob, [lang, [xpath]]) blob`| returns a node array of UAST nodes in semantic mode                                                          |
-|`uast_mode(mode, blob, lang) blob`| returns a node array of UAST nodes specifying its language and mode (semantic, annotated or native)          |
-|`uast_xpath(blob, xpath) blob`| performs an XPath query over the given UAST nodes                                                                |
-|`uast_extract(blob, key) text array`| extracts information identified by the given key from the uast nodes                                       |
-|`uast_children(blob) blob`| returns a flattened array of the children UAST nodes from each one of the UAST nodes in the given array              |
-|`loc(path, blob) json`| returns a JSON map, containing the lines of code of a file, separated in three categories: Code, Blank and Comment lines |
+|`is_remote(reference_name)bool`| checks if the given reference name is from a remote one.                                                         |
+|`is_tag(reference_name)bool`| check if the given reference name is a tag.                                                                         |
+|`language(path, [blob])text`| gets the language of a file given its path and the optional content of the file.                                    |
+|`uast(blob, [lang, [xpath]]) blob`| returns a node array of UAST nodes in semantic mode.                                                          |
+|`uast_mode(mode, blob, lang) blob`| returns a node array of UAST nodes specifying its language and mode (semantic, annotated or native).          |
+|`uast_xpath(blob, xpath) blob`| performs an XPath query over the given UAST nodes.                                                                |
+|`uast_extract(blob, key) text array`| extracts information identified by the given key from the uast nodes.                                       |
+|`uast_children(blob) blob`| returns a flattened array of the children UAST nodes from each one of the UAST nodes in the given array.              |
+|`loc(path, blob) json`| returns a JSON map, containing the lines of code of a file, separated in three categories: Code, Blank and Comment lines. |
 
 ## Standard functions
 
@@ -39,7 +37,7 @@ These are all functions that are available because they are implemented in `go-m
 |:-------------|:-------------------------------------------------------------------------------------------------------------------------------|
 |`ARRAY_LENGTH(json)`|if the json representation is an array, this function returns its size.|
 |`AVG(expr)`| returns the average value of expr in all rows.|
-|`BLAME(expr)`|Returns a list, as a json array, of lines changes and authorship.|
+|`BLAME(repository, commit)`|Returns an array, of lines changes and authorship.|
 |`CEIL(number)`| returns the smallest integer value that is greater than or equal to `number`.|
 |`CEILING(number)`| returns the smallest integer value that is greater than or equal to `number`.|
 |`CHAR_LENGTH(str)`| returns the length of the string in characters.|

docs/using-gitbase/functions.md

@@ -8,9 +8,10 @@ require (
 	github.com/gliderlabs/ssh v0.2.0 // indirect
 	github.com/go-kit/kit v0.8.0
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/hashicorp/golang-lru v0.5.3
+	github.com/gorilla/handlers v1.4.0 // indirect
 	github.com/hhatto/gocloc v0.3.0
 	github.com/jessevdk/go-flags v1.4.0
+	github.com/miekg/dns v1.1.1 // indirect
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/prometheus/client_golang v1.0.0
 	github.com/sirupsen/logrus v1.4.2
@@ -22,6 +23,7 @@ require (
 	github.com/stretchr/testify v1.3.0
 	github.com/uber-go/atomic v1.4.0 // indirect
 	github.com/uber/jaeger-client-go v2.16.0+incompatible
+	github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
 	go.uber.org/atomic v1.4.0 // indirect
 	golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b // indirect
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
@@ -32,7 +34,6 @@ require (
 	gopkg.in/src-d/go-errors.v1 v1.0.0
 	gopkg.in/src-d/go-git-fixtures.v3 v3.5.0
 	gopkg.in/src-d/go-git.v4 v4.12.0
-	gopkg.in/src-d/go-mysql-server.v0 v0.5.1
 	gopkg.in/yaml.v2 v2.2.2
 	vitess.io/vitess v3.0.0-rc.3.0.20190602171040-12bfde34629c+incompatible
 )