diff options
| author | Bryan Helmkamp <bryan@brynary.com> | 2009-05-17 14:38:09 -0400 |
|---|---|---|
| committer | Bryan Helmkamp <bryan@brynary.com> | 2009-05-17 14:38:09 -0400 |
| commit | b0a45d52fdb7d8ce564f4dc2013bc790f98f1da3 (patch) | |
| tree | e9553add3be978b3392735a40b869bfdbc53ea7a /lib/arel/engines/memory/relations.rb | |
| parent | 7032a50297fce4d7724d1735e81e5df5fd919e71 (diff) | |
| download | rails-b0a45d52fdb7d8ce564f4dc2013bc790f98f1da3.tar.gz rails-b0a45d52fdb7d8ce564f4dc2013bc790f98f1da3.tar.bz2 rails-b0a45d52fdb7d8ce564f4dc2013bc790f98f1da3.zip | |
consolidated files
Conflicts:
lib/arel/algebra/predicates.rb
lib/arel/algebra/relations/writes/delete.rb
lib/arel/algebra/relations/writes/insert.rb
lib/arel/algebra/relations/writes/update.rb
lib/arel/engines/memory/predicates.rb
lib/arel/engines/memory/relations.rb
lib/arel/engines/sql/primitives/attribute.rb
lib/arel/engines/sql/relations/writes/insert.rb
lib/arel/engines/sql/relations/writes/update.rb
Diffstat (limited to 'lib/arel/engines/memory/relations.rb')
| -rw-r--r-- | lib/arel/engines/memory/relations.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/arel/engines/memory/relations.rb b/lib/arel/engines/memory/relations.rb index 6361d7c9d7..9f8264c439 100644 --- a/lib/arel/engines/memory/relations.rb +++ b/lib/arel/engines/memory/relations.rb @@ -1,2 +1,3 @@ require 'arel/engines/memory/relations/array' -require 'arel/engines/memory/relations/operations/where' +require 'arel/engines/memory/relations/operations' + |