Skip to content

Commit f78aae4

Browse files
authored
Merge branch 'master' into fix/squash-unsquashable
2 parents c2a57b7 + e7bdc6e commit f78aae4

File tree

11 files changed

+48
-17
lines changed

11 files changed

+48
-17
lines changed

Gopkg.lock

Lines changed: 2 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 = "1fa8e98aab8f06ae1569c4d381ccc9d3051f761a"
3+
revision = "9d10e7afd56a6a48477314a49079778ec2372d7e"
44

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

docs/using-gitbase/functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ BigEndianInt32(len(marhsal(node))+marshal(node)+
3232

3333
## Standard functions
3434

35-
You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/1fa8e98aab8f06ae1569c4d381ccc9d3051f761a#custom-functions).
35+
You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/9d10e7afd56a6a48477314a49079778ec2372d7e#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/1fa8e98aab8f06ae1569c4d381ccc9d3051f761a#indexes) documentation for more details
13+
See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/9d10e7afd56a6a48477314a49079778ec2372d7e#indexes) documentation for more details
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/1fa8e98aab8f06ae1569c4d381ccc9d3051f761a/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/9d10e7afd56a6a48477314a49079778ec2372d7e/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).

filters_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func TestSelectors(t *testing.T) {
223223
require.True(selectors.isValid("d"))
224224
vals, err := selectors.textValues("d")
225225
require.NoError(err)
226-
require.Equal(([]string)(nil), vals)
226+
require.Equal([]string(nil), vals)
227227

228228
require.True(selectors.isValid("b"))
229229
vals, err = selectors.textValues("b")
@@ -238,7 +238,7 @@ func TestSelectors(t *testing.T) {
238238
require.False(selectors.isValid("c"))
239239
vals, err = selectors.textValues("c")
240240
require.NoError(err)
241-
require.Equal(([]string)(nil), vals)
241+
require.Equal([]string(nil), vals)
242242
}
243243

244244
func TestClassifyFilters(t *testing.T) {

internal/rule/squashjoins.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func buildSquashedTable(
230230
indexes map[string]sql.IndexLookup,
231231
) (sql.Node, error) {
232232
tableNames := orderedTableNames(tables)
233-
allFilters := filters[:]
233+
allFilters := filters
234234

235235
firstTable := tableNames[0]
236236
var index sql.IndexLookup
@@ -1304,7 +1304,7 @@ func removeRedundantCompoundFilters(
13041304
// isRedundantFilter tells whether the given filter is redundant for joining
13051305
// t1 with t2. t1 MUST be higher in the table hierarchy than t2.
13061306
func isRedundantFilter(f sql.Expression, t1, t2 string) bool {
1307-
switch true {
1307+
switch {
13081308
case t1 == gitbase.RepositoriesTableName && t2 == gitbase.RemotesTableName:
13091309
return isEq(
13101310
isCol(gitbase.RepositoriesTableName, "repository_id"),

vendor/gopkg.in/src-d/go-mysql-server.v0/README.md

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

vendor/gopkg.in/src-d/go-mysql-server.v0/sql/analyzer/resolve_columns.go

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

vendor/gopkg.in/src-d/go-mysql-server.v0/sql/analyzer/resolve_columns_test.go

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

0 commit comments

Comments
 (0)