Add minor fixes and tests

Author: ting-lan-wang

oracle/oracle.go

@@ -61,6 +61,8 @@ import (
 	_ "github.com/godror/godror"
 )
 
+const DefaultDriverName string = "godror"
+
 type Config struct {
 	DriverName           string
 	DataSourceName       string
@@ -80,7 +82,7 @@ func (d Dialector) Name() string {
 
 // Open creates a new godror Dialector with the given DSN
 func Open(dsn string) gorm.Dialector {
-	return &Dialector{Config: &Config{DriverName: "godror", DataSourceName: dsn}}
+	return &Dialector{Config: &Config{DataSourceName: dsn}}
 }
 
 // New creates a new Dialector with the given config
@@ -90,6 +92,10 @@ func New(config Config) gorm.Dialector {
 
 // Initializes the database connection
 func (d Dialector) Initialize(db *gorm.DB) (err error) {
+	if d.DriverName == "" {
+		d.DriverName = DefaultDriverName
+	}
+
 	d.DefaultStringSize = 4000
 
 	config := &callbacks.Config{

tests/.gitignore

@@ -0,0 +1,69 @@
+package tests
+
+import (
+	"regexp"
+	"testing"
+
+	"gorm.io/gorm"
+)
+
+type Student struct {
+	ID   uint
+	Name string
+}
+
+func (s Student) TableName() string {
+	return "STUDENTS"
+}
+
+func TestSkipQuoteIdentifiers(t *testing.T) {
+	db, err := openTestDBWithOptions(true, &gorm.Config{
+		Logger: newLogger,
+	})
+	if err != nil {
+		t.Fatalf("failed to connect database, got error %v", err)
+	}
+
+	db.Migrator().DropTable(&Student{})
+	db.Migrator().CreateTable(&Student{})
+
+	if !db.Migrator().HasTable(&Student{}) {
+		t.Errorf("Failed to get table: student")
+	}
+
+	if !db.Migrator().HasColumn(&Student{}, "ID") {
+		t.Errorf("Failed to get column: id")
+	}
+
+	if !db.Migrator().HasColumn(&Student{}, "NAME") {
+		t.Errorf("Failed to get column: name")
+	}
+
+	dryrunDB := db.Session(&gorm.Session{DryRun: true})
+
+	result := dryrunDB.Model(&Student{}).Create(&Student{ID: 1, Name: "John"})
+	if !regexp.MustCompile(`^INSERT INTO STUDENTS \(name,id\) VALUES \(:1,:2\)$`).MatchString(result.Statement.SQL.String()) {
+		t.Errorf("invalid insert SQL, got %v", result.Statement.SQL.String())
+	}
+
+	result = dryrunDB.First(&Student{})
+	if !regexp.MustCompile(`^SELECT \* FROM STUDENTS ORDER BY STUDENTS\.id FETCH NEXT 1 ROW ONLY$`).MatchString(result.Statement.SQL.String()) {
+		t.Fatalf("SQL should include selected names, but got %v", result.Statement.SQL.String())
+	}
+
+	result = dryrunDB.Find(&Student{ID: 1, Name: "John"})
+	if !regexp.MustCompile(`^SELECT \* FROM STUDENTS WHERE STUDENTS\.id = :1$`).MatchString(result.Statement.SQL.String()) {
+		t.Fatalf("SQL should include selected names, but got %v", result.Statement.SQL.String())
+	}
+
+	result = dryrunDB.Save(&Student{ID: 2, Name: "Mary"})
+	if !regexp.MustCompile(`^UPDATE STUDENTS SET name=:1 WHERE id = :2$`).MatchString(result.Statement.SQL.String()) {
+		t.Fatalf("SQL should include selected names, but got %v", result.Statement.SQL.String())
+	}
+
+	// Update with conditions
+	result = dryrunDB.Model(&Student{}).Where("id = ?", 1).Update("name", "hello")
+	if !regexp.MustCompile(`^UPDATE STUDENTS SET name=:1 WHERE id = :2$`).MatchString(result.Statement.SQL.String()) {
+		t.Fatalf("SQL should include selected names, but got %v", result.Statement.SQL.String())
+	}
+}

tests/config_test.go

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