From 4427801107565c0030fa0f22f486b2dc6185829c Mon Sep 17 00:00:00 2001 From: Brian Pokosh Date: Tue, 19 Apr 2011 10:21:40 -0400 Subject: [PATCH 1/3] Substitute all table names in select statement with the alias --- lib/arel/visitors/sqlserver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/arel/visitors/sqlserver.rb b/lib/arel/visitors/sqlserver.rb index e1cc7d53c..0e765dd95 100644 --- a/lib/arel/visitors/sqlserver.rb +++ b/lib/arel/visitors/sqlserver.rb @@ -281,7 +281,7 @@ def rowtable_projections(o) core.projections.map do |x| x.dup.tap do |p| p.sub! 'DISTINCT', "DISTINCT #{visit(o.limit)}".strip if o.limit - p.sub! /\[#{tn}\]\./, '[__rnt].' + p.gsub! /\[#{tn}\]\./, '[__rnt].' p.strip! end end From 685d516c92e0d3db72b2ad86f57af1d29426acbf Mon Sep 17 00:00:00 2001 From: Brian Pokosh Date: Tue, 19 Apr 2011 10:43:16 -0400 Subject: [PATCH 2/3] Brackets should not be required --- lib/arel/visitors/sqlserver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/arel/visitors/sqlserver.rb b/lib/arel/visitors/sqlserver.rb index 0e765dd95..3fe40263a 100644 --- a/lib/arel/visitors/sqlserver.rb +++ b/lib/arel/visitors/sqlserver.rb @@ -281,7 +281,7 @@ def rowtable_projections(o) core.projections.map do |x| x.dup.tap do |p| p.sub! 'DISTINCT', "DISTINCT #{visit(o.limit)}".strip if o.limit - p.gsub! /\[#{tn}\]\./, '[__rnt].' + p.gsub! /\[?#{tn}\]?\./, '[__rnt].' p.strip! end end From 39e11f6fba966cb733b87113efda56b7a66ec83d Mon Sep 17 00:00:00 2001 From: Brian Pokosh Date: Wed, 20 Apr 2011 10:07:14 -0400 Subject: [PATCH 3/3] removed has_rdoc from gemspec (deprecated with no replacement) --- activerecord-sqlserver-adapter.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec index b626ca09c..32eb1c672 100644 --- a/activerecord-sqlserver-adapter.gemspec +++ b/activerecord-sqlserver-adapter.gemspec @@ -12,7 +12,6 @@ Gem::Specification.new do |s| s.files = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*' ] s.require_path = 'lib' - s.has_rdoc = true s.extra_rdoc_files = ['README.rdoc'] s.rdoc_options.concat ['--main', 'README.rdoc'] s.rubyforge_project = 'activerecord-sqlserver-adapter'