diff options
-rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/vendor/mysql411.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 965054b4b6..e006a34edc 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that column aliases didn't work as expected with the new MySql411 driver #507 [Demetrius] + * Fixed that find_all would produce invalid sql when called sequentialy #490 [Scott Baron] diff --git a/activerecord/lib/active_record/vendor/mysql411.rb b/activerecord/lib/active_record/vendor/mysql411.rb index 3daa846f16..0a94258122 100644 --- a/activerecord/lib/active_record/vendor/mysql411.rb +++ b/activerecord/lib/active_record/vendor/mysql411.rb @@ -255,7 +255,7 @@ class Mysql def_value = f[7] max_length = 0 - ret << Field::new(table_name, table_name, column_name, length, type, flags, decimals, def_value, max_length) + ret << Field::new(table_name, table_name, column_name_alias, length, type, flags, decimals, def_value, max_length) end ret end |