diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-24 07:15:00 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-24 07:15:00 +0000 |
| commit | 6c1a356a1a613274d2b6c1851778ff224bf1cbff (patch) | |
| tree | 2e223abbeee13feff87765b2816e5a6221450352 /activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb | |
| parent | 2b28575734f557ee61a7544e17bd3510eaa6d900 (diff) | |
| download | rails-6c1a356a1a613274d2b6c1851778ff224bf1cbff.tar.gz rails-6c1a356a1a613274d2b6c1851778ff224bf1cbff.tar.bz2 rails-6c1a356a1a613274d2b6c1851778ff224bf1cbff.zip | |
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
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb | 7 |
1 files changed, 6 insertions, 1 deletions
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(' ') |