Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit c35ad2d508e037ebd522d7a3b0a29fd26c68aece 1 parent 03097d3
@dhh dhh authored
View
2  activerecord/CHANGELOG
@@ -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]
View
4 activerecord/lib/active_record/fixtures.rb
@@ -188,7 +188,7 @@ def self.instantiate_fixtures(object, table_name, fixtures, load_instances=true)
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 @@ def self.reset_sequences(connection, table_names)
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
View
4 activerecord/test/mixin_nested_set_test.rb
@@ -35,7 +35,7 @@ def test_symbol_scope
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 @@ def test_common_usage
end
-end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.