Database: revoke role method

src/db_models.rb

@@ -251,7 +251,11 @@ class User_Role_relation < EntityModel
 	end
 
 	def self.revoke_role(user_id, role_id)
-		# TODO: revoke role
+		user = User.find_by_id user_id
+
+		if user.role_ids.include?(role_id) then
+			self.delete "role_id = ? AND user_id = ?", role_id, user_id
+		end
 	end
 
 	def self.get_user_roles_ids(user_id)

src/lib/database.rb

@@ -86,8 +86,8 @@ class EntityModel
 		return newid, resp
 	end
 
-	def self.delete(id)
+	def self.delete(filter="", *args)
-		self.query "DELETE FROM #{self.name} WHERE id = ?", id
+		self.query "DELETE FROM #{self.name} #{self.apply_filter(filter)}", *args
 	end
 
 	def self.set(attr, data, filter="") # slower but more lazy