From 6c1a356a1a613274d2b6c1851778ff224bf1cbff Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 24 Nov 2005 07:15:00 +0000 Subject: SQLServer: resolve column aliasing/quoting collision when using limit or offset in an eager find. References #2974. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3184 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/CHANGELOG | 2 ++ .../lib/active_record/connection_adapters/sqlserver_adapter.rb | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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(' ') -- cgit v1.2.3