arel 5.0.1.20140414130214 → 6.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86a3156add2973e4e2cd8b3a852e82c26c073601
-  data.tar.gz: 06fc106d1ef5fdc41de327a78a8e0b467096202b
+  metadata.gz: b103196a0f761d65ab71b2ac1e03d779de9e219d
+  data.tar.gz: 9cb4e0384586df861b130b6f64ad01c85235f1ac
 SHA512:
-  metadata.gz: ba39500686768a6865b688ce693dd6bc69e2e7ea1a7acb52ab0ad1f0d00fefb85b537f4c5405e865abe67016c166f06503ded328c3b79c2a34156c8ed75e6293
-  data.tar.gz: 1d916874f785a6fc85a2df91633edbc4b607612c876160e6fce14d03ebc17694fd87be197b793ec44f89a68a9815dba07161717333fb15575e36419efae16508
+  metadata.gz: cdb5378f5ea5baf01ec44da940498565dadfb2b044047d9ec98f62b5aebe9bc802f79194dcd0936451d41f90238b265e0b534e3fce2ba94951913f9ebf0b9e5f
+  data.tar.gz: 651a4dba661f193f62c98af603e6a313a354ee772ba5e17e8830b653ac2ef794485f9a1f39ca8ca8702bfd74d66bb12d9b0f436873be5ca885de93033ce7b6d9

data/.travis.yml

@@ -1,10 +1,12 @@
-script: "rake test"
+script: 
+  - "rake test"
+  - "gem build arel.gemspec"
 rvm:
   - rbx
   - jruby
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
 matrix:
   allow_failures:
     - rvm: rbx

data/History.txt

@@ -1,9 +1,14 @@
-== 5.0.1 / 2014-04-14
+=== NEXT / 2014-02-10
 
- * Bug Fixes
+* Enhancements
 
-  * Fix `SqlLiteral` YAML serialization
-  * PostgreSQL bugfix for invalid SQL in subqueries
+  * Remove deprecated `Arel::Expression`
+  * Remove deprecated `Arel::SqlLiteral`
+  * Remove deprecated `SelectManager#joins`
+  * Remove deprecated `SelectManager#to_a`
+  * Remove deprecated `Arel::Sql::Engine`
+  * Remove deprecated `Arel::InnerJoin` constant
+  * Remove deprecated `Arel::OuterJoin` constant
 
 == 5.0.0 / 2013-12-04
 

data/Manifest.txt

@@ -12,11 +12,12 @@ lib/arel.rb
 lib/arel/alias_predication.rb
 lib/arel/attributes.rb
 lib/arel/attributes/attribute.rb
+lib/arel/collectors/bind.rb
+lib/arel/collectors/plain_string.rb
+lib/arel/collectors/sql_string.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
@@ -31,6 +32,7 @@ lib/arel/nodes/descending.rb
 lib/arel/nodes/equality.rb
 lib/arel/nodes/extract.rb
 lib/arel/nodes/false.rb
+lib/arel/nodes/full_outer_join.rb
 lib/arel/nodes/function.rb
 lib/arel/nodes/grouping.rb
 lib/arel/nodes/in.rb
@@ -42,6 +44,7 @@ lib/arel/nodes/named_function.rb
 lib/arel/nodes/node.rb
 lib/arel/nodes/outer_join.rb
 lib/arel/nodes/over.rb
+lib/arel/nodes/right_outer_join.rb
 lib/arel/nodes/select_core.rb
 lib/arel/nodes/select_statement.rb
 lib/arel/nodes/sql_literal.rb
