From ef9ca49cba920ee5a654ad20cbdff45115ee51de Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 18 May 2020 17:25:54 +0100 Subject: [PATCH] Limit columns selected from mysql user table to those we need --- cookbooks/mysql/libraries/mysql.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cookbooks/mysql/libraries/mysql.rb b/cookbooks/mysql/libraries/mysql.rb index 516c38a41..a40161be0 100644 --- a/cookbooks/mysql/libraries/mysql.rb +++ b/cookbooks/mysql/libraries/mysql.rb @@ -85,7 +85,9 @@ module OpenStreetMap end def mysql_users - @mysql_users ||= query("SELECT * FROM user").each_with_object({}) do |user, users| + privilege_columns = USER_PRIVILEGES.collect { |privilege| "#{privilege}_priv" }.join(", ") + + @mysql_users ||= query("SELECT user, host, #{privilege_columns} FROM user").each_with_object({}) do |user, users| name = "'#{user[:user]}'@'#{user[:host]}'" users[name] = USER_PRIVILEGES.each_with_object({}) do |privilege, privileges| -- 2.45.1