diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-08-13 12:26:06 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-08-13 12:26:06 -0700 |
| commit | 9b97d6ca9bb95e26b0806b15d7eb0818af0fc925 (patch) | |
| tree | 1290d3df402b2d94712e399f6f690645aab0e8d9 | |
| parent | 5d7cad60799179e2ac6c1a7505980c85a775c55a (diff) | |
| download | rails-9b97d6ca9bb95e26b0806b15d7eb0818af0fc925.tar.gz rails-9b97d6ca9bb95e26b0806b15d7eb0818af0fc925.tar.bz2 rails-9b97d6ca9bb95e26b0806b15d7eb0818af0fc925.zip | |
adding a relation thing
| -rw-r--r-- | lib/arel.rb | 6 | ||||
| -rw-r--r-- | lib/arel/relation.rb | 6 | ||||
| -rw-r--r-- | lib/arel/tree_manager.rb | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/lib/arel.rb b/lib/arel.rb index aeb5161b1d..1cca58f31b 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -1,6 +1,12 @@ require 'arel/version' require 'arel/table' require 'arel/attributes' + +#### these are deprecated +# The Arel::Relation constant is referenced in Rails +require 'arel/relation' +#### + require 'arel/tree_manager' require 'arel/nodes' diff --git a/lib/arel/relation.rb b/lib/arel/relation.rb new file mode 100644 index 0000000000..87786d7701 --- /dev/null +++ b/lib/arel/relation.rb @@ -0,0 +1,6 @@ +module Arel + ### + # This is deprecated. Fix rails, then remove this. + module Relation + end +end diff --git a/lib/arel/tree_manager.rb b/lib/arel/tree_manager.rb index e92092d6e1..9de86e2add 100644 --- a/lib/arel/tree_manager.rb +++ b/lib/arel/tree_manager.rb @@ -1,5 +1,8 @@ module Arel class TreeManager + # FIXME: Remove this. + include Arel::Relation + def initialize engine @engine = engine @selects = [] |