From b7677656334b71599f114d7e960148fe47e154a2 Mon Sep 17 00:00:00 2001
From: Tomoya AMACHI <tomoya.amachi@gmail.com>
Date: Mon, 23 Mar 2020 05:18:18 +0900
Subject: [PATCH] stop using xorm.io/core

---
 dialects/oracle.go                                |  2 +-
 dialect_oracle_test.go => dialects/oracle_test.go | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)
 rename dialect_oracle_test.go => dialects/oracle_test.go (84%)

diff --git a/dialects/oracle.go b/dialects/oracle.go
index d0793382..466b6a45 100644
--- a/dialects/oracle.go
+++ b/dialects/oracle.go
@@ -842,7 +842,7 @@ func (p *oci8Driver) Parse(driverName, dataSourceName string) (*URI, error) {
 			db.DBName = match
 		}
 	}
-	if db.DbName == "" && len(matches) != 0 {
+	if db.DBName == "" && len(matches) != 0 {
 		return nil, errors.New("dbname is empty")
 	}
 	return db, nil
diff --git a/dialect_oracle_test.go b/dialects/oracle_test.go
similarity index 84%
rename from dialect_oracle_test.go
rename to dialects/oracle_test.go
index 3faf6d7b..9c3a93f5 100644
--- a/dialect_oracle_test.go
+++ b/dialects/oracle_test.go
@@ -1,10 +1,8 @@
-package xorm
+package dialects
 
 import (
 	"reflect"
 	"testing"
-
-	"xorm.io/core"
 )
 
 func TestParseOracleConnStr(t *testing.T) {
@@ -21,15 +19,15 @@ func TestParseOracleConnStr(t *testing.T) {
 		{"user/pass", "", false},
 		{"", "", false},
 	}
-	driver := core.QueryDriver("oci8")
+	driver := QueryDriver("oci8")
 	for _, test := range tests {
 		t.Run(test.in, func(t *testing.T) {
 			driver := driver
 			uri, err := driver.Parse("oci8", test.in)
 			if err != nil && test.valid {
 				t.Errorf("%q got unexpected error: %s", test.in, err)
-			} else if err == nil && !reflect.DeepEqual(test.expected, uri.DbName) {
-				t.Errorf("%q got: %#v want: %#v", test.in, uri.DbName, test.expected)
+			} else if err == nil && !reflect.DeepEqual(test.expected, uri.DBName) {
+				t.Errorf("%q got: %#v want: %#v", test.in, uri.DBName, test.expected)
 			}
 		})
 	}