kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

use top level file constant for join, etc

Browse source
This commit is contained in:
Aaron Patterson 2011-05-10 10:31:34 -07:00
parent ad3f0eec75
commit 74c5f65bfb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
activerecord/lib/active_record/fixtures.rb
View file

@ -478,7 +478,7 @@ module ActiveRecord
connection,
table_name,
class_names[table_name.to_sym] || table_name.classify,
File.join(fixtures_directory, path))
::File.join(fixtures_directory, path))
end
all_loaded_fixtures.update(fixtures_map)
@ -656,9 +656,9 @@ module ActiveRecord
end
def read_fixture_files
if File.file?(yaml_file_path)
if ::File.file?(yaml_file_path)
read_yaml_fixture_files
elsif File.file?(csv_file_path)
elsif ::File.file?(csv_file_path)
read_csv_fixture_files
else
raise FixturesFileNotFound, "Could not find #{yaml_file_path} or #{csv_file_path}"
@ -713,7 +713,7 @@ module ActiveRecord
end
def yaml_fixtures_key(path)
File.basename(@fixture_path).split(".").first
::File.basename(@fixture_path).split(".").first
end
def parse_yaml_string(fixture_content)