Merge pull request #29 from oracle-samples/override_join_table

Fix TestOverrideJoinTable by ignoring OnConflict errors

Author: ting-lan-wang

oracle/clause_builder.go

@@ -300,7 +300,6 @@ func OnConflictClauseBuilder(c clause.Clause, builder clause.Builder) {
 			if len(conflictColumns) == 0 {
 				// If no columns specified, try to use primary key fields as default
 				if stmt.Schema == nil || len(stmt.Schema.PrimaryFields) == 0 {
-					stmt.AddError(fmt.Errorf("OnConflict requires either explicit columns or primary key fields"))
 					return
 				}
 				for _, primaryField := range stmt.Schema.PrimaryFields {

oracle/create.go

@@ -219,7 +219,6 @@ func buildBulkInsertPLSQL(db *gorm.DB, createValues clause.Values) {
 		conflictColumns := onConflict.Columns
 		if len(conflictColumns) == 0 {
 			if len(schema.PrimaryFields) == 0 {
-				db.AddError(fmt.Errorf("OnConflict requires either explicit columns or primary key fields"))
 				return
 			}
 			for _, primaryField := range schema.PrimaryFields {
@@ -255,7 +254,6 @@ func buildBulkMergePLSQL(db *gorm.DB, createValues clause.Values, onConflictClau
 	conflictColumns := onConflict.Columns
 	if len(conflictColumns) == 0 {
 		if schema == nil || len(schema.PrimaryFields) == 0 {
-			db.AddError(fmt.Errorf("OnConflict requires either explicit columns or primary key fields"))
 			return
 		}
 		for _, primaryField := range schema.PrimaryFields {

tests/joins_table_test.go

@@ -66,7 +66,6 @@ type PersonAddress struct {
 }
 
 func TestOverrideJoinTable(t *testing.T) {
-	t.Skip()
 	DB.Migrator().DropTable(&Person{}, &Address{}, &PersonAddress{})
 
 	if err := DB.SetupJoinTable(&Person{}, "Addresses", &PersonAddress{}); err != nil {
@@ -95,7 +94,7 @@ func TestOverrideJoinTable(t *testing.T) {
 		t.Fatalf("Should have one address left")
 	}
 
-	if DB.Find(&[]PersonAddress{}, "person_id = ?", person.ID).RowsAffected != 1 {
+	if DB.Find(&[]PersonAddress{}, "\"person_id\" = ?", person.ID).RowsAffected != 1 {
 		t.Fatalf("Should found one address")
 	}
 
@@ -113,7 +112,7 @@ func TestOverrideJoinTable(t *testing.T) {
 		t.Fatalf("Failed to find address, got error %v, length: %v", err, len(addresses3))
 	}
 
-	if DB.Unscoped().Find(&[]PersonAddress{}, "person_id = ?", person.ID).RowsAffected != 2 {
+	if DB.Unscoped().Find(&[]PersonAddress{}, "\"person_id\" = ?", person.ID).RowsAffected != 2 {
 		t.Fatalf("Should found soft deleted addresses with unscoped")
 	}
 

tests/joins_test.go

@@ -52,7 +52,6 @@ import (
 )
 
 func TestJoins(t *testing.T) {
-	t.Skip()
 	user := *GetUser("joins-1", Config{Company: true, Manager: true, Account: true, NamedPet: false})
 
 	DB.Create(&user)
@@ -66,7 +65,6 @@ func TestJoins(t *testing.T) {
 }
 
 func TestJoinsForSlice(t *testing.T) {
-	t.Skip()
 	users := []User{
 		*GetUser("slice-joins-1", Config{Company: true, Manager: true, Account: true}),
 		*GetUser("slice-joins-2", Config{Company: true, Manager: true, Account: true}),
@@ -101,8 +99,6 @@ func TestJoinsForSlice(t *testing.T) {
 }
 
 func TestJoinConds(t *testing.T) {
-	t.Skip()
-
 	user := *GetUser("joins-conds", Config{Account: true, Pets: 3})
 	DB.Save(&user)
 
@@ -157,8 +153,6 @@ func TestJoinConds(t *testing.T) {
 }
 
 func TestJoinOn(t *testing.T) {
-	t.Skip()
-
 	user := *GetUser("joins-on", Config{Pets: 2})
 	DB.Save(&user)
 
@@ -281,8 +275,6 @@ func TestJoinWithSoftDeleted(t *testing.T) {
 }
 
 func TestInnerJoins(t *testing.T) {
-	t.Skip()
-
 	user := *GetUser("inner-joins-1", Config{Company: true, Manager: true, Account: true, NamedPet: false})
 
 	DB.Create(&user)
@@ -336,8 +328,6 @@ func TestJoinWithSameColumnName(t *testing.T) {
 }
 
 func TestJoinArgsWithDB(t *testing.T) {
-	t.Skip()
-
 	user := *GetUser("joins-args-db", Config{Pets: 2})
 	DB.Save(&user)
 

tests/passed-tests.txt

@@ -142,7 +142,7 @@ TestHooksForSlice
 TestFailedToSaveAssociationShouldRollback
 TestUpdateCallbacks
 TestPropagateUnscoped
-#TestOverrideJoinTable
+TestOverrideJoinTable
 TestJoins
 TestJoinsForSlice
 TestJoinConds