Merge pull request #654 from kuba--/fix-651/join-panic

Fix natural join panic for subqueries

Author: ajnavarro

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "12091f663c6224024dd4b3c10d2a8c1349f046d4"
+  revision = "b8d84bffc83447b4f8f283e07b4ef2b97c4b22e3"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"

Gopkg.toml

@@ -95,4 +95,4 @@ Also, if you want to retrieve values from a non common property, you can pass it
 
 ## Standard functions
 
-You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/12091f663c6224024dd4b3c10d2a8c1349f046d4#custom-functions).
+You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/b8d84bffc83447b4f8f283e07b4ef2b97c4b22e3#custom-functions).

docs/using-gitbase/functions.md

@@ -26,4 +26,4 @@ and for the second query also two indexes will be used and the result will be a
 
 You can find some more examples in the [examples](./examples.md#create-an-index-for-columns-on-a-table) section.
 
-See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/12091f663c6224024dd4b3c10d2a8c1349f046d4#indexes) documentation for more details
+See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/b8d84bffc83447b4f8f283e07b4ef2b97c4b22e3#indexes) documentation for more details

docs/using-gitbase/indexes.md

@@ -1,3 +1,3 @@
 ## Supported clients
 
-To see the supported MySQL clients and examples about how to use them, take a look [here](https://github.com/src-d/go-mysql-server/blob/12091f663c6224024dd4b3c10d2a8c1349f046d4/SUPPORTED_CLIENTS.md).
+To see the supported MySQL clients and examples about how to use them, take a look [here](https://github.com/src-d/go-mysql-server/blob/b8d84bffc83447b4f8f283e07b4ef2b97c4b22e3/SUPPORTED_CLIENTS.md).

docs/using-gitbase/supported-clients.md

@@ -1,3 +1,3 @@
 ## Supported syntax
 
-To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/12091f663c6224024dd4b3c10d2a8c1349f046d4/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).
+To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/b8d84bffc83447b4f8f283e07b4ef2b97c4b22e3/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).

docs/using-gitbase/supported-syntax.md

@@ -243,6 +243,25 @@ func TestIntegration(t *testing.T) {
 				{"go/example.go", int32(1)},
 			},
 		},
+		{
+			`
+			SELECT language, COUNT(repository_id) AS repository_count
+			FROM (
+				SELECT DISTINCT r.repository_id, LANGUAGE(t.tree_entry_name, b.blob_content) AS language
+        		FROM   refs r
+                JOIN commits c ON r.commit_hash = c.commit_hash
+                NATURAL JOIN commit_trees
+                NATURAL JOIN tree_entries t
+				NATURAL JOIN blobs b
+				WHERE language IS NOT NULL
+			) AS q1
+			GROUP  BY language
+			ORDER  BY repository_count DESC
+			`,
+			[]sql.Row{
+				{"Text", int32(1)},
+			},
+		},
 	}
 
 	runTests := func(t *testing.T) {