Merge pull request #2689 from yahonda/leading-slash-deprecation-cleanup

Cleanup `:database` leading-`/` deprecation warning

Author: yahonda

lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -1062,13 +1062,16 @@ def resolve_database_aliases
         end
 
         if @config[:database].to_s.start_with?("/")
+          trimmed = @config[:database].to_s.delete_prefix("/")
           OracleEnhanced.deprecator.warn(
             "Setting `:database` to a value that starts with `/` " \
             "(#{@config[:database].inspect}) is deprecated and will raise " \
             "in a future major version. The leading slash is an adapter " \
             "artefact from when `:database` was prepended into an EZCONNECT " \
-            "URL; the slash is no longer needed. Use the same value without " \
-            "the leading `/`, or use the explicit `:service_name` option."
+            "URL; the slash is no longer needed. Use `database: " \
+            "#{trimmed.inspect}` or `service_name: #{trimmed.inspect}` " \
+            "instead (no leading slash on either).",
+            caller_locations(2)
           )
         end
       end

spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb

@@ -138,9 +138,11 @@ def session_cursor_sharing(connection)
   end
 
   it "should connect to database using service_name" do
-    ActiveRecord::Base.establish_connection(SERVICE_NAME_CONNECTION_PARAMS)
-    expect(ActiveRecord::Base.lease_connection).not_to be_nil
-    expect(ActiveRecord::Base.lease_connection.class).to eq(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
+    ActiveRecord::ConnectionAdapters::OracleEnhanced.deprecator.silence do
+      ActiveRecord::Base.establish_connection(SERVICE_NAME_CONNECTION_PARAMS)
+      expect(ActiveRecord::Base.lease_connection).not_to be_nil
+      expect(ActiveRecord::Base.lease_connection.class).to eq(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
+    end
   end
 end
 
@@ -346,7 +348,16 @@ def session_cursor_sharing(connection)
       ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(database: "/#{DATABASE_NAME}"))
       expect {
         ActiveRecord::Base.lease_connection
-      }.to output(/DEPRECATION WARNING: Setting `:database` to a value that starts with `\/`.*:service_name/m).to_stderr
+      }.to output(
+        %r{DEPRECATION WARNING: Setting `:database`.*starts with `/`.*database: "#{DATABASE_NAME}".*service_name: "#{DATABASE_NAME}"}mo
+      ).to_stderr
+    end
+
+    it "points the 'called from' frame at the user's call site, not adapter internals" do
+      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(database: "/#{DATABASE_NAME}"))
+      expect {
+        ActiveRecord::Base.lease_connection
+      }.to output(%r{called from .*\bconnection_spec\.rb:\d+}).to_stderr
     end
 
     it "does not warn when :database has no leading slash" do