diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-14 00:09:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-14 00:09:54 +0300 |
| commit | 0fea036ba7c8d26ffeecc7f52bf770ea3a88689e (patch) | |
| tree | 5937f3181e46bdc2c96ba9b530bc66d0ef46311f /gems | |
| parent | 46e1fdb8bbdaf149371334f1a1757ba4d68fe020 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'gems')
| -rw-r--r-- | gems/click_house-client/lib/click_house/client.rb | 4 | ||||
| -rw-r--r-- | gems/csv_builder/lib/csv_builder/builder.rb | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gems/click_house-client/lib/click_house/client.rb b/gems/click_house-client/lib/click_house/client.rb index 1ca3653c45f..499201a1aba 100644 --- a/gems/click_house-client/lib/click_house/client.rb +++ b/gems/click_house-client/lib/click_house/client.rb @@ -30,6 +30,10 @@ module ClickHouse DatabaseError = Class.new(Error) QueryError = Class.new(Error) + def self.database_configured?(database, configuration = self.configuration) + !!configuration.databases[database] + end + # Executes a SELECT database query def self.select(query, database, configuration = self.configuration) instrumented_execute(query, database, configuration) do |response, instrument| diff --git a/gems/csv_builder/lib/csv_builder/builder.rb b/gems/csv_builder/lib/csv_builder/builder.rb index 99b63153ab2..ff7e51cf7ce 100644 --- a/gems/csv_builder/lib/csv_builder/builder.rb +++ b/gems/csv_builder/lib/csv_builder/builder.rb @@ -78,7 +78,9 @@ module CsvBuilder def row(object) attributes.map do |attribute| - if attribute.respond_to?(:call) + if object.is_a?(Hash) + excel_sanitize(object[attribute]) + elsif attribute.respond_to?(:call) excel_sanitize(attribute.call(object)) else excel_sanitize(object.public_send(attribute)) # rubocop:disable GitlabSecurity/PublicSend |