Merge pull request #34764 from kamipo/avoid_redundant_begin

Enable `Style/RedundantBegin` cop to avoid newly adding redundant begin block

1 files changed, 6 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb
index 30cb0a27e7..11aed6c002 100644
--- a/activerecord/lib/active_record/database_configurations.rb
+++ b/activerecord/lib/active_record/database_configurations.rb
@@ -124,15 +124,13 @@ module ActiveRecord
       end
 
       def build_db_config_from_string(env_name, spec_name, config)
-        begin
-          url = config
-          uri = URI.parse(url)
-          if uri.try(:scheme)
-            ActiveRecord::DatabaseConfigurations::UrlConfig.new(env_name, spec_name, url)
-          end
-        rescue URI::InvalidURIError
-          ActiveRecord::DatabaseConfigurations::HashConfig.new(env_name, spec_name, config)
+        url = config
+        uri = URI.parse(url)
+        if uri.try(:scheme)
+          ActiveRecord::DatabaseConfigurations::UrlConfig.new(env_name, spec_name, url)
         end
+      rescue URI::InvalidURIError
+        ActiveRecord::DatabaseConfigurations::HashConfig.new(env_name, spec_name, config)
       end
 
       def build_db_config_from_hash(env_name, spec_name, config)