@@ -58,29 +61,29 @@ lib/arel/nodes/with.rb
 lib/arel/order_predications.rb
 lib/arel/predications.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/bind_substitute.rb
 lib/arel/visitors/bind_visitor.rb
 lib/arel/visitors/depth_first.rb
 lib/arel/visitors/dot.rb
 lib/arel/visitors/ibm_db.rb
 lib/arel/visitors/informix.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/reduce.rb
 lib/arel/visitors/sqlite.rb
 lib/arel/visitors/to_sql.rb
 lib/arel/visitors/visitor.rb
 lib/arel/visitors/where_sql.rb
 lib/arel/window_predications.rb
 test/attributes/test_attribute.rb
+test/collectors/test_bind_collector.rb
+test/collectors/test_sql_string.rb
 test/helper.rb
 test/nodes/test_and.rb
 test/nodes/test_as.rb
@@ -124,7 +127,6 @@ test/visitors/test_dispatch_contamination.rb
 test/visitors/test_dot.rb
 test/visitors/test_ibm_db.rb
 test/visitors/test_informix.rb
-test/visitors/test_join_sql.rb
 test/visitors/test_mssql.rb
 test/visitors/test_mysql.rb
 test/visitors/test_oracle.rb

data/README.markdown

@@ -1,9 +1,11 @@
-# Arel [![Build Status](https://secure.travis-ci.org/rails/arel.png)](http://travis-ci.org/rails/arel) [![Dependency Status](https://gemnasium.com/rails/arel.png)](https://gemnasium.com/rails/arel)
+# Arel [![Build Status](https://secure.travis-ci.org/rails/arel.svg?branch=master)](http://travis-ci.org/rails/arel) [![Dependency Status](https://gemnasium.com/rails/arel.svg)](https://gemnasium.com/rails/arel)
 
 * http://github.com/rails/arel
 
 ## DESCRIPTION
 
+Arel Really Exasperates Logicians
+
 Arel is a SQL AST manager for Ruby. It
 
 1. Simplifies the generation of complex SQL queries
@@ -35,7 +37,7 @@ query.to_sql
 
 ### More Sophisticated Queries
 
-Here is a whirlwind tour through the most common relational operators. These will probably cover 80% of all interaction with the database.
+Here is a whirlwind tour through the most common SQL operators. These will probably cover 80% of all interaction with the database.
 
 First is the 'restriction' operator, `where`:
 
@@ -51,6 +53,18 @@ users.project(users[:id])
 # => SELECT users.id FROM users
 ```
 
+Comparison operators `=`, `!=`, `<`, `>`, `<=`, `>=`, `IN`:
+
+```ruby
+users.where(users[:age].eq(10)).project(Arel.sql('*')) # => SELECT * FROM "users"  WHERE "users"."age" = 10
+users.where(users[:age].not_eq(10)).project(Arel.sql('*')) # => SELECT * FROM "users"  WHERE "users"."age" != 10
+users.where(users[:age].lt(10)).project(Arel.sql('*')) # => SELECT * FROM "users"  WHERE "users"."age" < 10
+users.where(users[:age].gt(10)).project(Arel.sql('*')) # => SELECT * FROM "users"  WHERE "users"."age" > 10
+users.where(users[:age].lteq(10)).project(Arel.sql('*')) # => SELECT * FROM "users"  WHERE "users"."age" <= 10
+users.where(users[:age].gteq(10)).project(Arel.sql('*')) # => SELECT * FROM "users"  WHERE "users"."age" >= 10
+users.where(users[:age].in([20, 16, 17])).project(Arel.sql('*')) # => SELECT * FROM "users"  WHERE "users"."age" IN (20, 16, 17)
+```
+
 Joins resemble SQL strongly:
 
 ```ruby
@@ -58,6 +72,13 @@ users.join(photos).on(users[:id].eq(photos[:user_id]))
 # => SELECT * FROM users INNER JOIN photos ON users.id = photos.user_id
 ```
 
+Left Joins
+
+```ruby
+users.join(photos, Arel::Nodes::OuterJoin).on(users[:id].eq(photos[:user_id]))
+# => SELECT FROM users LEFT OUTER JOIN photos ON users.id = photos.user_id
+```
+
 What are called `LIMIT` and `OFFSET` in SQL are called `take` and `skip` in Arel:
 
 ```ruby
