diff options
| author | Bryan Helmkamp <bryan@brynary.com> | 2009-09-30 23:35:23 -0400 |
|---|---|---|
| committer | Bryan Helmkamp <bryan@brynary.com> | 2009-09-30 23:35:23 -0400 |
| commit | 71d65b7571d5ff01e0de3c08a9396dc1e1386118 (patch) | |
| tree | b7ddf3e7130da3741d60db33c64b06d798f014fd /lib/arel | |
| parent | bcd8ffa2183a1ca98417fb39bbd83e8f69c984c8 (diff) | |
| download | rails-71d65b7571d5ff01e0de3c08a9396dc1e1386118.tar.gz rails-71d65b7571d5ff01e0de3c08a9396dc1e1386118.tar.bz2 rails-71d65b7571d5ff01e0de3c08a9396dc1e1386118.zip | |
Pull primitives up one level
Diffstat (limited to 'lib/arel')
| -rw-r--r-- | lib/arel/algebra.rb | 7 | ||||
| -rw-r--r-- | lib/arel/algebra/attribute.rb (renamed from lib/arel/algebra/primitives/attribute.rb) | 0 | ||||
| -rw-r--r-- | lib/arel/algebra/expression.rb (renamed from lib/arel/algebra/primitives/expression.rb) | 0 | ||||
| -rw-r--r-- | lib/arel/algebra/ordering.rb (renamed from lib/arel/algebra/primitives/ordering.rb) | 0 | ||||
| -rw-r--r-- | lib/arel/algebra/primitives.rb | 5 | ||||
| -rw-r--r-- | lib/arel/algebra/value.rb (renamed from lib/arel/algebra/primitives/value.rb) | 0 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/arel/algebra.rb b/lib/arel/algebra.rb index 319f8fc242..980c558918 100644 --- a/lib/arel/algebra.rb +++ b/lib/arel/algebra.rb @@ -1,4 +1,9 @@ require 'arel/algebra/core_extensions' + +require 'arel/algebra/attribute' +require 'arel/algebra/expression' +require 'arel/algebra/ordering' require 'arel/algebra/predicates' require 'arel/algebra/relations' -require 'arel/algebra/primitives' +require 'arel/algebra/value' + diff --git a/lib/arel/algebra/primitives/attribute.rb b/lib/arel/algebra/attribute.rb index 40a7d61a53..40a7d61a53 100644 --- a/lib/arel/algebra/primitives/attribute.rb +++ b/lib/arel/algebra/attribute.rb diff --git a/lib/arel/algebra/primitives/expression.rb b/lib/arel/algebra/expression.rb index 875498c282..875498c282 100644 --- a/lib/arel/algebra/primitives/expression.rb +++ b/lib/arel/algebra/expression.rb diff --git a/lib/arel/algebra/primitives/ordering.rb b/lib/arel/algebra/ordering.rb index 8439e937a9..8439e937a9 100644 --- a/lib/arel/algebra/primitives/ordering.rb +++ b/lib/arel/algebra/ordering.rb diff --git a/lib/arel/algebra/primitives.rb b/lib/arel/algebra/primitives.rb deleted file mode 100644 index df8d16a5d5..0000000000 --- a/lib/arel/algebra/primitives.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'arel/algebra/primitives/attribute' -require 'arel/algebra/primitives/ordering' -require 'arel/algebra/primitives/value' -require 'arel/algebra/primitives/expression' - diff --git a/lib/arel/algebra/primitives/value.rb b/lib/arel/algebra/value.rb index e363805140..e363805140 100644 --- a/lib/arel/algebra/primitives/value.rb +++ b/lib/arel/algebra/value.rb |