Adding oracle test and making adodb provider URLs a bit friendlier

Author: Kenneth Shaw

dburl_test.go

@@ -78,18 +78,20 @@ func TestParse(t *testing.T) {
 		{`mssql://user@localhost/service/dbname`, `mssql`, `Database=dbname;Server=localhost\service;User ID=user`},
 		{`mssql://user:!234%23$@localhost:1580/dbname`, `mssql`, `Database=dbname;Password=!234#$;Port=1580;Server=localhost;User ID=user`},
 
-		{`adodb://Microsoft.ACE.OLEDB.12.0?Extended+Properties=%22Text%3BHDR%3DNO%3BFMT%3DDelimited%22`, `adodb`,
-			`Data Source=.;Extended Properties="Text;HDR=NO;FMT=Delimited";Provider=Microsoft.ACE.OLEDB.12.0`}, // 30
-		{`adodb://user:[email protected]:1542/dbname`, `adodb`, `Database=dbname;Password=pass;Port=1542;Provider=Provider.Name;User ID=user`},
-
+		{`adodb://Microsoft.ACE.OLEDB.12.0?Extended+Properties=%22Text%3BHDR%3DNO%3BFMT%3DDelimited%22`, `adodb`, // 30
+			`Data Source=.;Extended Properties="Text;HDR=NO;FMT=Delimited";Provider=Microsoft.ACE.OLEDB.12.0`},
+		{`adodb://user:[email protected]:1542/Oracle8i/dbname`, `adodb`,
+			`Data Source=Oracle8i;Database=dbname;Password=pass;Port=1542;Provider=Provider.Name;User ID=user`},
 		{`oo+Postgres+Unicode://user:pass@host:5432/dbname`, `adodb`,
-			`Provider=MSDASQL.1;Extended Properties="Database=dbname;Driver={Postgres Unicode};PWD=pass;Port=5432;Server=host;UID=user"`}, // 31
+			`Provider=MSDASQL.1;Extended Properties="Database=dbname;Driver={Postgres Unicode};PWD=pass;Port=5432;Server=host;UID=user"`},
 
 		{`file:/path/to/file.sqlite3`, `sqlite3`, `/path/to/file.sqlite3`}, // 33
 		{`sqlite:///path/to/file.sqlite3`, `sqlite3`, `/path/to/file.sqlite3`},
 		{`sq://path/to/file.sqlite3`, `sqlite3`, `path/to/file.sqlite3`},
 		{`sq:path/to/file.sqlite3`, `sqlite3`, `path/to/file.sqlite3`},
 		{`sq:./path/to/file.sqlite3`, `sqlite3`, `./path/to/file.sqlite3`},
+
+		{`oracle://user:pass@localhost/xe.oracle.docker`, `ora`, `user/pass@localhost/xe.oracle.docker`}, // 38
 	}
 
 	for i, test := range tests {

dsn.go

@@ -335,17 +335,22 @@ func GenADODB(u *URL) (string, error) {
 	q.Set("Port", u.Port())
 
 	// grab dbname
-	dbname := strings.TrimPrefix(u.Path, "/")
-	if dbname == "" {
-		dbname = "."
+	dsname, dbname := strings.TrimPrefix(u.Path, "/"), ""
+	if dsname == "" {
+		dsname = "."
 	}
 
-	if dbname == "." {
-		q.Set("Data Source", dbname)
-	} else {
-		q.Set("Database", dbname)
+	// check if data source is not a path on disk
+	if mode(dsname) == 0 {
+		if i := strings.IndexAny(dsname, `\/`); i != -1 {
+			dbname = dsname[i+1:]
+			dsname = dsname[:i]
+		}
 	}
 
+	q.Set("Data Source", dsname)
+	q.Set("Database", dbname)
+
 	// add user/pass
 	if u.User != nil {
 		q.Set("User ID", u.User.Username())