@@ -72,7 +93,7 @@ users.project(users[:name]).group(users[:name])
 # => SELECT users.name FROM users GROUP BY users.name
 ```
 
-The best property of the Relational Algebra is its "composability", or closure under all operations. For example, to restrict AND project, just "chain" the method invocations:
+The best property of arel is its "composability", or closure under all operations. For example, to restrict AND project, just "chain" the method invocations:
 
 ```ruby
 users                                 \
@@ -95,6 +116,23 @@ users.where(users[:name].eq('bob').or(users[:age].lt(25)))
 
 The `AND` operator behaves similarly.
 
+Aggregate functions `AVG`, `SUM`, `COUNT`, `MIN`, `MAX`, `HAVING`:
+
+```ruby
+photos.group(photos[:user_id]).having(photos[:id].count.gt(5)) # => SELECT FROM photos GROUP BY photos.user_id HAVING COUNT(photos.id) > 5
+users.project(users[:age].sum) # => SELECT SUM(users.age) AS sum_id FROM users
+users.project(users[:age].average) # => SELECT AVG(users.age) AS avg_id FROM users
+users.project(users[:age].maximum) # => SELECT MAX(users.age) AS max_id FROM users
+users.project(users[:age].minimum) # => SELECT MIN(users.age) AS min_id FROM users
+users.project(users[:age].count) # => SELECT COUNT(users.age) FROM users
+```
+
+Aliasing Aggregate Functions:
+
+```ruby
+users.project(users[:age].average.as("mean_age")) # => SELECT AVG(users.age) AS mean_age FROM users
+```
+
 ### The Crazy Features
 
 The examples above are fairly simple and other libraries match or come close to matching the expressiveness of Arel (e.g., `Sequel` in Ruby).
@@ -122,7 +160,7 @@ products.
 
 #### 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:
+Where Arel really shines is 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:
 
 ```ruby
 comments = Arel::Table.new(:comments)
@@ -134,16 +172,55 @@ And this table has the following attributes:
 # [:id, :body, :parent_id]
 ```
 
