diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-12-28 10:45:11 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-12-28 10:45:11 -0300 |
| commit | 4fe6bdf195336d54b082ca26b96c5294d8aae3d1 (patch) | |
| tree | b806cb6416b57a1efcc65ba9b30dc20cd6fe3a77 /lib | |
| parent | b339caca2f3c7306c3944c5fc5d8dde17ae2deb8 (diff) | |
| download | rails-4fe6bdf195336d54b082ca26b96c5294d8aae3d1.tar.gz rails-4fe6bdf195336d54b082ca26b96c5294d8aae3d1.tar.bz2 rails-4fe6bdf195336d54b082ca26b96c5294d8aae3d1.zip | |
Don't try to lock reads when using any SQLite adapter, it's redundant
and may generate an invalid query.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/arel/engines/sql/relations/relation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb index 8b71aa8c04..12b328151f 100644 --- a/lib/arel/engines/sql/relations/relation.rb +++ b/lib/arel/engines/sql/relations/relation.rb @@ -35,7 +35,7 @@ module Arel ("ORDER BY #{order_clauses.join(', ')}" unless orders.blank? ), ("LIMIT #{taken}" unless taken.blank? ), ("OFFSET #{skipped}" unless skipped.blank? ), - ("#{locked}" unless locked.blank? ) + ("#{locked}" unless engine.adapter_name =~ /SQLite/ || locked.blank?) end end |