diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-12-27 18:04:35 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-12-27 18:04:35 -0300 |
| commit | b339caca2f3c7306c3944c5fc5d8dde17ae2deb8 (patch) | |
| tree | a443bebb38ffc34c3642a655c5cc9d20a22ee3d3 /lib/arel/engines | |
| parent | 3ea68bc6bde539f4391cc1b96999e16c25ca0801 (diff) | |
| download | rails-b339caca2f3c7306c3944c5fc5d8dde17ae2deb8.tar.gz rails-b339caca2f3c7306c3944c5fc5d8dde17ae2deb8.tar.bz2 rails-b339caca2f3c7306c3944c5fc5d8dde17ae2deb8.zip | |
Added lock to Arel, allowing a locking read if required.
Diffstat (limited to 'lib/arel/engines')
| -rw-r--r-- | lib/arel/engines/sql/relations/relation.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb index 448cf7951d..8b71aa8c04 100644 --- a/lib/arel/engines/sql/relations/relation.rb +++ b/lib/arel/engines/sql/relations/relation.rb @@ -16,7 +16,8 @@ module Arel "FROM #{from_clauses}", (joins(self) unless joins(self).blank? ), ("WHERE #{where_clauses.join("\n\tAND ")}" unless wheres.blank? ), - ("GROUP BY #{group_clauses.join(', ')}" unless groupings.blank? ) + ("GROUP BY #{group_clauses.join(', ')}" unless groupings.blank? ), + ("#{locked}" unless locked.blank? ) build_query \ "SELECT * FROM (#{query}) AS id_list", @@ -33,7 +34,8 @@ module Arel ("GROUP BY #{group_clauses.join(', ')}" unless groupings.blank? ), ("ORDER BY #{order_clauses.join(', ')}" unless orders.blank? ), ("LIMIT #{taken}" unless taken.blank? ), - ("OFFSET #{skipped}" unless skipped.blank? ) + ("OFFSET #{skipped}" unless skipped.blank? ), + ("#{locked}" unless locked.blank? ) end end |