Also empty the dabatase when emptying the trash

pkg/storage/fs/owncloudsql/filecache/filecache.go

@@ -568,6 +568,22 @@ func (c *Cache) GetRecycleItem(user, path string, timestamp int) (*TrashItem, er
 	}, nil
 }
 
+// EmptyRecycle clears the recycle bin for the given user
+func (c *Cache) EmptyRecycle(user string) error {
+	_, err := c.db.Exec("DELETE FROM oc_files_trash WHERE user = ?", user)
+	if err != nil {
+		return err
+	}
+
+	storage, err := c.GetNumericStorageID("home::" + user)
+	if err != nil {
+		return err
+	}
+
+	_, err = c.db.Exec("DELETE FROM oc_filecache WHERE storage = ? AND PATH LIKE ?", storage, "files_trashbin/%")
+	return err
+}
+
 // DeleteRecycleItem deletes the specified item from the trash
 func (c *Cache) DeleteRecycleItem(user, path string, timestamp int) error {
 	_, err := c.db.Exec("DELETE FROM oc_files_trash WHERE id = ? AND user = ? AND timestamp = ?", path, user, timestamp)

pkg/storage/fs/owncloudsql/filecache/filecache_test.go

@@ -438,7 +438,20 @@ var _ = Describe("Filecache", func() {
 			})
 		})
 
-		Describe("PurgeRecycleItem", func() {
+		Describe("EmptyRecycle", func() {
+			It("clears the recycle bin", func() {
+				err := cache.Delete(1, "admin", filePath, trashPath)
+				Expect(err).ToNot(HaveOccurred())
+
+				err = cache.EmptyRecycle("admin")
+				Expect(err).ToNot(HaveOccurred())
+
+				_, err = cache.GetRecycleItem("admin", trashPathBase, trashPathTimestamp)
+				Expect(err).To(HaveOccurred())
+			})
+		})
+
+		Describe("DeleteRecycleItem", func() {
 			It("removes the item from the trash", func() {
 				err := cache.Delete(1, "admin", filePath, trashPath)
 				Expect(err).ToNot(HaveOccurred())
@@ -461,6 +474,7 @@ var _ = Describe("Filecache", func() {
 				Expect(err).ToNot(HaveOccurred())
 			})
 		})
+
 		Describe("PurgeRecycleItem", func() {
 			It("removes the item from the database", func() {
 				err := cache.Delete(1, "admin", filePath, trashPath)

pkg/storage/fs/owncloudsql/owncloudsql.go

@@ -1625,6 +1625,12 @@ func (fs *ocfs) EmptyRecycle(ctx context.Context) error {
 	if err != nil {
 		return errors.Wrap(err, "owncloudsql: error deleting recycle files versions")
 	}
+
+	err = fs.filecache.EmptyRecycle()
+	if err != nil {
+		return errors.Wrap(err, "owncloudsql: error deleting recycle items from the database")
+	}
+
 	// TODO delete keyfiles, keys, share-keys ... or just everything?
 	return nil
 }