diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 18f0b4c16d..f944383927 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* SQLServer: resolve column aliasing/quoting collision when using limit or offset in an eager find. #2974 [kajism@yahoo.com] + * Reloading a model doesn't lose track of its connection. #2996 [junk@miriamtech.com, Jeremy Kemper] * Fixed bug where using update_attribute after pushing a record to a habtm association of the object caused duplicate rows in the join table. #2888 [colman@rominato.com, Florian Weber] diff --git a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb index 9320717b34..c3fdebfd72 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -356,7 +356,12 @@ module ActiveRecord if options[:order] options[:order] = options[:order].split(',').map do |field| parts = field.split(" ") - if sql =~ /#{parts[0]} AS (t\d_r\d\d?)/ + tc = parts[0] + if sql =~ /\.\[/ and tc =~ /\./ # if column quoting used in query + tc.gsub!(/\./, '\\.\\[') + tc << '\\]' + end + if sql =~ /#{tc} AS (t\d_r\d\d?)/ parts[0] = $1 end parts.join(' ') |