Merge pull request #388 from alvarotuso/master

Improve external table support

Author: kshvakov

clickhouse_test.go

@@ -959,8 +959,9 @@ func Test_Select_External_Tables(t *testing.T) {
 				?
 			)
 		`
-		query      = `SELECT COUNT(*) FROM clickhouse_test_select_external_tables WHERE string1 IN ? AND string2 IN ? AND string1 NOT IN ?`
-		queryNamed = `SELECT COUNT(*) FROM clickhouse_test_select_external_tables WHERE string1 IN @e1 AND string2 IN @e2 AND string1 NOT IN @e3`
+		query      = `SELECT COUNT(*) FROM clickhouse_test_select_external_tables WHERE string1 IN ? AND string2 IN ? AND string1 NOT IN (SELECT c1 FROM ?)`
+		queryNamed = `SELECT COUNT(*) FROM clickhouse_test_select_external_tables WHERE string1 IN @e1 AND string2 IN @e2 AND string1 NOT IN (SELECT c1 FROM @e3)`
+		queryJoin  = `SELECT COUNT(*) FROM clickhouse_test_select_external_tables AS ctset JOIN ? AS ext ON ctset.string1 = ext.c1`
 	)
 	if connect, err := sql.Open("clickhouse", "tcp://127.0.0.1:9000?debug=true"); assert.NoError(t, err) && assert.NoError(t, connect.Ping()) {
 		if _, err := connect.Exec("DROP TABLE IF EXISTS clickhouse_test_select_external_tables"); assert.NoError(t, err) {
@@ -1034,6 +1035,16 @@ func Test_Select_External_Tables(t *testing.T) {
 							}
 							assert.Equal(t, 1, count)
 						}
+						if rows, err := connect.Query(queryJoin, externalTable1); assert.NoError(t, err) {
+							var count int
+							for rows.Next() {
+								err := rows.Scan(&count)
+								if !assert.NoError(t, err) {
+									return
+								}
+							}
+							assert.Equal(t, 2, count)
+						}
 					}
 				}
 			}

helpers.go

@@ -27,6 +27,8 @@ func numInput(query string) int {
 		between       = newMatcher("between")
 		in            = newMatcher("in")
 		and           = newMatcher("and")
+		from          = newMatcher("from")
+		join          = newMatcher("join")
 	)
 	for {
 		if char, _, err := reader.ReadRune(); err == nil {
@@ -71,7 +73,8 @@ func numInput(query string) int {
 				char == '%':
 				keyword = true
 			default:
-				if limit.matchRune(char) || offset.matchRune(char) || like.matchRune(char) || in.matchRune(char) {
+				if limit.matchRune(char) || offset.matchRune(char) || like.matchRune(char) ||
+					in.matchRune(char) || from.matchRune(char) || join.matchRune(char) {
 					keyword = true
 				} else if between.matchRune(char) {
 					keyword = true

stmt.go

@@ -125,6 +125,8 @@ func (stmt *stmt) bind(args []driver.NamedValue) (string, []ExternalTable) {
 		between        = newMatcher("between")
 		and            = newMatcher("and")
 		in             = newMatcher("in")
+		from           = newMatcher("from")
+		join           = newMatcher("join")
 		externalTables = make([]ExternalTable, 0)
 	)
 	switch {
@@ -175,7 +177,8 @@ func (stmt *stmt) bind(args []driver.NamedValue) (string, []ExternalTable) {
 						char == '[':
 						keyword = true
 					default:
-						if limit.matchRune(char) || offset.matchRune(char) || like.matchRune(char) || in.matchRune(char) {
+						if limit.matchRune(char) || offset.matchRune(char) || like.matchRune(char) ||
+							in.matchRune(char) || from.matchRune(char) || join.matchRune(char) {
 							keyword = true
 						} else if between.matchRune(char) {
 							keyword = true