From 77bd3bfa2eab75ad48056106e3fd194318446b63 Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aklychko@redhat.com>
Date: Fri, 20 Aug 2021 10:50:41 +0300
Subject: [PATCH] [stable-2] mysql_info: fix TypeError failure when there are
 databases that do not contain tables (#205) (#208)

* mysql_info: fix TypeError failure when there are databases that do not contain tables (#205)

* mysql_info: fix TypeError failure when there are databases that do not contain tables

* Add changelog fragment

(cherry picked from commit a1f419d5413f198ace0e837d01e68ee1abb142fc)

* Fix sanity errors (#206)

(cherry picked from commit 8a17e43eae5c93266a9d8cbdbc563c5550d00e1f)
---
 ..._info_fix_failure_when_no_tables_in_db.yml |  2 ++
 plugins/module_utils/user.py                  |  2 +-
 plugins/modules/mysql_info.py                 |  3 +++
 .../targets/test_mysql_info/tasks/main.yml    | 22 +++++++++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/205-mysql_info_fix_failure_when_no_tables_in_db.yml

diff --git a/changelogs/fragments/205-mysql_info_fix_failure_when_no_tables_in_db.yml b/changelogs/fragments/205-mysql_info_fix_failure_when_no_tables_in_db.yml
new file mode 100644
index 0000000..fd9260e
--- /dev/null
+++ b/changelogs/fragments/205-mysql_info_fix_failure_when_no_tables_in_db.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- mysql_info - fix TypeError failure when there are databases that do not contain tables (https://github.com/ansible-collections/community.mysql/issues/204).
diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py
index c59f72a..a8da7f1 100644
--- a/plugins/module_utils/user.py
+++ b/plugins/module_utils/user.py
@@ -86,7 +86,7 @@ def sanitize_requires(tls_requires):
     if tls_requires:
         for key in tls_requires.keys():
             sanitized_requires[key.upper()] = tls_requires[key]
-        if any([key in ["CIPHER", "ISSUER", "SUBJECT"] for key in sanitized_requires.keys()]):
+        if any(key in ["CIPHER", "ISSUER", "SUBJECT"] for key in sanitized_requires.keys()):
             sanitized_requires.pop("SSL", None)
             sanitized_requires.pop("X509", None)
             return sanitized_requires
diff --git a/plugins/modules/mysql_info.py b/plugins/modules/mysql_info.py
index 7380b6b..6f57403 100644
--- a/plugins/modules/mysql_info.py
+++ b/plugins/modules/mysql_info.py
@@ -474,6 +474,9 @@ class MySQL_Info(object):
                 self.info['databases'][db['name']] = {}
 
                 if not exclude_fields or 'db_size' not in exclude_fields:
+                    if db['size'] is None:
+                        db['size'] = 0
+
                     self.info['databases'][db['name']]['size'] = int(db['size'])
 
         # If empty dbs are not needed in the returned dict, exit from the method
diff --git a/tests/integration/targets/test_mysql_info/tasks/main.yml b/tests/integration/targets/test_mysql_info/tasks/main.yml
index 785e814..0ed2af9 100644
--- a/tests/integration/targets/test_mysql_info/tasks/main.yml
+++ b/tests/integration/targets/test_mysql_info/tasks/main.yml
@@ -191,3 +191,25 @@
         state: absent
 
     - include: issue-28.yml
+
+    # https://github.com/ansible-collections/community.mysql/issues/204
+    - name: Create database containing only views
+      mysql_db:
+        <<: *mysql_params
+        name: allviews
+
+    - name: Create view
+      mysql_query:
+        <<: *mysql_params
+        login_db: allviews
+        query: 'CREATE VIEW v_today (today) AS SELECT CURRENT_DATE'
+
+    - name: Fetch info
+      mysql_info:
+        <<: *mysql_params
+      register: result
+
+    - name: Check
+      assert:
+        that:
+          result.databases.allviews.size == 0