diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-15 19:53:20 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-15 19:53:20 -0300 |
| commit | 002cf5fac4d71e77805c0e1dad3b9499b1f551ca (patch) | |
| tree | 0dcded09924432ce566cdb272cff068d3f457e68 /activerecord/lib | |
| parent | f3c1832ad44e5e8b256e5548623a445a83b09c1f (diff) | |
| parent | 19fae86fe028162f7c487b2822e02fa96b5b861b (diff) | |
| download | rails-002cf5fac4d71e77805c0e1dad3b9499b1f551ca.tar.gz rails-002cf5fac4d71e77805c0e1dad3b9499b1f551ca.tar.bz2 rails-002cf5fac4d71e77805c0e1dad3b9499b1f551ca.zip | |
Merge branch 'rm-uuid'
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 4cd5f92207..4306b36ae1 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -2,7 +2,7 @@ require 'erb' require 'yaml' require 'zlib' require 'active_support/dependencies' -require 'active_support/core_ext/securerandom' +require 'active_support/core_ext/digest/uuid' require 'active_record/fixture_set/file' require 'active_record/errors' @@ -551,7 +551,7 @@ module ActiveRecord # Integer identifiers are values less than 2^30. UUIDs are RFC 4122 version 5 SHA-1 hashes. def self.identify(label, column_type = :integer) if column_type == :uuid - SecureRandom.uuid_v5(SecureRandom::UUID_OID_NAMESPACE, label.to_s) + Digest::UUID.uuid_v5(Digest::UUID::OID_NAMESPACE, label.to_s) else Zlib.crc32(label.to_s) % MAX_ID end |