lib/arel/algebra.rb lib/arel/algebra/extensions.rb lib/arel/algebra/extensions/array.rb lib/arel/algebra/extensions/class.rb lib/arel/algebra/extensions/hash.rb lib/arel/algebra/extensions/object.rb lib/arel/algebra/extensions/pathname.rb lib/arel/algebra/predicates.rb lib/arel/algebra/primitives.rb lib/arel/algebra/primitives/attribute.rb lib/arel/algebra/primitives/expression.rb lib/arel/algebra/primitives/value.rb lib/arel/algebra/relations.rb lib/arel/algebra/relations/operations/alias.rb lib/arel/algebra/relations/operations/group.rb lib/arel/algebra/relations/operations/join.rb lib/arel/algebra/relations/operations/order.rb lib/arel/algebra/relations/operations/project.rb lib/arel/algebra/relations/operations/skip.rb lib/arel/algebra/relations/operations/take.rb lib/arel/algebra/relations/operations/where.rb lib/arel/algebra/relations/relation.rb lib/arel/algebra/relations/utilities/compound.rb lib/arel/algebra/relations/utilities/externalization.rb lib/arel/algebra/relations/utilities/nil.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.rb lib/arel/engines/memory/engine.rb lib/arel/engines/memory/predicates.rb lib/arel/engines/memory/primitives.rb lib/arel/engines/memory/primitives/attribute.rb lib/arel/engines/memory/primitives/value.rb lib/arel/engines/memory/relations.rb lib/arel/engines/memory/relations/array.rb lib/arel/engines/memory/relations/operations/where.rb lib/arel/engines/sql.rb @@ -18,7 +18,7 @@ Generating a query with ARel is simple. For example, in order to produce you construct a table relation and convert it to sql: - users = Arel(:users) + users = Table(:users) users.to_sql In fact, you will probably never call `#to_sql`. Rather, you'll work with data from the table directly. You can iterate through all rows in the `users` table like this: @@ -81,7 +81,7 @@ The `AND` operator will behave similarly. Finally, most operations take a block form. For example: - Arel(:users) \ + Table(:users) \ .where { |u| u[:id].eq(1) } \ .project { |u| u[:id] } @@ -95,7 +95,7 @@ The examples above are fairly simple and other libraries match or come close to Where Arel really shines in its ability to handle complex joins and aggregations. As a first example, let's consider an "adjacency list", a tree represented in a table. Suppose we have a table `comments`, representing a threaded discussion: - comments = Arel(:comments) + comments = Table(:comments) And this table has the following attributes: README.markdown @@ -5,10 +5,6 @@ require 'activesupport' require 'activerecord' require 'active_record/connection_adapters/abstract/quoting' -require 'arel/arel' -require 'arel/extensions' -require 'arel/predicates' -require 'arel/relations' +require 'arel/algebra' require 'arel/engines' require 'arel/session' -require 'arel/primitives' lib/arel.rb @@ -1,2 +1,2 @@ -require 'arel/engines/sql/sql' -require 'arel/engines/array/array' \ No newline at end of file +require 'arel/engines/sql' +require 'arel/engines/memory' \ No newline at end of file lib/arel/engines.rb @@ -1,5 +1,3 @@ -require 'set' - module Arel class Attribute def column lib/arel/engines/sql/primitives/attribute.rb @@ -1,5 +1,10 @@ -require 'arel/engines/sql/relations/utilities' +require 'arel/engines/sql/relations/utilities/recursion' +require 'arel/engines/sql/relations/utilities/externalization' +require 'arel/engines/sql/relations/utilities/nil' require 'arel/engines/sql/relations/relation' -require 'arel/engines/sql/relations/operations' -require 'arel/engines/sql/relations/writes' -require 'arel/engines/sql/relations/table' \ No newline at end of file +require 'arel/engines/sql/relations/table' +require 'arel/engines/sql/relations/operations/join' +require 'arel/engines/sql/relations/operations/alias' +require 'arel/engines/sql/relations/writes/delete' +require 'arel/engines/sql/relations/writes/insert' +require 'arel/engines/sql/relations/writes/update' \ No newline at end of file lib/arel/engines/sql/relations.rb @@ -34,3 +34,8 @@ module Arel end end end + +def Table(name, engine = Arel::Table.engine) + Arel::Table.new(name, engine) +end + lib/arel/engines/sql/relations/table.rb @@ -1,5 +1,3 @@ -require 'singleton' - module Arel class Session class << self lib/arel/session.rb @@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') module Arel describe Join do before do - @relation1 = Arel(:users) + @relation1 = Table(:users) @relation2 = @relation1.alias @predicate = @relation1[:id].eq(@relation2[:id]) end spec/arel/integration/joins/with_adjacency_spec.rb @@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') module Arel describe Join do before do - @relation1 = Arel(:users) - @relation2 = Arel(:photos) + @relation1 = Table(:users) + @relation2 = Table(:photos) @predicate = @relation1[:id].eq(@relation2[:user_id]) end spec/arel/integration/joins/with_aggregations_spec.rb @@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') module Arel describe Join do before do - @relation1 = Arel(:users) - @relation2 = Arel(:photos) + @relation1 = Table(:users) + @relation2 = Table(:photos) @predicate = @relation1[:id].eq(@relation2[:user_id]) end spec/arel/integration/joins/with_compounds_spec.rb @@ -22,6 +22,13 @@ module Arel { @relation[:id] => 3 } ] end + + it '' do + @relation.where(@relation[:id].lt(3)).call.should == [ + { @relation[:id] => 1 }, + { @relation[:id] => 2 } + ] + end end end end \ No newline at end of file spec/arel/unit/relations/array_spec.rb lib/arel/arel.rb lib/arel/engines/array/array.rb lib/arel/engines/array/relations/array.rb lib/arel/engines/sql/relations/operations.rb lib/arel/engines/sql/relations/utilities.rb lib/arel/engines/sql/relations/writes.rb lib/arel/engines/sql/sql.rb lib/arel/extensions.rb lib/arel/extensions/array.rb lib/arel/extensions/class.rb lib/arel/extensions/hash.rb lib/arel/extensions/object.rb lib/arel/predicates.rb lib/arel/primitives.rb lib/arel/primitives/attribute.rb lib/arel/primitives/expression.rb lib/arel/primitives/value.rb lib/arel/relations.rb lib/arel/relations/operations.rb lib/arel/relations/operations/alias.rb lib/arel/relations/operations/group.rb lib/arel/relations/operations/join.rb lib/arel/relations/operations/order.rb lib/arel/relations/operations/project.rb lib/arel/relations/operations/skip.rb lib/arel/relations/operations/take.rb lib/arel/relations/operations/where.rb lib/arel/relations/relation.rb lib/arel/relations/utilities.rb lib/arel/relations/utilities/compound.rb lib/arel/relations/utilities/externalization.rb lib/arel/relations/utilities/nil.rb lib/arel/relations/writes.rb lib/arel/relations/writes/delete.rb lib/arel/relations/writes/insert.rb lib/arel/relations/writes/update.rb bdca9ed42ffea10aa6989ea3ecebedb424fa01ed Bryan Helmkamp bryan@brynary.com http://github.com/nkallen/arel/commit/7032a50297fce4d7724d1735e81e5df5fd919e71 7032a50297fce4d7724d1735e81e5df5fd919e71 2009-05-17T11:31:04-07:00 2009-05-17T11:31:04-07:00 reorganized file structures Conflicts: lib/arel.rb lib/arel/arel.rb lib/arel/engines/memory/predicates.rb lib/arel/engines/memory/relations/array.rb lib/arel/engines/sql/relations/table.rb c52333abcc7a1454ea6ada7fe5e31e054f4e9540 Bryan Helmkamp bryan@brynary.com