Fixing issues with hive URLs

dburl_test.go

@@ -852,6 +852,24 @@ func TestParse(t *testing.T) {
 			`dbname=mydb host=/var/run/postgresql password=pass user=user`,
 			`/var/run/postgresql`,
 		},
+		{
+			`hive://myhost/mydb`,
+			`hive`,
+			`myhost:10000/mydb`,
+			``,
+		},
+		{
+			`hi://myhost:9999/mydb?auth=PLAIN`,
+			`hive`,
+			`myhost:9999/mydb?auth=PLAIN`,
+			``,
+		},
+		{
+			`hive2://user:pass@myhost:9999/mydb?auth=PLAIN`,
+			`hive`,
+			`user:pass@myhost:9999/mydb?auth=PLAIN`,
+			``,
+		},
 	}
 	m := make(map[string]bool)
 	for i, tt := range tests {

dsn.go

@@ -29,15 +29,6 @@ func GenScheme(scheme string) func(*URL) (string, string, error) {
 	}
 }
 
-// GenSchemeTruncate generates a DSN by truncating the scheme://.
-func GenSchemeTruncate(u *URL) (string, string, error) {
-	s := u.String()
-	if i := strings.Index(s, "://"); i != -1 {
-		return s[i+3:], "", nil
-	}
-	return s, "", nil
-}
-
 // GenFromURL returns a func that generates a DSN based on parameters of the
 // passed URL.
 func GenFromURL(urlstr string) func(*URL) (string, string, error) {
@@ -90,7 +81,7 @@ func GenFromURL(urlstr string) func(*URL) (string, string, error) {
 			RawQuery: q.Encode(),
 			Fragment: fragment,
 		}
-		return y.String(), "", nil
+		return strings.TrimPrefix(y.String(), "truncate://"), "", nil
 	}
 }
 

scheme.go

@@ -236,7 +236,9 @@ func BaseSchemes() []Scheme {
 		},
 		{
 			"hive",
-			GenSchemeTruncate, 0, false, nil, "",
+			GenFromURL("truncate://localhost:10000/"), 0, false,
+			[]string{"hive2"},
+			"",
 		},
 		{
 			"ignite",
@@ -250,7 +252,7 @@ func BaseSchemes() []Scheme {
 		},
 		{
 			"maxcompute",
-			GenSchemeTruncate, 0, false,
+			GenFromURL("truncate://localhost/"), 0, false,
 			[]string{"mc"},
 			"",
 		},