arel 2.0.10 → 2.1.0

data/History.txt

@@ -1,9 +1,56 @@
-== 2.0.10 / 2011/05/14
+== 2.1.0 / 2011/04/30
 
-* Bug Fixes
+* Enhancements
+
+  * AST is now Enumerable
+  * AND nodes are now n-ary nodes
+  * SQL Literals may be used as Attribute names
+  * Added Arel::Nodes::NamedFunction for representing generic SQL functions
+  * Add Arel::SelectManager#limit=
+  * Add Arel::SelectManager#offset
+  * Add Arel::SelectManager#offset=
+  * Added Arel::SelectManager#create_insert for building an insert manager.
+  * SQL Literals are allowed for values in INSERT statements.
+  * Math operations have been added to attributes, thanks to
+    Vladimir Meremyanin.
+
+* Bug fixes
+
+  * MSSQL adds TOP to sub selects
+  * Assigning nil to take() removes LIMIT from statement.
+  * Assigning nil to offset() removes OFFSET from statement.
+  * TableAlias leg ordering fixed
+
+* Deprecations
+
+  * Calls to `insert` are deprecated. Please use `compile_insert` then call
+  `to_sql` on the resulting object and execute that SQL.
+
+  * Calls to `update` are deprecated. Please use `compile_update` then call
+  `to_sql` on the resulting object and execute that SQL.
+
+  * Calls to `delete` are deprecated. Please use `compile_delete` then call
+  `to_sql` on the resulting object and execute that SQL.
+
+  * Arel::Table#joins is deprecated and will be removed in 3.0.0 with no
+  replacement.
+
+  * Arel::Table#columns is deprecated and will be removed in 3.0.0 with no
+  replacement.
+
+  * Arel::Table.table_cache is deprecated and will be removed in 3.0.0 with no
+  replacement.
+
+  * Arel::Nodes::And.new takes a single list instead of left and right.
+
+  * Arel::Table#primary_key is deprecated and will be removed in 3.0.0 with no
+  replacement.
+
+  * Arel::SelectManager#where_clauses is deprecated and will be removed in
+  3.0.0 with no replacement.
 
-  * Fix thread safety issue in ToSql visitor.  Thanks Damon McCormick and
-    Cameron Walters!
+  * Arel::SelectManager#wheres is deprecated and will be removed in
+  3.0.0 with no replacement.
 
 == 2.0.9  / 2010/02/25
 

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+.gemtest
 History.txt
 MIT-LICENSE.txt
 Manifest.txt
@@ -6,6 +7,7 @@ README.markdown
 Rakefile
 arel.gemspec
 lib/arel.rb
+lib/arel/alias_predication.rb
 lib/arel/attributes.rb
 lib/arel/attributes/attribute.rb
 lib/arel/compatibility/wheres.rb
@@ -14,60 +16,37 @@ lib/arel/delete_manager.rb
 lib/arel/deprecated.rb
 lib/arel/expression.rb
 lib/arel/expressions.rb
+lib/arel/factory_methods.rb
 lib/arel/insert_manager.rb
+lib/arel/math.rb
 lib/arel/nodes.rb
 lib/arel/nodes/and.rb
-lib/arel/nodes/as.rb
-lib/arel/nodes/assignment.rb
-lib/arel/nodes/avg.rb
-lib/arel/nodes/between.rb
 lib/arel/nodes/binary.rb
 lib/arel/nodes/count.rb
 lib/arel/nodes/delete_statement.rb
-lib/arel/nodes/does_not_match.rb
 lib/arel/nodes/equality.rb
-lib/arel/nodes/except.rb
-lib/arel/nodes/exists.rb
 lib/arel/nodes/function.rb
-lib/arel/nodes/greater_than.rb
-lib/arel/nodes/greater_than_or_equal.rb
-lib/arel/nodes/group.rb
-lib/arel/nodes/grouping.rb
-lib/arel/nodes/having.rb
 lib/arel/nodes/in.rb
+lib/arel/nodes/infix_operation.rb
 lib/arel/nodes/inner_join.rb
 lib/arel/nodes/insert_statement.rb
