diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-08 20:54:38 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-08 20:54:38 -0700 |
| commit | 3cd723dee6abc52a508fabec432379b8b31621e7 (patch) | |
| tree | d7a63d1ab4f74d43d00c5a9c285b021cc417497e /lib/arel | |
| parent | 2b61973597f1204f9ac58f517716e6d7811239e4 (diff) | |
| parent | b4f59097b0c9be3babcfb83734814cb74de6ff33 (diff) | |
| download | rails-3cd723dee6abc52a508fabec432379b8b31621e7.tar.gz rails-3cd723dee6abc52a508fabec432379b8b31621e7.tar.bz2 rails-3cd723dee6abc52a508fabec432379b8b31621e7.zip | |
Merge branch 'master' into collector
* master:
finally stop returning strings
Diffstat (limited to 'lib/arel')
| -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 |