diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-08 20:54:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-08 20:54:33 -0700 |
| commit | b4f59097b0c9be3babcfb83734814cb74de6ff33 (patch) | |
| tree | a7178eb58e609882109eaf6ad24a631bebbe6d6a | |
| parent | 2d80dc0cd29895230eaaae4595e249d582439298 (diff) | |
| download | rails-b4f59097b0c9be3babcfb83734814cb74de6ff33.tar.gz rails-b4f59097b0c9be3babcfb83734814cb74de6ff33.tar.bz2 rails-b4f59097b0c9be3babcfb83734814cb74de6ff33.zip | |
finally stop returning strings
| -rw-r--r-- | lib/arel/visitors/mssql.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/arel/visitors/mssql.rb b/lib/arel/visitors/mssql.rb index fdf37081dc..4085af9069 100644 --- a/lib/arel/visitors/mssql.rb +++ b/lib/arel/visitors/mssql.rb @@ -62,7 +62,8 @@ module Arel elsif x.groups.any? x.groups else - [Arel.sql(find_left_table_pk(x.froms).to_s)] + pk = find_left_table_pk(x.froms) + pk ? [pk] : [] end end @@ -77,7 +78,7 @@ module Arel # FIXME raise exception of there is no pk? # FIXME!! Table.primary_key will be deprecated. What is the replacement?? def find_left_table_pk o - return visit o.primary_key if o.instance_of? Arel::Table + return o.primary_key if o.instance_of? Arel::Table find_left_table_pk o.left if o.kind_of? Arel::Nodes::Join end end |