-lib/arel/nodes/intersect.rb
-lib/arel/nodes/join.rb
-lib/arel/nodes/less_than.rb
-lib/arel/nodes/less_than_or_equal.rb
-lib/arel/nodes/limit.rb
-lib/arel/nodes/lock.rb
-lib/arel/nodes/matches.rb
-lib/arel/nodes/max.rb
-lib/arel/nodes/min.rb
+lib/arel/nodes/join_source.rb
+lib/arel/nodes/named_function.rb
 lib/arel/nodes/node.rb
-lib/arel/nodes/not.rb
-lib/arel/nodes/not_equal.rb
-lib/arel/nodes/not_in.rb
-lib/arel/nodes/offset.rb
-lib/arel/nodes/on.rb
-lib/arel/nodes/or.rb
 lib/arel/nodes/ordering.rb
 lib/arel/nodes/outer_join.rb
 lib/arel/nodes/select_core.rb
 lib/arel/nodes/select_statement.rb
 lib/arel/nodes/sql_literal.rb
 lib/arel/nodes/string_join.rb
-lib/arel/nodes/sum.rb
 lib/arel/nodes/table_alias.rb
-lib/arel/nodes/top.rb
+lib/arel/nodes/terminal.rb
 lib/arel/nodes/unary.rb
-lib/arel/nodes/union.rb
-lib/arel/nodes/union_all.rb
 lib/arel/nodes/unqualified_column.rb
 lib/arel/nodes/update_statement.rb
 lib/arel/nodes/values.rb
+lib/arel/nodes/with.rb
+lib/arel/order_predications.rb
 lib/arel/predications.rb
 lib/arel/relation.rb
 lib/arel/select_manager.rb
@@ -79,6 +58,7 @@ lib/arel/update_manager.rb
 lib/arel/visitors.rb
 lib/arel/visitors/depth_first.rb
 lib/arel/visitors/dot.rb
+lib/arel/visitors/ibm_db.rb
 lib/arel/visitors/join_sql.rb
 lib/arel/visitors/mssql.rb
 lib/arel/visitors/mysql.rb
@@ -92,10 +72,12 @@ lib/arel/visitors/where_sql.rb
 test/attributes/test_attribute.rb
 test/helper.rb
 test/nodes/test_as.rb
+test/nodes/test_bin.rb
 test/nodes/test_count.rb
 test/nodes/test_delete_statement.rb
 test/nodes/test_equality.rb
 test/nodes/test_insert_statement.rb
+test/nodes/test_named_function.rb
 test/nodes/test_node.rb
 test/nodes/test_not.rb
 test/nodes/test_or.rb
@@ -109,12 +91,14 @@ test/test_activerecord_compat.rb
 test/test_attributes.rb
 test/test_crud.rb
 test/test_delete_manager.rb
+test/test_factory_methods.rb
 test/test_insert_manager.rb
 test/test_select_manager.rb
 test/test_table.rb
 test/test_update_manager.rb
 test/visitors/test_depth_first.rb
 test/visitors/test_dot.rb
+test/visitors/test_ibm_db.rb
 test/visitors/test_join_sql.rb
 test/visitors/test_mssql.rb
 test/visitors/test_mysql.rb

data/README.markdown

@@ -4,7 +4,14 @@
 
 ## DESCRIPTION
 
-Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be a framework framework; that is, you can build your own ORM with it, focusing on innovative object and collection modeling as opposed to database compatibility and query generation.
+Arel is a SQL AST manager for Ruby. It
+
+1. Simplifies the generation complex of SQL queries
+2. Adapts to various RDBMS systems
+
+It is intended to be a framework framework; that is, you can build your own ORM
+with it, focusing on innovative object and collection modeling as opposed to
+database compatibility and query generation.
 
 ## Status
 
@@ -19,8 +26,8 @@ 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::Table.new(:users)
-    users.project(Arel.sql('*'))
-    users.to_sql
+    query = users.project(Arel.sql('*'))
+    query.to_sql
 
 ### More Sophisticated Queries
 
@@ -74,6 +81,23 @@ The `AND` operator behaves similarly.
 
 The examples above are fairly simple and other libraries match or come close to matching the expressiveness of Arel (e.g., `Sequel` in Ruby).
 
