kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Fixed PostgreSQL usage of fixtures with regards to public schemas and table names with dots #962 [gnuman1@gmail.com] 

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1206 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-04-18 08:11:15 +00:00
parent 03097d3a60
commit c35ad2d508
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/CHANGELOG
View File

@ -1,5 +1,7 @@
*SVN*
* Fixed PostgreSQL usage of fixtures with regards to public schemas and table names with dots #962 [gnuman1@gmail.com]
* Fixed that fixtures were being deleted in the same order as inserts causing FK errors #890 [andrew.john.peters@gmail.com]
* Fixed loading of fixtures in to be in the right order (or PostgreSQL would bark) #1047 [stephenh@chase3000.com]

4
activerecord/lib/active_record/fixtures.rb
View File

@ -188,7 +188,7 @@ class Fixtures < Hash
old_logger_level = ActiveRecord::Base.logger.level
ActiveRecord::Base.logger.level = Logger::ERROR
object.instance_variable_set "@#{table_name}", fixtures
object.instance_variable_set "@#{table_name.to_s.gsub('.','_')}", fixtures
if load_instances
fixtures.each do |name, fixture|
if model = fixture.find
@ -243,7 +243,7 @@ class Fixtures < Hash
pk = eval("#{table_class}::primary_key")
if pk == 'id'
connection.execute(
"SELECT setval('public.#{table.to_s}_id_seq', (SELECT MAX(id) FROM #{table.to_s}), true)",
"SELECT setval('#{table.to_s}_id_seq', (SELECT MAX(id) FROM #{table.to_s}), true)",
'Setting Sequence'
)
end

4
activerecord/test/mixin_nested_set_test.rb
View File

@ -35,7 +35,7 @@ class MixinNestedSetTest < Test::Unit::TestCase
def check_method_mixins( obj )
[:scope_condition, :left_col_name, :right_col_name, :parent_column, :root?, :add_child,
:children_count, :full_set, :all_children, :direct_children].each { |symbol| assert( obj.respond_to? symbol ) }
:children_count, :full_set, :all_children, :direct_children].each { |symbol| assert( obj.respond_to?(symbol)) }
end
def set( id )
@ -181,4 +181,4 @@ class MixinNestedSetTest < Test::Unit::TestCase
end
end
end