Fix privilege changing everytime

plugins/module_utils/user.py

@@ -385,7 +385,12 @@ def user_mod(cursor, user, host, host_all, password, encrypted,
                         privileges_revoke(cursor, user, host, db_table, revoke_privs, grant_option, maria_role)
                     if len(grant_privs) > 0:
                         privileges_grant(cursor, user, host, db_table, grant_privs, tls_requires, maria_role)
-                    changed = True
+
+            # after privilege manipulation, compare privileges from before and now
+            changed = changed or not privileges_equal(
+                curr_priv,
+                privileges_get(cursor, user, host, maria_role)
+            )
 
         if role:
             continue
@@ -880,3 +885,15 @@ def get_impl(cursor):
     else:
         from ansible_collections.community.mysql.plugins.module_utils.implementations.mysql import user as mysqluser
         impl = mysqluser
+
+
+def privileges_equal(before_privs, after_privs):
+    """Compare 2 priv dicts
+
+    Args:
+        before_privs (dict): contains privileges, built with privileges_get()
+        after_privs (dict): contains privileges, built with privileges_get()
+
+    Returns: True, if equal, False otherwise.
+    """
+    return before_privs == after_privs

tests/integration/targets/test_mysql_role/tasks/mysql_role_initial.yml

@@ -1491,16 +1491,10 @@
       priv: '{{ test_db1 }}.{{ test_table }}:SELECT,INSERT/{{ test_db2 }}.{{ test_table }}:DELETE'
       append_privs: yes
 
-  # TODO it must be changed. The module uses user_mod function
-  # taken from mysql_user module. It's a bug / expected behavior
-  # because I added a similar tasks to mysql_user tests
-  # https://github.com/ansible-collections/community.mysql/issues/50#issuecomment-871216825
-  # and it's also failed. Create an issue after the module is merged to avoid conflicts.
-  # TODO Fix this after user_mod is fixed.
-  - name: Check
+  - name: Check that there's no change
     assert:
       that:
-      - result is changed
+      - result is not changed
 
   - name: Rewrite privs
     <<: *task_params

tests/integration/targets/test_mysql_user/tasks/test_privs.yml

@@ -179,8 +179,6 @@
       assert:
         that:
           - result is not changed
-      when: (install_type == 'mysql' and mysql_version is version('8', '<')) or
-            (install_type == 'mariadb' and mariadb_version is version('10.5', '<'))
 
     - name: remove username
       mysql_user:
@@ -229,8 +227,6 @@
       assert:
         that:
           - result is not changed
-      when: (install_type == 'mysql' and mysql_version is version('8', '<')) or
-            (install_type == 'mariadb')
 
     - name: Collect user info by host
       community.mysql.mysql_info:

tests/unit/plugins/module_utils/test_mysql_user.py

@@ -13,7 +13,8 @@
     handle_grant_on_col,
     has_grant_on_col,
     normalize_col_grants,
-    sort_column_order
+    sort_column_order,
+    privileges_equal
 )
 from ..utils import dummy_cursor_class
 
@@ -97,3 +98,33 @@ def test_handle_grant_on_col(privileges, start, end, output):
 def test_normalize_col_grants(input_, expected):
     """Tests normalize_col_grants function."""
     assert normalize_col_grants(input_) == expected
+
+
+@pytest.mark.parametrize(
+    'before_privileges,after_privileges,output',
+    [
+        (
+            {'*.*': ['INSERT', 'UPDATE', 'GRANT'], '`mysql`.*': ['SELECT']},
+            {'*.*': ['INSERT', 'UPDATE', 'GRANT'], '`mysql`.*': ['SELECT']},
+            True
+        ),
+        (
+            {'`mysql`.*': ['SELECT'], '`sys`.*': ['SELECT']},
+            {'`mysql`.*': ['SELECT'], '`sys`.*': ['SELECT']},
+            True
+        ),
+        (
+            {'`sys`.*': ['SELECT'], '`mysql`.*': ['SELECT']},
+            {'`mysql`.*': ['SELECT'], '`sys`.*': ['SELECT']},
+            True
+        ),
+        (
+            {'`mysql`.*': ['UPDATE'], '`sys`.*': ['SELECT']},
+            {'`mysql`.*': ['SELECT'], '`sys`.*': ['SELECT']},
+            False
+        ),
+    ]
+)
+def test_privileges_equal(before_privileges, after_privileges, output):
+    """Tests privileges_equal function."""
+    assert privileges_equal(before_privileges, after_privileges) == output