+#### Inline math operations
+
+Suppose we have a table `products` with prices in different currencies. And we have a table currency_rates, of constantly changing currency rates. In Arel:
+
+    products = Arel::Table.new(:products)
+    products.columns # => [products[:id], products[:name], products[:price], products[:currency_id]]
+
+    currency_rates = Arel::Table.new(:currency_rates)
+    currency_rates.columns # => [currency_rates[:from_id], currency_rates[:to_id], currency_rates[:date], currency_rates[:rate]]
+
+Now, to order products by price in user preferred currency simply call:
+
+    products.
+      join(:currency_rates).on(products[:currency_id].eq(currency_rates[:from_id])).
+      where(currency_rates[:to_id].eq(user_preferred_currency), currency_rates[:date].eq(Date.today)).
+      order(products[:price] * currency_rates[:rate])
+
 #### Complex Joins
 
 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:

data/Rakefile

@@ -15,6 +15,4 @@ Hoe.spec 'arel' do
 
   self.readme_file      = 'README.markdown'
   self.extra_rdoc_files = FileList['README.markdown']
-  self.extra_dev_deps << [ 'hoe', '>= 2.1.0' ]
-  self.extra_dev_deps << [ 'minitest', '>= 1.6.0' ]
 end

data/arel.gemspec

@@ -2,41 +2,42 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arel}
-  s.version = "2.0.9.20110222133018"
+  s.version = "2.1.0.20110430172428"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson", "Bryan Halmkamp", "Emilio Tagua", "Nick Kallen"]
-  s.date = %q{2011-02-22}
-  s.description = %q{Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be a framework framework; that is, you can build your own ORM with it, focusing on innovative object and collection modeling as opposed to database compatibility and query generation.}
+  s.date = %q{2011-04-30}
+  s.description = %q{Arel is a SQL AST manager for Ruby. It
+
+1. Simplifies the generation complex of SQL queries
+2. Adapts to various RDBMS systems
+
+It is intended to be a framework framework; that is, you can build your own ORM
+with it, focusing on innovative object and collection modeling as opposed to
+database compatibility and query generation.}
   s.email = ["aaron@tenderlovemaking.com", "bryan@brynary.com", "miloops@gmail.com", "nick@example.org"]
   s.extra_rdoc_files = ["History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown"]