-The `parent_id` column is a foreign key from the `comments` table to itself. Now, joining a table to itself requires aliasing in SQL. In fact, you may alias in Arel as well:
+The `parent_id` column is a foreign key from the `comments` table to itself.
+Joining a table to itself requires aliasing in SQL. This aliasing can be handled from Arel as below:
 
 ```ruby
 replies = comments.alias
 comments_with_replies = \
-  comments.join(replies).on(replies[:parent_id].eq(comments[:id]))
-# => SELECT * FROM comments INNER JOIN comments AS comments_2 WHERE comments_2.parent_id = comments.id
+  comments.join(replies).on(replies[:parent_id].eq(comments[:id])).where(comments[:id].eq(1))
+# => SELECT * FROM comments INNER JOIN comments AS comments_2 WHERE comments_2.parent_id = comments.id AND comments.id = 1
+```
+
+This will return the reply for the first comment.
+
+[Common Table Expresssions(CTE)](https://en.wikipedia.org/wiki/Common_table_expressions#Common_table_expression) support via:
+
+Create a `CTE`
+
+```ruby
+cte_table = Arel::Table.new(:cte_table)
+composed_cte = Arel::Nodes::As.new(cte_table, photos.where(photos[:created_at].gt(Date.current)))
 ```
 
-This will return the first comment's reply's body.
+Use the created `CTE`:
+
+```ruby
+users.
+  join(cte_table).on(users[:id].eq(cte_table[:user_id])).
+  project(users[:id], cte_table[:click].sum).
+  with(composed_cte)
+
+# => WITH cte_table AS (SELECT FROM photos  WHERE photos.created_at > '2014-05-02') SELECT users.id, SUM(cte_table.click) AS sum_id FROM users INNER JOIN cte_table ON users.id = cte_table.user_id
+```
+
+When your query is too complex for `Arel`, you can use `Arel::SqlLiteral`:
+
+```ruby
+photo_clicks = Arel::Nodes::SqlLiteral.new(<<-SQL
+    CASE WHEN condition1 THEN calculation1
+    WHEN condition2 THEN calculation2
+    WHEN condition3 THEN calculation3
+    ELSE default_calculation END
+SQL
+)
+photos.project(photo_clicks.as("photo_clicks"))
+# => SELECT CASE WHEN condition1 THEN calculation1
+    WHEN condition2 THEN calculation2
+    WHEN condition3 THEN calculation3
+    ELSE default_calculation END
+ FROM "photos"
+```
 
 ### License
 

data/Rakefile

@@ -10,7 +10,7 @@ Hoe.plugin :bundler # `gem install hoe-bundler`
 
 Hoe.spec 'arel' do
   developer('Aaron Patterson', 'aaron@tenderlovemaking.com')
-  developer('Bryan Halmkamp', 'bryan@brynary.com')
+  developer('Bryan Helmkamp', 'bryan@brynary.com')
   developer('Emilio Tagua', 'miloops@gmail.com')
   developer('Nick Kallen', 'nick@example.org') # FIXME: need Nick's email
 

data/arel.gemspec

@@ -1,41 +1,40 @@
 # -*- encoding: utf-8 -*-
-# stub: arel 5.0.1.20140414130214 ruby lib
+# stub: arel 6.0.0.beta1.20140817224534 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "arel"
-  s.version = "5.0.1.20140414130214"
+  s.version = "6.0.0.beta1.20140817224534"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
-  s.authors = ["Aaron Patterson", "Bryan Halmkamp", "Emilio Tagua", "Nick Kallen"]
-  s.date = "2014-04-14"
-  s.description = "Arel is a SQL AST manager for Ruby. It\n\n1. Simplifies the generation of complex SQL queries\n2. Adapts to various RDBMSes\n\nIt is intended to be a framework framework; that is, you can build your own ORM\nwith it, focusing on innovative object and collection modeling as opposed to\ndatabase compatibility and query generation."
+  s.authors = ["Aaron Patterson", "Bryan Helmkamp", "Emilio Tagua", "Nick Kallen"]
+  s.date = "2014-08-18"
+  s.description = "Arel Really Exasperates Logicians\n\nArel is a SQL AST manager for Ruby. It\n\n1. Simplifies the generation of complex SQL queries\n2. Adapts to various RDBMSes\n\nIt is intended to be a framework framework; that is, you can build your own ORM\nwith it, focusing on innovative object and collection modeling as opposed to\ndatabase 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", ".gemtest", ".travis.yml", "Gemfile", "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/ascending.rb", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "lib/arel/nodes/descending.rb", "lib/arel/nodes/equality.rb", "lib/arel/nodes/extract.rb", "lib/arel/nodes/false.rb", "lib/arel/nodes/function.rb", "lib/arel/nodes/grouping.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/outer_join.rb", "lib/arel/nodes/over.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/true.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/window.rb", "lib/arel/nodes/with.rb", "lib/arel/order_predications.rb", "lib/arel/predications.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/bind_visitor.rb", "lib/arel/visitors/depth_first.rb", "lib/arel/visitors/dot.rb", "lib/arel/visitors/ibm_db.rb", "lib/arel/visitors/informix.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", "lib/arel/window_predications.rb", "test/attributes/test_attribute.rb", "test/helper.rb", "test/nodes/test_and.rb", "test/nodes/test_as.rb", "test/nodes/test_ascending.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_descending.rb", "test/nodes/test_distinct.rb", "test/nodes/test_equality.rb", "test/nodes/test_extract.rb", "test/nodes/test_false.rb", "test/nodes/test_grouping.rb", "test/nodes/test_infix_operation.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_over.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_table_alias.rb", "test/nodes/test_true.rb", "test/nodes/test_update_statement.rb", "test/nodes/test_window.rb", "test/support/fake_record.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_bind_visitor.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dispatch_contamination.rb", "test/visitors/test_dot.rb", "test/visitors/test_ibm_db.rb", "test/visitors/test_informix.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", ".travis.yml", "Gemfile", "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/collectors/bind.rb", "lib/arel/collectors/plain_string.rb", "lib/arel/collectors/sql_string.rb", "lib/arel/compatibility/wheres.rb", "lib/arel/crud.rb", "lib/arel/delete_manager.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/ascending.rb", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "lib/arel/nodes/descending.rb", "lib/arel/nodes/equality.rb", "lib/arel/nodes/extract.rb", "lib/arel/nodes/false.rb", "lib/arel/nodes/full_outer_join.rb", "lib/arel/nodes/function.rb", "lib/arel/nodes/grouping.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/outer_join.rb", "lib/arel/nodes/over.rb", "lib/arel/nodes/right_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/true.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/window.rb", "lib/arel/nodes/with.rb", "lib/arel/order_predications.rb", "lib/arel/predications.rb", "lib/arel/select_manager.rb", "lib/arel/table.rb", "lib/arel/tree_manager.rb", "lib/arel/update_manager.rb", "lib/arel/visitors.rb", "lib/arel/visitors/bind_substitute.rb", "lib/arel/visitors/bind_visitor.rb", "lib/arel/visitors/depth_first.rb", "lib/arel/visitors/dot.rb", "lib/arel/visitors/ibm_db.rb", "lib/arel/visitors/informix.rb", "lib/arel/visitors/mssql.rb", "lib/arel/visitors/mysql.rb", "lib/arel/visitors/oracle.rb", "lib/arel/visitors/postgresql.rb", "lib/arel/visitors/reduce.rb", "lib/arel/visitors/sqlite.rb", "lib/arel/visitors/to_sql.rb", "lib/arel/visitors/visitor.rb", "lib/arel/visitors/where_sql.rb", "lib/arel/window_predications.rb", "test/attributes/test_attribute.rb", "test/collectors/test_bind_collector.rb", "test/collectors/test_sql_string.rb", "test/helper.rb", "test/nodes/test_and.rb", "test/nodes/test_as.rb", "test/nodes/test_ascending.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_descending.rb", "test/nodes/test_distinct.rb", "test/nodes/test_equality.rb", "test/nodes/test_extract.rb", "test/nodes/test_false.rb", "test/nodes/test_grouping.rb", "test/nodes/test_infix_operation.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_over.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_table_alias.rb", "test/nodes/test_true.rb", "test/nodes/test_update_statement.rb", "test/nodes/test_window.rb", "test/support/fake_record.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_bind_visitor.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dispatch_contamination.rb", "test/visitors/test_dot.rb", "test/visitors/test_ibm_db.rb", "test/visitors/test_informix.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 = "http://github.com/rails/arel"
   s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.markdown"]
-  s.rubyforge_project = "arel"
   s.rubygems_version = "2.2.2"
-  s.summary = "Arel is a SQL AST manager for Ruby"
-  s.test_files = ["test/attributes/test_attribute.rb", "test/nodes/test_and.rb", "test/nodes/test_as.rb", "test/nodes/test_ascending.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_descending.rb", "test/nodes/test_distinct.rb", "test/nodes/test_equality.rb", "test/nodes/test_extract.rb", "test/nodes/test_false.rb", "test/nodes/test_grouping.rb", "test/nodes/test_infix_operation.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_over.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_table_alias.rb", "test/nodes/test_true.rb", "test/nodes/test_update_statement.rb", "test/nodes/test_window.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_bind_visitor.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dispatch_contamination.rb", "test/visitors/test_dot.rb", "test/visitors/test_ibm_db.rb", "test/visitors/test_informix.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.summary = "Arel Really Exasperates Logicians  Arel is a SQL AST manager for Ruby"
+  s.test_files = ["test/attributes/test_attribute.rb", "test/collectors/test_bind_collector.rb", "test/collectors/test_sql_string.rb", "test/nodes/test_and.rb", "test/nodes/test_as.rb", "test/nodes/test_ascending.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_descending.rb", "test/nodes/test_distinct.rb", "test/nodes/test_equality.rb", "test/nodes/test_extract.rb", "test/nodes/test_false.rb", "test/nodes/test_grouping.rb", "test/nodes/test_infix_operation.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_over.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_table_alias.rb", "test/nodes/test_true.rb", "test/nodes/test_update_statement.rb", "test/nodes/test_window.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_bind_visitor.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dispatch_contamination.rb", "test/visitors/test_dot.rb", "test/visitors/test_ibm_db.rb", "test/visitors/test_informix.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 = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 5.3"])
+      s.add_development_dependency(%q<minitest>, ["~> 5.4"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.6"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.12"])
     else
-      s.add_dependency(%q<minitest>, ["~> 5.3"])
+      s.add_dependency(%q<minitest>, ["~> 5.4"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.6"])
+      s.add_dependency(%q<hoe>, ["~> 3.12"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 5.3"])
+    s.add_dependency(%q<minitest>, ["~> 5.4"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.6"])
+    s.add_dependency(%q<hoe>, ["~> 3.12"])
   end
 end

data/lib/arel.rb

@@ -11,10 +11,6 @@ require 'arel/table'
 require 'arel/attributes'
 require 'arel/compatibility/wheres'
 
-#### these are deprecated
-require 'arel/expression'
-####
-
 require 'arel/visitors'
 
 require 'arel/tree_manager'
@@ -24,15 +20,8 @@ require 'arel/update_manager'
 require 'arel/delete_manager'
 require 'arel/nodes'
 
-
-#### these are deprecated
-require 'arel/deprecated'
-require 'arel/sql/engine'
-require 'arel/sql_literal'
-####
-
 module Arel
-  VERSION = '5.0.1'
+  VERSION = '6.0.0.beta1'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

data/lib/arel/collectors/bind.rb

@@ -0,0 +1,36 @@
+module Arel
+  module Collectors
+    class Bind
+      def initialize
+        @parts = []
+      end
+
+      def << str
+        @parts << str
+        self
+      end
+
+      def add_bind bind
+        @parts << bind
+        self
+      end
+
+      def value; @parts; end
+
+      def substitute_binds bvs
+        bvs = bvs.dup
+        @parts.map do |val|
+          if Arel::Nodes::BindParam === val
+            bvs.shift
+          else
+            val
+          end
+        end
+      end
+
+      def compile bvs
+        substitute_binds(bvs).join
+      end
+    end
+  end
+end

data/lib/arel/collectors/plain_string.rb

@@ -0,0 +1,18 @@
+module Arel
+  module Collectors
+    class PlainString
+      def initialize
+        @str = ''
+      end
+
+      def value
+        @str
+      end
+
+      def << str
+        @str << str
+        self
+      end
+    end
+  end
+end

data/lib/arel/collectors/sql_string.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+require 'arel/collectors/plain_string'
+
+module Arel
+  module Collectors
+    class SQLString < PlainString
+      def add_bind bind
+        self << bind.to_s
+        self
+      end
+
+      def compile bvs
+        value
+      end
+    end
+  end
+end

data/lib/arel/factory_methods.rb

@@ -37,7 +37,7 @@ module Arel
     ###
     # Create a LOWER() function
     def lower column
-      Nodes::NamedFunction.new 'LOWER', [column]
+      Nodes::NamedFunction.new 'LOWER', [Nodes.build_quoted(column)]
     end
   end
 end