Added Unscoped Delete functionality; Test cases

queryset/methods/queryset.go

@@ -270,26 +270,50 @@ func NewDeleteMethod(qsTypeName, structTypeName string) DeleteMethod {
 	}
 }
 
-// DeleteNumMethod creates Delete Num method
+// DeleteNumMethod creates DeleteNum method
 type DeleteNumMethod struct {
+        namedMethod
+        baseQuerySetMethod
+
+        noArgsMethod
+        constBodyMethod
+        constRetMethod
+}
+
+// NewDeleteNumMethod delete row count
+func NewDeleteNumMethod(qsTypeName, structTypeName string) DeleteNumMethod {
+        return DeleteNumMethod{
+                namedMethod:        newNamedMethod("DeleteNum"),
+                baseQuerySetMethod: newBaseQuerySetMethod(qsTypeName),
+                constRetMethod:     newConstRetMethod("(int64, error)"),
+                constBodyMethod: newConstBodyMethod(
+                        strings.Join([]string{
+                                "db := qs.db.Delete(" + structTypeName + "{}" + ")",
+                                "return db.RowsAffected, db.Error",
+                        }, "\n"),
+                ),
+        }
+}
+
+// DeleteNumUnscopedMethod creates DeleteNumUnscoped method for performing hard deletes
+type DeleteNumUnscopedMethod struct {
 	namedMethod
 	baseQuerySetMethod
 
-	dbArgMethod
+	noArgsMethod
 	constBodyMethod
 	constRetMethod
 }
 
-// NewDeleteNumMethod delete row count
-func NewDeleteNumMethod(qsTypeName, structTypeName string) DeleteNumMethod {
-	return DeleteNumMethod{
-		namedMethod:        newNamedMethod("DeleteNum"),
-		dbArgMethod:        newDbArgMethod(),
+// NewDeleteNumUnscopedMethod delete row count for hard deletes
+func NewDeleteNumUnscopedMethod(qsTypeName, structTypeName string) DeleteNumUnscopedMethod {
+	return DeleteNumUnscopedMethod{
+		namedMethod:        newNamedMethod("DeleteNumUnscoped"),
 		baseQuerySetMethod: newBaseQuerySetMethod(qsTypeName),
 		constRetMethod:     newConstRetMethod("(int64, error)"),
 		constBodyMethod: newConstBodyMethod(
 			strings.Join([]string{
-				"db = qs.db.Delete(" + structTypeName + "{}" + ")",
+				"db := qs.db.Unscoped().Delete(" + structTypeName + "{}" + ")",
 				"return db.RowsAffected, db.Error",
 			}, "\n"),
 		),

queryset/methodsbuilder.go

@@ -124,7 +124,8 @@ func (b *methodsBuilder) buildCRUDMethods() *methodsBuilder {
 		methods.NewDeleteMethod(b.qsTypeName(), b.s.TypeName),
 		methods.NewStructModifierMethod("Create", b.s.TypeName),
 		methods.NewStructModifierMethod("Delete", b.s.TypeName),
-		methods.NewDeleteNumMethod(b.qsTypeName(), b.s.TypeName))
+		methods.NewDeleteNumMethod(b.qsTypeName(), b.s.TypeName),
+		methods.NewDeleteNumUnscopedMethod(b.qsTypeName(), b.s.TypeName))
 	return b
 }
 

queryset/queryset_test.go

@@ -120,6 +120,8 @@ func TestQueries(t *testing.T) {
 		testUserQueryFilters,
 		testUsersCount,
 		testUsersUpdateNum,
+		testUsersDeleteNum,
+		testUsersDeleteNumUnscoped,
 	}
 	for _, f := range funcs {
 		f := f // save range var
@@ -328,6 +330,36 @@ func testUserDeleteByPK(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
 	assert.Nil(t, u.Delete(db))
 }
 
+func testUsersDeleteNum(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
+	usersNum := 2
+	users := getTestUsers(usersNum)
+	req := "UPDATE `users` SET deleted_at=? WHERE `users`.deleted_at IS NULL AND ((email IN (?,?)))"
+	m.ExpectExec(fixedFullRe(req)).
+		WithArgs(sqlmock.AnyArg(), users[0].Email, users[1].Email).
+		WillReturnResult(sqlmock.NewResult(0, int64(usersNum)))
+
+	num, err := test.NewUserQuerySet(db).
+		EmailIn(users[0].Email, users[1].Email).
+		DeleteNum()
+	assert.Nil(t, err)
+	assert.Equal(t, int64(usersNum), num)
+}
+
+func testUsersDeleteNumUnscoped(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
+	usersNum := 2
+	users := getTestUsers(usersNum)
+	req := "DELETE FROM `users` WHERE (email IN (?,?))"
+	m.ExpectExec(fixedFullRe(req)).
+		WithArgs(users[0].Email, users[1].Email).
+		WillReturnResult(sqlmock.NewResult(0, int64(usersNum)))
+
+	num, err := test.NewUserQuerySet(db).
+		EmailIn(users[0].Email, users[1].Email).
+		DeleteNumUnscoped()
+	assert.Nil(t, err)
+	assert.Equal(t, int64(usersNum), num)
+}
+
 func testUsersUpdateNum(t *testing.T, m sqlmock.Sqlmock, db *gorm.DB) {
 	usersNum := 2
 	users := getTestUsers(usersNum)