tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor oracle special cases to use isOralce() testing func

Browse Source
This commit is contained in:
Jim Lambert 2020-02-15 11:33:23 -05:00
parent 5c187bc757
commit 62d74645c9
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
join_table_test.go
View File

@ -50,7 +50,7 @@ func (*PersonAddress) Delete(handler gorm.JoinTableHandlerInterface, db *gorm.DB
func (pa *PersonAddress) JoinWith(handler gorm.JoinTableHandlerInterface, db *gorm.DB, source interface{}) *gorm.DB { func (pa *PersonAddress) JoinWith(handler gorm.JoinTableHandlerInterface, db *gorm.DB, source interface{}) *gorm.DB {
table := pa.Table(db) table := pa.Table(db)
where := fmt.Sprintf("%v.deleted_at IS NULL OR %v.deleted_at <= ", table, table) where := fmt.Sprintf("%v.deleted_at IS NULL OR %v.deleted_at <= ", table, table)
if db.Dialect().GetName() == "oci8" { if isOracle(db) {
where = where + "DATE '0001-01-02'" where = where + "DATE '0001-01-02'"
} else { } else {
where = where + "'0001-01-02'" where = where + "'0001-01-02'"

10
main_test.go
View File

@ -574,7 +574,7 @@ func TestTransactionReadonly(t *testing.T) {
if dialect == "" { if dialect == "" {
dialect = "sqlite" dialect = "sqlite"
} }
if DB.Dialect().GetName() == "oci8" { if isOracle(DB) {
dialect = "oracle" dialect = "oracle"
} }
switch dialect { switch dialect {
@ -1352,7 +1352,7 @@ func TestQueryHint1(t *testing.T) {
db := DB.New() db := DB.New()
q := "select 1" q := "select 1"
if db.Dialect().GetName() == "oci8" { if isOracle(db) {
q = q + " from dual" q = q + " from dual"
} }
_, err := db.Model(User{}).Raw(q).Rows() _, err := db.Model(User{}).Raw(q).Rows()
@ -1461,3 +1461,9 @@ func parseTime(str string) *time.Time {
t := now.New(time.Now().UTC()).MustParse(str) t := now.New(time.Now().UTC()).MustParse(str)
return &t return &t
} }
// isOracle gives tests an easy way to determine if the dialect uses Oracle for its RMDBS, since oracle could have multiple dialects for different drivers.
// and since tests run in their own namespace
func isOracle(db *gorm.DB) bool {
return db.Dialect().GetName() == "oci8"
}

6
query_test.go
View File

@ -185,7 +185,7 @@ func TestSearchWithPlainSQL(t *testing.T) {
} }
param := "?" param := "?"
if scopedb.Dialect().GetName() == "oci8" { if isOracle(scopedb) {
param = "to_date(?, 'YYYY-MM-DD')" param = "to_date(?, 'YYYY-MM-DD')"
} }
scopedb.Where("birthday > "+param, "2002-10-10").Find(&users) scopedb.Where("birthday > "+param, "2002-10-10").Find(&users)
@ -773,7 +773,7 @@ func TestSelectWithEscapedFieldName(t *testing.T) {
DB.Save(&user1).Save(&user2).Save(&user3) DB.Save(&user1).Save(&user2).Save(&user3)
colName := "name" colName := "name"
if DB.Dialect().GetName() == "oci8" { if isOracle(DB) {
colName = "NAME" // oracle upper cases all identifiers that aren't explicitly escaped when the table is created colName = "NAME" // oracle upper cases all identifiers that aren't explicitly escaped when the table is created
} }
var names []string var names []string
@ -794,7 +794,7 @@ func TestSelectWithVariables(t *testing.T) {
} else { } else {
columns, _ := rows.Columns() columns, _ := rows.Columns()
colName := "fake" colName := "fake"
if DB.Dialect().GetName() == "oci8" { if isOracle(DB) {
colName = "FAKE" // oracle upper cases all identifiers that aren't explicitly escaped when the table is created colName = "FAKE" // oracle upper cases all identifiers that aren't explicitly escaped when the table is created
} }
if !reflect.DeepEqual(columns, []string{colName}) { if !reflect.DeepEqual(columns, []string{colName}) {

2
scope_test.go
View File

@ -65,7 +65,7 @@ func TestValuer(t *testing.T) {
var user2 User var user2 User
if DB.Dialect().GetName() == "oci8" { if isOracle(DB) {
where := fmt.Sprintf("name = ? AND %s AND %s", oracle.SearchBlob("password_hash"), oracle.SearchBlob("password")) where := fmt.Sprintf("name = ? AND %s AND %s", oracle.SearchBlob("password_hash"), oracle.SearchBlob("password"))
if err := DB.Where(where, name, "abc", "***pass1").First(&user2).Error; err != nil { if err := DB.Where(where, name, "abc", "***pass1").First(&user2).Error; err != nil {