minor fixes

Author: ting-lan-wang

tests/config_test.go

@@ -4,6 +4,7 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/oracle-samples/gorm-oracle/oracle"
 	"gorm.io/gorm"
 )
 
@@ -17,9 +18,9 @@ func (s Student) TableName() string {
 }
 
 func TestSkipQuoteIdentifiers(t *testing.T) {
-	db, err := openTestDBWithOptions(true, &gorm.Config{
-		Logger: newLogger,
-	})
+	db, err := openTestDBWithOptions(
+		&oracle.Config{SkipQuoteIdentifiers: true},
+		&gorm.Config{Logger: newLogger})
 	if err != nil {
 		t.Fatalf("failed to connect database, got error %v", err)
 	}

tests/tests_test.go

@@ -118,21 +118,25 @@ func init() {
 }
 
 func OpenTestConnection(cfg *gorm.Config) (db *gorm.DB, err error) {
-	return openTestDBWithOptions(false, cfg)
+	return openTestDBWithOptions(nil, cfg)
 }
 
-func openTestDBWithOptions(skipQuoteIdentifiers bool, cfg *gorm.Config) (db *gorm.DB, err error) {
+func openTestDBWithOptions(oracleCfg *oracle.Config, gormCfg *gorm.Config) (db *gorm.DB, err error) {
+	if oracleCfg == nil {
+		oracleCfg = &oracle.Config{}
+	}
+
 	dbDSN := os.Getenv("GORM_DSN")
 	log.Println("testing oracle...")
 	if dbDSN == "" {
 		dbDSN = oracleDSN
 	}
+
+	oracleCfg.DataSourceName = dbDSN
+
 	db, err = gorm.Open(
-		oracle.New(oracle.Config{
-			SkipQuoteIdentifiers: skipQuoteIdentifiers,
-			DataSourceName:       dbDSN,
-		}),
-		cfg,
+		oracle.New(*oracleCfg),
+		gormCfg,
 	)
 
 	if err != nil {