-  s.files = [".autotest", "History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown", "Rakefile", "arel.gemspec", "lib/arel.rb", "lib/arel/attributes.rb", "lib/arel/attributes/attribute.rb", "lib/arel/compatibility/wheres.rb", "lib/arel/crud.rb", "lib/arel/delete_manager.rb", "lib/arel/deprecated.rb", "lib/arel/expression.rb", "lib/arel/expressions.rb", "lib/arel/insert_manager.rb", "lib/arel/nodes.rb", "lib/arel/nodes/and.rb", "lib/arel/nodes/as.rb", "lib/arel/nodes/assignment.rb", "lib/arel/nodes/avg.rb", "lib/arel/nodes/between.rb", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "lib/arel/nodes/does_not_match.rb", "lib/arel/nodes/equality.rb", "lib/arel/nodes/except.rb", "lib/arel/nodes/exists.rb", "lib/arel/nodes/function.rb", "lib/arel/nodes/greater_than.rb", "lib/arel/nodes/greater_than_or_equal.rb", "lib/arel/nodes/group.rb", "lib/arel/nodes/grouping.rb", "lib/arel/nodes/having.rb", "lib/arel/nodes/in.rb", "lib/arel/nodes/inner_join.rb", "lib/arel/nodes/insert_statement.rb", "lib/arel/nodes/intersect.rb", "lib/arel/nodes/join.rb", "lib/arel/nodes/less_than.rb", "lib/arel/nodes/less_than_or_equal.rb", "lib/arel/nodes/limit.rb", "lib/arel/nodes/lock.rb", "lib/arel/nodes/matches.rb", "lib/arel/nodes/max.rb", "lib/arel/nodes/min.rb", "lib/arel/nodes/node.rb", "lib/arel/nodes/not.rb", "lib/arel/nodes/not_equal.rb", "lib/arel/nodes/not_in.rb", "lib/arel/nodes/offset.rb", "lib/arel/nodes/on.rb", "lib/arel/nodes/or.rb", "lib/arel/nodes/ordering.rb", "lib/arel/nodes/outer_join.rb", "lib/arel/nodes/select_core.rb", "lib/arel/nodes/select_statement.rb", "lib/arel/nodes/sql_literal.rb", "lib/arel/nodes/string_join.rb", "lib/arel/nodes/sum.rb", "lib/arel/nodes/table_alias.rb", "lib/arel/nodes/top.rb", "lib/arel/nodes/unary.rb", "lib/arel/nodes/union.rb", "lib/arel/nodes/union_all.rb", "lib/arel/nodes/unqualified_column.rb", "lib/arel/nodes/update_statement.rb", "lib/arel/nodes/values.rb", "lib/arel/predications.rb", "lib/arel/relation.rb", "lib/arel/select_manager.rb", "lib/arel/sql/engine.rb", "lib/arel/sql_literal.rb", "lib/arel/table.rb", "lib/arel/tree_manager.rb", "lib/arel/update_manager.rb", "lib/arel/visitors.rb", "lib/arel/visitors/depth_first.rb", "lib/arel/visitors/dot.rb", "lib/arel/visitors/join_sql.rb", "lib/arel/visitors/mssql.rb", "lib/arel/visitors/mysql.rb", "lib/arel/visitors/oracle.rb", "lib/arel/visitors/order_clauses.rb", "lib/arel/visitors/postgresql.rb", "lib/arel/visitors/sqlite.rb", "lib/arel/visitors/to_sql.rb", "lib/arel/visitors/visitor.rb", "lib/arel/visitors/where_sql.rb", "test/attributes/test_attribute.rb", "test/helper.rb", "test/nodes/test_as.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_equality.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_node.rb", "test/nodes/test_not.rb", "test/nodes/test_or.rb", "test/nodes/test_select_core.rb", "test/nodes/test_select_statement.rb", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_update_statement.rb", "test/support/fake_record.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dot.rb", "test/visitors/test_join_sql.rb", "test/visitors/test_mssql.rb", "test/visitors/test_mysql.rb", "test/visitors/test_oracle.rb", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
+  s.files = [".autotest", ".gemtest", "History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown", "Rakefile", "arel.gemspec", "lib/arel.rb", "lib/arel/alias_predication.rb", "lib/arel/attributes.rb", "lib/arel/attributes/attribute.rb", "lib/arel/compatibility/wheres.rb", "lib/arel/crud.rb", "lib/arel/delete_manager.rb", "lib/arel/deprecated.rb", "lib/arel/expression.rb", "lib/arel/expressions.rb", "lib/arel/factory_methods.rb", "lib/arel/insert_manager.rb", "lib/arel/math.rb", "lib/arel/nodes.rb", "lib/arel/nodes/and.rb", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "lib/arel/nodes/equality.rb", "lib/arel/nodes/function.rb", "lib/arel/nodes/in.rb", "lib/arel/nodes/infix_operation.rb", "lib/arel/nodes/inner_join.rb", "lib/arel/nodes/insert_statement.rb", "lib/arel/nodes/join_source.rb", "lib/arel/nodes/named_function.rb", "lib/arel/nodes/node.rb", "lib/arel/nodes/ordering.rb", "lib/arel/nodes/outer_join.rb", "lib/arel/nodes/select_core.rb", "lib/arel/nodes/select_statement.rb", "lib/arel/nodes/sql_literal.rb", "lib/arel/nodes/string_join.rb", "lib/arel/nodes/table_alias.rb", "lib/arel/nodes/terminal.rb", "lib/arel/nodes/unary.rb", "lib/arel/nodes/unqualified_column.rb", "lib/arel/nodes/update_statement.rb", "lib/arel/nodes/values.rb", "lib/arel/nodes/with.rb", "lib/arel/order_predications.rb", "lib/arel/predications.rb", "lib/arel/relation.rb", "lib/arel/select_manager.rb", "lib/arel/sql/engine.rb", "lib/arel/sql_literal.rb", "lib/arel/table.rb", "lib/arel/tree_manager.rb", "lib/arel/update_manager.rb", "lib/arel/visitors.rb", "lib/arel/visitors/depth_first.rb", "lib/arel/visitors/dot.rb", "lib/arel/visitors/ibm_db.rb", "lib/arel/visitors/join_sql.rb", "lib/arel/visitors/mssql.rb", "lib/arel/visitors/mysql.rb", "lib/arel/visitors/oracle.rb", "lib/arel/visitors/order_clauses.rb", "lib/arel/visitors/postgresql.rb", "lib/arel/visitors/sqlite.rb", "lib/arel/visitors/to_sql.rb", "lib/arel/visitors/visitor.rb", "lib/arel/visitors/where_sql.rb", "test/attributes/test_attribute.rb", "test/helper.rb", "test/nodes/test_as.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_equality.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_named_function.rb", "test/nodes/test_node.rb", "test/nodes/test_not.rb", "test/nodes/test_or.rb", "test/nodes/test_select_core.rb", "test/nodes/test_select_statement.rb", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_update_statement.rb", "test/support/fake_record.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_factory_methods.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dot.rb", "test/visitors/test_ibm_db.rb", "test/visitors/test_join_sql.rb", "test/visitors/test_mssql.rb", "test/visitors/test_mysql.rb", "test/visitors/test_oracle.rb", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
   s.homepage = %q{http://github.com/rails/arel}
   s.rdoc_options = ["--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{arel}
-  s.rubygems_version = %q{1.5.0}
-  s.summary = %q{Arel is a Relational Algebra for Ruby}
-  s.test_files = ["test/attributes/test_attribute.rb", "test/nodes/test_as.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_equality.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_node.rb", "test/nodes/test_not.rb", "test/nodes/test_or.rb", "test/nodes/test_select_core.rb", "test/nodes/test_select_statement.rb", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_update_statement.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dot.rb", "test/visitors/test_join_sql.rb", "test/visitors/test_mssql.rb", "test/visitors/test_mysql.rb", "test/visitors/test_oracle.rb", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
+  s.rubygems_version = %q{1.6.1}
+  s.summary = %q{Arel is a SQL AST manager for Ruby}
+  s.test_files = ["test/attributes/test_attribute.rb", "test/nodes/test_as.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_equality.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_named_function.rb", "test/nodes/test_node.rb", "test/nodes/test_not.rb", "test/nodes/test_or.rb", "test/nodes/test_select_core.rb", "test/nodes/test_select_statement.rb", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_update_statement.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_factory_methods.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dot.rb", "test/visitors/test_ibm_db.rb", "test/visitors/test_join_sql.rb", "test/visitors/test_mssql.rb", "test/visitors/test_mysql.rb", "test/visitors/test_oracle.rb", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, [">= 2.0.0"])
-      s.add_development_dependency(%q<hoe>, [">= 2.1.0"])
-      s.add_development_dependency(%q<minitest>, [">= 1.6.0"])
-      s.add_development_dependency(%q<hoe>, [">= 2.8.0"])
+      s.add_development_dependency(%q<minitest>, [">= 2.0.2"])
+      s.add_development_dependency(%q<hoe>, [">= 2.9.1"])
     else
-      s.add_dependency(%q<minitest>, [">= 2.0.0"])
-      s.add_dependency(%q<hoe>, [">= 2.1.0"])
-      s.add_dependency(%q<minitest>, [">= 1.6.0"])
-      s.add_dependency(%q<hoe>, [">= 2.8.0"])
+      s.add_dependency(%q<minitest>, [">= 2.0.2"])
+      s.add_dependency(%q<hoe>, [">= 2.9.1"])
     end
   else
-    s.add_dependency(%q<minitest>, [">= 2.0.0"])
-    s.add_dependency(%q<hoe>, [">= 2.1.0"])
-    s.add_dependency(%q<minitest>, [">= 1.6.0"])
-    s.add_dependency(%q<hoe>, [">= 2.8.0"])
+    s.add_dependency(%q<minitest>, [">= 2.0.2"])
+    s.add_dependency(%q<hoe>, [">= 2.9.1"])
   end
 end

data/lib/arel.rb

@@ -1,7 +1,11 @@
 require 'arel/crud'
+require 'arel/factory_methods'
 
 require 'arel/expressions'
 require 'arel/predications'
+require 'arel/math'
+require 'arel/alias_predication'
+require 'arel/order_predications'
 require 'arel/table'
 require 'arel/attributes'
 require 'arel/compatibility/wheres'
@@ -29,11 +33,15 @@ require 'arel/sql_literal'
 ####
 
 module Arel
-  VERSION = '2.0.10'
+  VERSION = '2.1.0'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql
   end
+
+  def self.star
+    sql '*'
+  end
   ## Convenience Alias
   Node = Arel::Nodes::Node
 end

data/lib/arel/alias_predication.rb

@@ -0,0 +1,7 @@
+module Arel
+  module AliasPredication
+    def as other
+      Nodes::As.new self, Nodes::SqlLiteral.new(other)
+    end
+  end
+end

data/lib/arel/attributes/attribute.rb

@@ -1,8 +1,17 @@
 module Arel
   module Attributes
-    class Attribute < Struct.new :relation, :name, :column
+    class Attribute < Struct.new :relation, :name
       include Arel::Expressions
       include Arel::Predications
+      include Arel::AliasPredication
+      include Arel::OrderPredications
+      include Arel::Math
+
+      ###
+      # Create a node for lowering this attribute
+      def lower
+        relation.lower self
+      end
     end
 
     class String    < Attribute; end

data/lib/arel/crud.rb

@@ -2,12 +2,11 @@ module Arel
   ###
   # FIXME hopefully we can remove this
   module Crud
-    # FIXME: this method should go away
-    def update values
+    def compile_update values
       um = UpdateManager.new @engine
 
       if Nodes::SqlLiteral === values
-        relation = @ctx.froms
+        relation = @ctx.from
       else
         relation = values.first.first.relation
       end
@@ -16,22 +15,58 @@ module Arel
       um.take @ast.limit.expr if @ast.limit
       um.order(*@ast.orders)
       um.wheres = @ctx.wheres
+      um
+    end
+
+    # FIXME: this method should go away
+    def update values
+      if $VERBOSE
+        warn <<-eowarn
+update (#{caller.first}) is deprecated and will be removed in ARel 3.0.0. Please
+switch to `compile_update`
+        eowarn
+      end
 
+      um = compile_update values
       @engine.connection.update um.to_sql, 'AREL'
     end
 
+    def compile_insert values
+      im = create_insert
+      im.insert values
+      im
+    end
+
+    def create_insert
+      InsertManager.new @engine
+    end
+
     # FIXME: this method should go away
     def insert values
-      im = InsertManager.new @engine
-      im.insert values
-      @engine.connection.insert im.to_sql
+      if $VERBOSE
+        warn <<-eowarn
+insert (#{caller.first}) is deprecated and will be removed in ARel 3.0.0. Please
+switch to `compile_insert`
+        eowarn
+      end
+      @engine.connection.insert compile_insert(values).to_sql
     end
 
-    def delete
+    def compile_delete
       dm = DeleteManager.new @engine
       dm.wheres = @ctx.wheres
       dm.from @ctx.froms
-      @engine.connection.delete dm.to_sql, 'AREL'
+      dm
+    end
+
+    def delete
+      if $VERBOSE
+        warn <<-eowarn
+delete (#{caller.first}) is deprecated and will be removed in ARel 3.0.0. Please
+switch to `compile_delete`
+        eowarn
+      end
+      @engine.connection.delete compile_delete.to_sql, 'AREL'
     end
   end
 end

data/lib/arel/expression.rb

@@ -1,4 +1,5 @@
 module Arel
   module Expression
+    include Arel::OrderPredications
   end
 end

data/lib/arel/factory_methods.rb

@@ -0,0 +1,35 @@
+module Arel
+  ###
+  # Methods for creating various nodes
+  module FactoryMethods
+    def create_table_alias relation, name
+      Nodes::TableAlias.new(relation, name)
+    end
+
+    def create_join to, constraint = nil, klass = Nodes::InnerJoin
+      klass.new(to, constraint)
+    end
+
+    def create_string_join to
+      create_join to, nil, Nodes::StringJoin
+    end
+
+    def create_and clauses
+      Nodes::And.new clauses
+    end
+
+    def create_on expr
+      Nodes::On.new expr
+    end
+
+    def grouping expr
+      Nodes::Grouping.new expr
+    end
+
+    ###
+    # Create a LOWER() function
+    def lower column
+      Nodes::NamedFunction.new 'LOWER', [column]
+    end
+  end
+end