Skip to content

Commit 2e9eb80

Browse files
authored
Merge pull request #2217 from koic/always_use_openssl_constants_for_digest_operations
Always use OpenSSL constants for Digest operations
2 parents 293c24b + 969964b commit 2e9eb80

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
require "digest/sha1"
3+
require "openssl"
44

55
module ActiveRecord
66
module ConnectionAdapters
@@ -353,7 +353,7 @@ def index_name(table_name, options) # :nodoc:
353353
end
354354
# generate unique name using hash function
355355
if shortened_name.length > identifier_max_length
356-
shortened_name = "i" + Digest::SHA1.hexdigest(default_name)[0, identifier_max_length - 1]
356+
shortened_name = "i" + OpenSSL::Digest::SHA1.hexdigest(default_name)[0, identifier_max_length - 1]
357357
end
358358
@logger.warn "#{adapter_name} shortened default index name #{default_name} to #{shortened_name}" if @logger
359359
shortened_name

spec/active_record/connection_adapters/oracle_enhanced/schema_statements_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ class ::TestEmployee < ActiveRecord::Base; end
333333
("index_test_employees_on_first_name_and_middle_name_and_last_name"))
334334
else
335335
expect(@conn.index_name("test_employees", column: ["first_name", "middle_name", "last_name"])).to eq(
336-
"i" + Digest::SHA1.hexdigest("index_test_employees_on_first_name_and_middle_name_and_last_name")[0, 29]
336+
"i" + OpenSSL::Digest::SHA1.hexdigest("index_test_employees_on_first_name_and_middle_name_and_last_name")[0, 29]
337337
)
338338
end
339339
end
@@ -455,7 +455,7 @@ class ::TestComment < ActiveRecord::Base
455455
end
456456

457457
it "should add foreign key" do
458-
fk_name = "fk_rails_#{Digest::SHA256.hexdigest("test_comments_test_post_id_fk").first(10)}"
458+
fk_name = "fk_rails_#{OpenSSL::Digest::SHA256.hexdigest("test_comments_test_post_id_fk").first(10)}"
459459

460460
schema_define do
461461
add_foreign_key :test_comments, :test_posts
@@ -475,7 +475,7 @@ class ::TestComment < ActiveRecord::Base
475475
end
476476

477477
it "should add foreign key with column" do
478-
fk_name = "fk_rails_#{Digest::SHA256.hexdigest("test_comments_post_id_fk").first(10)}"
478+
fk_name = "fk_rails_#{OpenSSL::Digest::SHA256.hexdigest("test_comments_post_id_fk").first(10)}"
479479

480480
schema_define do
481481
add_foreign_key :test_comments, :test_posts, column: "post_id"

0 commit comments

Comments
 (0)