diff --git a/changelogs/fragments/65310-postgresql_owner_use_query_params.yml b/changelogs/fragments/65310-postgresql_owner_use_query_params.yml new file mode 100644 index 00000000000000..1ff1f827dee3f4 --- /dev/null +++ b/changelogs/fragments/65310-postgresql_owner_use_query_params.yml @@ -0,0 +1,2 @@ +bugfixes: +- postgresql_owner - use query_params with cursor object (https://github.com/ansible/ansible/pull/65310). diff --git a/lib/ansible/modules/database/postgresql/postgresql_owner.py b/lib/ansible/modules/database/postgresql/postgresql_owner.py index c2767a0df06b27..d1edc332dddbbf 100644 --- a/lib/ansible/modules/database/postgresql/postgresql_owner.py +++ b/lib/ansible/modules/database/postgresql/postgresql_owner.py @@ -275,49 +275,51 @@ def set_owner(self, obj_type, obj_name): def __is_owner(self): """Return True if self.role is the current object owner.""" if self.obj_type == 'table': - query = ("SELECT 1 FROM pg_tables WHERE tablename = '%s' " - "AND tableowner = '%s'" % (self.obj_name, self.role)) + query = ("SELECT 1 FROM pg_tables " + "WHERE tablename = %(obj_name)s " + "AND tableowner = %(role)s") elif self.obj_type == 'database': query = ("SELECT 1 FROM pg_database AS d " "JOIN pg_roles AS r ON d.datdba = r.oid " - "WHERE d.datname = '%s' " - "AND r.rolname = '%s'" % (self.obj_name, self.role)) + "WHERE d.datname = %(obj_name)s " + "AND r.rolname = %(role)s") elif self.obj_type == 'function': query = ("SELECT 1 FROM pg_proc AS f " "JOIN pg_roles AS r ON f.proowner = r.oid " - "WHERE f.proname = '%s' " - "AND r.rolname = '%s'" % (self.obj_name, self.role)) + "WHERE f.proname = %(obj_name)s " + "AND r.rolname = %(role)s") elif self.obj_type == 'sequence': query = ("SELECT 1 FROM pg_class AS c " "JOIN pg_roles AS r ON c.relowner = r.oid " - "WHERE c.relkind = 'S' AND c.relname = '%s' " - "AND r.rolname = '%s'" % (self.obj_name, self.role)) + "WHERE c.relkind = 'S' AND c.relname = %(obj_name)s " + "AND r.rolname = %(role)s") elif self.obj_type == 'schema': query = ("SELECT 1 FROM information_schema.schemata " - "WHERE schema_name = '%s' " - "AND schema_owner = '%s'" % (self.obj_name, self.role)) + "WHERE schema_name = %(obj_name)s " + "AND schema_owner = %(role)s") elif self.obj_type == 'tablespace': query = ("SELECT 1 FROM pg_tablespace AS t " "JOIN pg_roles AS r ON t.spcowner = r.oid " - "WHERE t.spcname = '%s' " - "AND r.rolname = '%s'" % (self.obj_name, self.role)) + "WHERE t.spcname = %(obj_name)s " + "AND r.rolname = %(role)s") elif self.obj_type == 'view': query = ("SELECT 1 FROM pg_views " - "WHERE viewname = '%s' " - "AND viewowner = '%s'" % (self.obj_name, self.role)) + "WHERE viewname = %(obj_name)s " + "AND viewowner = %(role)s") elif self.obj_type == 'matview': query = ("SELECT 1 FROM pg_matviews " - "WHERE matviewname = '%s' " - "AND matviewowner = '%s'" % (self.obj_name, self.role)) + "WHERE matviewname = %(obj_name)s " + "AND matviewowner = %(role)s") - return exec_sql(self, query, add_to_executed=False) + query_params = {'obj_name': self.obj_name, 'role': self.role} + return exec_sql(self, query, query_params, add_to_executed=False) def __set_db_owner(self): """Set the database owner.""" @@ -369,7 +371,9 @@ def __set_mat_view_owner(self): def __role_exists(self, role): """Return True if role exists, otherwise return False.""" - return exec_sql(self, "SELECT 1 FROM pg_roles WHERE rolname = '%s'" % role, add_to_executed=False) + query_params = {'role': role} + query = "SELECT 1 FROM pg_roles WHERE rolname = %(role)s" + return exec_sql(self, query, query_params, add_to_executed=False) # =========================================== diff --git a/test/integration/targets/postgresql_owner/tasks/main.yml b/test/integration/targets/postgresql_owner/tasks/main.yml index 78076349d2bbab..c841ce04af051d 100644 --- a/test/integration/targets/postgresql_owner/tasks/main.yml +++ b/test/integration/targets/postgresql_owner/tasks/main.yml @@ -1,2 +1,4 @@ # Initial CI tests of postgresql_owner module - import_tasks: postgresql_owner_initial.yml + when: + - postgres_version_resp.stdout is version('9.4', '>=')