diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-06-03 21:27:16 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-06-03 21:27:16 +0000 |
| commit | 3e67e0b3b2c192335daeede83430dc6e5042fec3 (patch) | |
| tree | ca6f1c13be25d5af45da5317ca615ab5d059d427 /activerecord/lib/active_record | |
| parent | 4394e402b7a482675ceb5ab9e832defe930bd71e (diff) | |
| download | rails-3e67e0b3b2c192335daeede83430dc6e5042fec3.tar.gz rails-3e67e0b3b2c192335daeede83430dc6e5042fec3.tar.bz2 rails-3e67e0b3b2c192335daeede83430dc6e5042fec3.zip | |
Fixed problems with eager loading and counting on SQL Server (closed #5212) [kajism@yahoo.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4418 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb index 658330cf53..2e1ac2350b 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -370,11 +370,11 @@ module ActiveRecord def add_limit_offset!(sql, options) if options[:limit] and options[:offset] - total_rows = @connection.select_all("SELECT count(*) as TotalRows from (#{sql.gsub(/\bSELECT\b/i, "SELECT TOP 1000000000")}) tally")[0][:TotalRows].to_i + total_rows = @connection.select_all("SELECT count(*) as TotalRows from (#{sql.gsub(/\bSELECT(\s+DISTINCT)?\b/i, "SELECT#{$1} TOP 1000000000")}) tally")[0][:TotalRows].to_i if (options[:limit] + options[:offset]) >= total_rows options[:limit] = (total_rows - options[:offset] >= 0) ? (total_rows - options[:offset]) : 0 end - sql.sub!(/^\s*SELECT/i, "SELECT * FROM (SELECT TOP #{options[:limit]} * FROM (SELECT TOP #{options[:limit] + options[:offset]} ") + sql.sub!(/^\s*SELECT(\s+DISTINCT)?/i, "SELECT * FROM (SELECT TOP #{options[:limit]} * FROM (SELECT#{$1} TOP #{options[:limit] + options[:offset]} ") sql << ") AS tmp1" if options[:order] options[:order] = options[:order].split(',').map do |field| @@ -385,7 +385,9 @@ module ActiveRecord tc << '\\]' end if sql =~ /#{tc} AS (t\d_r\d\d?)/ - parts[0] = $1 + parts[0] = $1 + elsif parts[0] =~ /\w+\.(\w+)/ + parts[0] = $1 end parts.join(' ') end.join(', ') @@ -394,7 +396,7 @@ module ActiveRecord sql << " ) AS tmp2" end elsif sql !~ /^\s*SELECT (@@|COUNT\()/i - sql.sub!(/^\s*SELECT([\s]*distinct)?/i) do + sql.sub!(/^\s*SELECT(\s+DISTINCT)?/i) do "SELECT#{$1} TOP #{options[:limit]}" end unless options[:limit].nil? end |