Skip to content

Commit db673f7

Browse files
authored
Merge branch 'master' into master
2 parents 2c12297 + 0bb306c commit db673f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+5266
-238
lines changed

Gopkg.lock

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[[constraint]]
22
name = "gopkg.in/src-d/go-mysql-server.v0"
3-
revision = "v0.1.0"
3+
revision = "b1203b4cd0f4734da7552435f10b65a311226a35"
44

55
[[constraint]]
66
name = "github.com/jessevdk/go-flags"

docs/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
* [Configuration](using-gitbase/configuration.md)
99
* [Schema](using-gitbase/schema.md)
1010
* [Supported syntax](using-gitbase/supported-syntax.md)
11+
* [Supported clients](using-gitbase/supported-clients.md)
1112
* [Functions](using-gitbase/functions.md)
1213
* [Indexes](using-gitbase/indexes.md)
1314
* [Examples](using-gitbase/examples.md)
14-
* [Optimizing queries](using-gitbase/optimize-queries.md)
15+
* [Optimizing queries](using-gitbase/optimize-queries.md)

docs/using-gitbase/functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ Also, if you want to retrieve values from a non common property, you can pass it
133133
134134
## Standard functions
135135

136-
You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/v0.1.0#custom-functions).
136+
You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/b1203b4cd0f4734da7552435f10b65a311226a35#custom-functions).

docs/using-gitbase/indexes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Note that you can create an index either **on one or more columns** or **on a si
1010

1111
You can find some more examples in the [examples](./examples.md#create-an-index-for-columns-on-a-table) section.
1212

13-
See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/v0.1.0#indexes) documentation for more details
13+
See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/b1203b4cd0f4734da7552435f10b65a311226a35#indexes) documentation for more details
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Supported clients
2+
3+
To see the supported MySQL clients and examples about how tho use them, take a look [here](https://github.com/src-d/go-mysql-server/blob/b1203b4cd0f4734da7552435f10b65a311226a35/SUPPORTED_CLIENTS.md).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
## Supported syntax
22

3-
To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/v0.1.0/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).
3+
To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/b1203b4cd0f4734da7552435f10b65a311226a35/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).

integration_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ func TestIntegration(t *testing.T) {
268268
AddPostAnalyzeRule(rule.SquashJoinsRule, rule.SquashJoins).
269269
Build()
270270

271-
a.CurrentDatabase = engine.Analyzer.CurrentDatabase
272271
engine.Analyzer = a
273272
t.Run("with squash", runTests)
274273
}
@@ -862,13 +861,12 @@ func setup(t testing.TB) (*sqle.Engine, *gitbase.RepositoryPool, func()) {
862861

863862
func newSquashEngine() *sqle.Engine {
864863
engine := newBaseEngine()
865-
dbname := engine.Analyzer.CurrentDatabase
866864

867865
engine.Catalog.RegisterFunctions(sqlfunction.Defaults)
868866
engine.Analyzer = analyzer.NewBuilder(engine.Catalog).
869867
AddPostAnalyzeRule(rule.SquashJoinsRule, rule.SquashJoins).
870868
Build()
871-
engine.Analyzer.CurrentDatabase = dbname
869+
872870
return engine
873871
}
874872

internal/rule/squashjoins_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ func TestAnalyzeSquashJoinsExchange(t *testing.T) {
2424
AddPostAnalyzeRule(SquashJoinsRule, SquashJoins).
2525
Build()
2626
a.Batches[len(a.Batches)-1].Rules = a.Batches[len(a.Batches)-1].Rules[1:]
27-
a.CurrentDatabase = "foo"
2827
ctx := sql.NewEmptyContext()
2928

3029
node, err := parse.Parse(ctx, `SELECT * FROM ref_commits NATURAL JOIN commits`)
@@ -57,7 +56,6 @@ func TestAnalyzeSquashNaturalJoins(t *testing.T) {
5756
AddPostAnalyzeRule(SquashJoinsRule, SquashJoins).
5857
Build()
5958
a.Batches[len(a.Batches)-1].Rules = a.Batches[len(a.Batches)-1].Rules[1:]
60-
a.CurrentDatabase = "foo"
6159
ctx := sql.NewEmptyContext()
6260

6361
node, err := parse.Parse(ctx, `SELECT * FROM refs

vendor/github.com/oliveagle/jsonpath/.gitignore

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/oliveagle/jsonpath/.travis.yml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/oliveagle/jsonpath/LICENSE

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)