aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-18 03:32:38 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-18 03:32:38 +0000
commit9bd7db4a980652f327e4410b0be0345bee761bf8 (patch)
treeee3974379868ec6aff9c10e9cfc4e5c8f1a630ae /activerecord
parentfe94ba10037088549d4fc619b9e196dfad1dff46 (diff)
downloadrails-9bd7db4a980652f327e4410b0be0345bee761bf8.tar.gz
rails-9bd7db4a980652f327e4410b0be0345bee761bf8.tar.bz2
rails-9bd7db4a980652f327e4410b0be0345bee761bf8.zip
Fixed that Migration#execute would have the table name prefix appended to its query (closes #4110) [mark.imbriaco@pobox.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3909 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG2
-rw-r--r--activerecord/lib/active_record/migration.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 2fba682e4c..d683e7642e 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that Migration#execute would have the table name prefix appended to its query #4110 [mark.imbriaco@pobox.com]
+
* Make all tinyint(1) variants act like boolean in mysql (tinyint(1) unsigned, etc.) [Jamis Buck]
* Use association's :conditions when eager loading. [jeremyevans0@gmail.com] #4144
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 47706e4a4f..b911a76899 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -266,7 +266,7 @@ module ActiveRecord
def method_missing(method, *arguments, &block)
say_with_time "#{method}(#{arguments.map { |a| a.inspect }.join(", ")})" do
- arguments[0] = Migrator.proper_table_name(arguments.first) unless arguments.empty?
+ arguments[0] = Migrator.proper_table_name(arguments.first) unless arguments.empty? || method == :execute
ActiveRecord::Base.connection.send(method, *arguments, &block)
end
end