arel 4.0.2 → 5.0.1.20140414130214

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe1827bf9b3fb8d0df377a874b604c6d1fbb4387
-  data.tar.gz: 050b51b492c74c09be3aa3f4a58487ef3150c57b
+  metadata.gz: 86a3156add2973e4e2cd8b3a852e82c26c073601
+  data.tar.gz: 06fc106d1ef5fdc41de327a78a8e0b467096202b
 SHA512:
-  metadata.gz: 200b67f47b08b79e6b514035398fd8f00d810e786af0de57862ee68ec4ff228f68b036419273add78450df7c18f6da4b54b68e6b78eeacbb98575c40d426d2be
-  data.tar.gz: 692a06c47c099852541d12c6499ef2c9bbe0f943fc5f2023f6523e6a819c14d43e7add74e834b9aa0290a17156bc4bf38ba32d043daf6248e20765664104141c
+  metadata.gz: ba39500686768a6865b688ce693dd6bc69e2e7ea1a7acb52ab0ad1f0d00fefb85b537f4c5405e865abe67016c166f06503ded328c3b79c2a34156c8ed75e6293
+  data.tar.gz: 1d916874f785a6fc85a2df91633edbc4b607612c876160e6fce14d03ebc17694fd87be197b793ec44f89a68a9815dba07161717333fb15575e36419efae16508

data/.travis.yml

@@ -1,9 +1,13 @@
 script: "rake test"
 rvm:
-  - rbx-19mode
+  - rbx
   - jruby
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+matrix:
+  allow_failures:
+    - rvm: rbx
 notifications:
   email: false
   irc:

data/Gemfile

@@ -5,7 +5,7 @@
 source "https://rubygems.org/"
 
 
-gem "minitest", "~>4.4", :group => [:development, :test]
+gem "minitest", "~>5.1", :group => [:development, :test]
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe", "~>3.5", :group => [:development, :test]
 

data/History.txt

@@ -1,7 +1,24 @@
-=== 4.0.2 / 2014-02-05
+== 5.0.1 / 2014-04-14
+
+ * Bug Fixes
+
+  * Fix `SqlLiteral` YAML serialization
+  * PostgreSQL bugfix for invalid SQL in subqueries
+
+== 5.0.0 / 2013-12-04
+
+* Enhancements
+
+  * Remove deprecated code
 
 * Bug Fixes
 
+  * Fix serializing a relation when calling `to_yaml`
+
+=== 4.0.2 / 2014-02-05
+
+ * Bug Fixes
+
   * Fix `SqlLiteral` YAML serialization
   * PostgreSQL bugfix for invalid SQL in subqueries
 
@@ -17,6 +34,57 @@
   * Make visitors threadsafe by removing @last_column
   * Support `columns_for_distinct` with Oracle adapter
 
+== 3.0.3 / 2013-11-12
+
+* Enhancements
+
+  * Support ANSI 2003 window functions
+
+* Bug Fixes
+
+  * Fix joins in Informix
+
+== 3.0.2 / 2012-02-21
+
+* Enhancements
+
+  * Added a module for visiting and transforming bind values
+  * Fix in [] to be false, not in [] to be true
+
+* Bug Fixes
+
+  * Revert fix for LIMIT / OFFSET when query is ordered in Oracle
+
+== 3.0.1 / 2012-02-17
+
+* Bug Fixes
+
+  * Fixed LIMIT / OFFSET when query is ordered in Oracle
+
+== 3.0.0 / 2012-01-12
+
+* Enhancements
+
+  * Support connection pool and schema cache
+
+* Bug Fixes
+
+  * Conditions with no column can be followed by other conditions in Postgres
+
+== 2.2.3 / 2012-02-21
+
+* Enhancements
+
+  * Added a module for visiting and transforming bind values
+
+== 2.2.2 / 2012-02-20
+
+* Enhancements
+
+  * Support LOCK
+  * Allow using non-table alias as a right-hand relation name
+  * Added SelectManager#distinct
+
 == 2.2.1 / 2011-09-15
 
 * Enhancements

data/Manifest.txt

@@ -110,7 +110,6 @@ test/nodes/test_true.rb
 test/nodes/test_update_statement.rb
 test/nodes/test_window.rb
 test/support/fake_record.rb
-test/test_activerecord_compat.rb
 test/test_attributes.rb
 test/test_crud.rb
 test/test_delete_manager.rb

data/README.markdown

@@ -7,7 +7,7 @@
 Arel is a SQL AST manager for Ruby. It
 
 1. Simplifies the generation of complex SQL queries
-2. Adapts to various RDBMS systems
+2. Adapts to various RDBMSes
 
 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
@@ -87,12 +87,6 @@ All operators are chainable in this way, and they are chainable any number of ti
 users.where(users[:name].eq('bob')).where(users[:age].lt(25))
 ```
 
-Of course, many of the operators take multiple arguments, so the last example can be written more tersely:
-
-```ruby
-users.where(users[:name].eq('bob'), users[:age].lt(25))
-```
-
 The `OR` operator works like this:
 
 ```ruby
@@ -111,12 +105,10 @@ Suppose we have a table `products` with prices in different currencies. And we h
 
 ```ruby
 products = Arel::Table.new(:products)
-products.columns
-# => [products[:id], products[:name], products[:price], products[:currency_id]]
+# Attributes: [:id, :name, :price, :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]]
+# Attributes: [:from_id, :to_id, :date, :rate]
 ```
 
 Now, to order products by price in user preferred currency simply call:
@@ -139,8 +131,7 @@ comments = Arel::Table.new(:comments)
 And this table has the following attributes:
 
 ```ruby
-comments.columns
-# => [comments[:id], comments[:body], comments[:parent_id]]
+# [: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:

data/arel.gemspec

@@ -1,41 +1,41 @@
 # -*- encoding: utf-8 -*-
-# stub: arel 4.0.2.20140205180311 ruby lib
+# stub: arel 5.0.1.20140414130214 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "arel"
-  s.version = "4.0.2.20140205180311"
+  s.version = "5.0.1.20140414130214"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Aaron Patterson", "Bryan Halmkamp", "Emilio Tagua", "Nick Kallen"]
-  s.date = "2014-02-05"
-  s.description = "Arel is a SQL AST manager for Ruby. It\n\n1. Simplifies the generation of complex SQL queries\n2. Adapts to various RDBMS systems\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.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.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_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_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/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.homepage = "http://github.com/rails/arel"
   s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.markdown"]
   s.rubyforge_project = "arel"
-  s.rubygems_version = "2.2.0"
+  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_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_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.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"]
 
   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.2"])
+      s.add_development_dependency(%q<minitest>, ["~> 5.3"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.8"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.6"])
     else
-      s.add_dependency(%q<minitest>, ["~> 5.2"])
+      s.add_dependency(%q<minitest>, ["~> 5.3"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.8"])
+      s.add_dependency(%q<hoe>, ["~> 3.6"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 5.2"])
+    s.add_dependency(%q<minitest>, ["~> 5.3"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.8"])
+    s.add_dependency(%q<hoe>, ["~> 3.6"])
   end
 end

data/lib/arel/crud.rb

@@ -2,7 +2,7 @@ module Arel
   ###
   # FIXME hopefully we can remove this
   module Crud
-    def compile_update values
+    def compile_update values, pk
       um = UpdateManager.new @engine
 
       if Nodes::SqlLiteral === values
@@ -10,6 +10,7 @@ module Arel
       else
         relation = values.first.first.relation
       end
+      um.key = pk
       um.table relation
       um.set values
       um.take @ast.limit.expr if @ast.limit
@@ -18,19 +19,6 @@ module Arel
       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 4.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
@@ -41,17 +29,6 @@ switch to `compile_update`
       InsertManager.new @engine
     end
 
-    # FIXME: this method should go away
-    def insert values
-      if $VERBOSE
-        warn <<-eowarn
-insert (#{caller.first}) is deprecated and will be removed in Arel 4.0.0. Please
-switch to `compile_insert`
-        eowarn
-      end
-      @engine.connection.insert compile_insert(values).to_sql
-    end
-
     def compile_delete
       dm = DeleteManager.new @engine
       dm.wheres = @ctx.wheres
@@ -59,14 +36,5 @@ switch to `compile_insert`
       dm
     end
 
-    def delete
-      if $VERBOSE
-        warn <<-eowarn
-delete (#{caller.first}) is deprecated and will be removed in Arel 4.0.0. Please
-switch to `compile_delete`
-        eowarn
-      end
-      @engine.connection.delete compile_delete.to_sql, 'AREL'
-    end
   end
 end

data/lib/arel/select_manager.rb

@@ -2,6 +2,8 @@ module Arel
   class SelectManager < Arel::TreeManager
     include Arel::Crud
 
+    STRING_OR_SYMBOL_CLASS = [Symbol, String]
+
     def initialize engine, table = nil
       super(engine)
       @ast   = Nodes::SelectStatement.new
@@ -47,14 +49,6 @@ module Arel
       create_table_alias grouping(@ast), Nodes::SqlLiteral.new(other)
     end
 
-    def where_clauses
-      if $VERBOSE
-        warn "(#{caller.first}) where_clauses is deprecated and will be removed in arel 4.0.0 with no replacement"
-      end
-      to_sql = Visitors::ToSql.new @engine.connection
-      @ctx.wheres.map { |c| to_sql.accept c }
-    end
-
     def lock locking = Arel.sql('FOR UPDATE')
       case locking
       when true
@@ -136,7 +130,7 @@ module Arel
       # FIXME: converting these to SQLLiterals is probably not good, but
       # rails tests require it.
       @ctx.projections.concat projections.map { |x|
-        [Symbol, String].include?(x.class) ? SqlLiteral.new(x.to_s) : x
+        STRING_OR_SYMBOL_CLASS.include?(x.class) ? SqlLiteral.new(x.to_s) : x
       }
       self
     end
@@ -160,7 +154,7 @@ module Arel
     def order *expr
       # FIXME: We SHOULD NOT be converting these to SqlLiteral automatically
       @ast.orders.concat expr.map { |x|
-        String === x || Symbol === x ? Nodes::SqlLiteral.new(x.to_s) : x
+        STRING_OR_SYMBOL_CLASS.include?(x.class) ? Nodes::SqlLiteral.new(x.to_s) : x
       }
       self
     end
@@ -169,11 +163,6 @@ module Arel
       @ast.orders
     end
 
-    def wheres
-      warn "#{caller[0]}: SelectManager#wheres is deprecated and will be removed in Arel 4.0.0 with no replacement"
-      Compatibility::Wheres.new @engine.connection, @ctx.wheres
-    end
-
     def where_sql
       return if @ctx.wheres.empty?
 
@@ -272,31 +261,6 @@ module Arel
       @engine.connection.send(:select, to_sql, 'AREL').map { |x| Row.new(x) }
     end
 
-    # FIXME: this method should go away
-    def insert values
-      if $VERBOSE
-        warn <<-eowarn
-insert (#{caller.first}) is deprecated and will be removed in Arel 4.0.0. Please
-switch to `compile_insert`
-        eowarn
-      end
-
-      im = compile_insert(values)
-      table = @ctx.froms
-
-      primary_key      = table.primary_key
-      primary_key_name = primary_key.name if primary_key
-
-      # FIXME: in AR tests values sometimes were Array and not Hash therefore is_a?(Hash) check is added
-      primary_key_value = primary_key && values.is_a?(Hash) && values[primary_key]
-      im.into table
-      # Oracle adapter needs primary key name to generate RETURNING ... INTO ... clause
-      # for tables which assign primary key value using trigger.
-      # RETURNING ... INTO ... clause will be added only if primary_key_value is nil
-      # therefore it is necessary to pass primary key value as well
-      @engine.connection.insert im.to_sql, 'AREL', primary_key_name, primary_key_value
-    end
-
     private
     def collapse exprs, existing = nil
       exprs = exprs.unshift(existing.expr) if existing

data/lib/arel/table.rb

@@ -100,17 +100,6 @@ primary_key (#{caller.first}) is deprecated and will be removed in Arel 4.0.0
       from(self).having expr
     end
 
-    def columns
-      if $VERBOSE
-        warn <<-eowarn
-(#{caller.first}) Arel::Table#columns is deprecated and will be removed in
-Arel 4.0.0 with no replacement.  PEW PEW PEW!!!
-        eowarn
-      end
-      @columns ||=
-        attributes_for @engine.connection.columns(@name, "#{@name} Columns")
-    end
-
     def [] name
       ::Arel::Attribute.new self, name
     end
@@ -149,15 +138,5 @@ Arel 4.0.0 with no replacement.  PEW PEW PEW!!!
       end
     end
 
-    @@table_cache = nil
-    def self.table_cache engine # :nodoc:
-      if $VERBOSE
-        warn <<-eowarn
-(#{caller.first}) Arel::Table.table_cache is deprecated and will be removed in
-Arel 4.0.0 with no replacement.  PEW PEW PEW!!!
-        eowarn
-      end
-      @@table_cache ||= Hash[engine.connection.tables.map { |x| [x,true] }]
-    end
   end
 end

data/lib/arel/tree_manager.rb

@@ -4,9 +4,12 @@ module Arel
 
     attr_reader :ast, :engine
 
+    attr_accessor :bind_values
+
     def initialize engine
       @engine = engine
       @ctx    = nil
+      @bind_values = []
     end
 
     def to_dot

data/lib/arel/visitors/mssql.rb

@@ -62,8 +62,8 @@ module Arel
         x.projections.length == 1 && Arel::Nodes::Count === x.projections.first
       end
 
-      # fixme raise exception of there is no pk?
-      # fixme!! Table.primary_key will be depricated. What is the replacement??
+      # FIXME raise exception of there is no pk?
+      # FIXME!! Table.primary_key will be deprecated. What is the replacement??
       def find_left_table_pk o, a
         return visit o.primary_key, a if o.instance_of? Arel::Table
         find_left_table_pk o.left, a if o.kind_of? Arel::Nodes::Join

data/lib/arel/visitors/to_sql.rb

@@ -42,6 +42,10 @@ module Arel
       # `getconstant` should be a hash lookup, and no object is duped when the
       # value of the constant is pushed on the stack.  Hence the crazy
       # constants below.
+      #
+      # `matches` and `doesNotMatch` operate case-insensitively via Visitor subclasses
+      # specialized for specific databases when necessary.
+      #
 
       WHERE    = ' WHERE '    # :nodoc:
       SPACE    = ' '          # :nodoc:
@@ -85,17 +89,7 @@ module Arel
         if o.orders.empty? && o.limit.nil?
           wheres = o.wheres
         else
-          key = o.key
-          unless key
-            warn(<<-eowarn) if $VERBOSE
-(#{caller.first}) Using UpdateManager without setting UpdateManager#key is
-deprecated and support will be removed in Arel 4.0.0.  Please set the primary
-key on UpdateManager using UpdateManager#key= '#{key.inspect}'
-            eowarn
-            key = o.relation.primary_key
-          end
-
-          wheres = [Nodes::In.new(key, [build_subselect(key, o)])]
+          wheres = [Nodes::In.new(o.key, [build_subselect(o.key, o)])]
         end
 
         [

data/lib/arel.rb

@@ -32,7 +32,7 @@ require 'arel/sql_literal'
 ####
 
 module Arel
-  VERSION = '4.0.2'
+  VERSION = '5.0.1'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

data/test/nodes/test_ascending.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 module Arel
   module Nodes
-    class TestAscending < MiniTest::Unit::TestCase
+    class TestAscending < Minitest::Test
       def test_construct
         ascending = Ascending.new 'zomg'
         assert_equal 'zomg', ascending.expr

data/test/nodes/test_bin.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 module Arel
   module Nodes
-    class TestBin < MiniTest::Unit::TestCase
+    class TestBin < Minitest::Test
       def test_new
         assert Arel::Nodes::Bin.new('zomg')
       end

data/test/nodes/test_descending.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 module Arel
   module Nodes
-    class TestDescending < MiniTest::Unit::TestCase
+    class TestDescending < Minitest::Test
       def test_construct
         descending = Descending.new 'zomg'
         assert_equal 'zomg', descending.expr

data/test/nodes/test_infix_operation.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 module Arel
   module Nodes
-    class TestInfixOperation < MiniTest::Unit::TestCase
+    class TestInfixOperation < Minitest::Test
       def test_construct
         operation = InfixOperation.new :+, 1, 2
         assert_equal :+, operation.operator

data/test/nodes/test_named_function.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 module Arel
   module Nodes
-    class TestNamedFunction < MiniTest::Unit::TestCase
+    class TestNamedFunction < Minitest::Test
       def test_construct
         function = NamedFunction.new 'omg', 'zomg'
         assert_equal 'omg', function.name

data/test/nodes/test_node.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 module Arel
-  class TestNode < MiniTest::Unit::TestCase
+  class TestNode < Minitest::Test
     def test_includes_factory_methods
       assert Node.new.respond_to?(:create_join)
     end

data/test/nodes/test_select_core.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 module Arel
   module Nodes
-    class TestSelectCore < MiniTest::Unit::TestCase
+    class TestSelectCore < Minitest::Test
       def test_clone
         core = Arel::Nodes::SelectCore.new
         core.froms       = %w[a b c]

data/test/test_crud.rb

@@ -45,7 +45,7 @@ module Arel
         table = Table.new :users
         fc = FakeCrudder.new
         fc.from table
-        stmt = fc.compile_update [[table[:id], 'foo']]
+        stmt = fc.compile_update [[table[:id], 'foo']], Arel::Attributes::Attribute.new(table, 'id')
         assert_instance_of Arel::UpdateManager, stmt
       end
     end

data/test/test_factory_methods.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 module Arel
   module FactoryMethods
-    class TestFactoryMethods < MiniTest::Unit::TestCase
+    class TestFactoryMethods < Minitest::Test
       class Factory
         include Arel::FactoryMethods
       end

data/test/test_select_manager.rb

@@ -1,58 +1,6 @@
 require 'helper'
 
 module Arel
-  class EngineProxy
-    attr_reader :executed
-    attr_reader :connection_pool
-    attr_reader :spec
-    attr_reader :config
-
-    def initialize engine
-      @engine = engine
-      @executed = []
-      @connection_pool = self
-      @spec = self
-      @config = { :adapter => 'sqlite3' }
-    end
-
-    def with_connection
-      yield self
-    end
-
-    def connection
-      self
-    end
-
-    def quote_table_name thing; @engine.connection.quote_table_name thing end
-    def quote_column_name thing; @engine.connection.quote_column_name thing end
-    def quote thing, column; @engine.connection.quote thing, column end
-    def columns table, message = nil
-      @engine.connection.columns table, message
-    end
-
-    def columns_hash
-      @engine.connection.columns_hash
-    end
-
-    def table_exists? name
-      @engine.connection.table_exists? name
-    end
-
-    def tables
-      @engine.connection.tables
-    end
-
-    def visitor
-      @engine.connection.visitor
-    end
-
-    def execute sql, name = nil, *args
-      @executed << sql
-    end
-    alias :update :execute
-    alias :delete :execute
-    alias :insert :execute
-  end
 
   describe 'select manager' do
     def test_join_sources
@@ -61,6 +9,13 @@ module Arel
       assert_equal "SELECT FROM 'foo'", manager.to_sql
     end
 
+    def test_manager_stores_bind_values
+      manager = Arel::SelectManager.new Table.engine
+      assert_equal [], manager.bind_values
+      manager.bind_values = [1]
+      assert_equal [1], manager.bind_values
+    end
+
     describe 'backwards compatibility' do
       describe 'project' do
         it 'accepts symbols as sql literals' do
@@ -435,20 +390,6 @@ module Arel
       end
     end
 
-    describe 'insert' do
-      it 'uses the select FROM' do
-        engine  = EngineProxy.new Table.engine
-        table   = Table.new :users
-        manager = Arel::SelectManager.new engine
-        manager.from table
-        manager.insert 'VALUES(NULL)'
-
-        engine.executed.last.must_be_like %{
-          INSERT INTO "users" VALUES(NULL)
-        }
-      end
-    end
-
     describe 'lock' do
       # This should fail on other databases
       it 'adds a lock node' do
@@ -888,9 +829,8 @@ module Arel
 
     describe 'delete' do
       it "copies from" do
-        engine  = EngineProxy.new Table.engine
         table   = Table.new :users
-        manager = Arel::SelectManager.new engine
+        manager = Arel::SelectManager.new Table.engine
         manager.from table
         stmt = manager.compile_delete
 
@@ -898,9 +838,8 @@ module Arel
       end
 
       it "copies where" do
-        engine  = EngineProxy.new Table.engine
         table   = Table.new :users
-        manager = Arel::SelectManager.new engine
+        manager = Arel::SelectManager.new Table.engine
         manager.from table
         manager.where table[:id].eq 10
         stmt = manager.compile_delete
@@ -930,12 +869,11 @@ module Arel
 
     describe 'update' do
       it 'copies limits' do
-        engine  = EngineProxy.new Table.engine
         table   = Table.new :users
-        manager = Arel::SelectManager.new engine
+        manager = Arel::SelectManager.new Table.engine
         manager.from table
         manager.take 1
-        stmt = manager.compile_update(SqlLiteral.new('foo = bar'))
+        stmt = manager.compile_update(SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
         stmt.key = table['id']
 
         stmt.to_sql.must_be_like %{
@@ -945,12 +883,11 @@ module Arel
       end
 
       it 'copies order' do
-        engine  = EngineProxy.new Table.engine
         table   = Table.new :users
-        manager = Arel::SelectManager.new engine
+        manager = Arel::SelectManager.new Table.engine
         manager.from table
         manager.order :foo
-        stmt = manager.compile_update(SqlLiteral.new('foo = bar'))
+        stmt = manager.compile_update(SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
         stmt.key = table['id']
 
         stmt.to_sql.must_be_like %{
@@ -960,22 +897,20 @@ module Arel
       end
 
       it 'takes a string' do
-        engine  = EngineProxy.new Table.engine
         table   = Table.new :users
-        manager = Arel::SelectManager.new engine
+        manager = Arel::SelectManager.new Table.engine
         manager.from table
-        stmt = manager.compile_update(SqlLiteral.new('foo = bar'))
+        stmt = manager.compile_update(SqlLiteral.new('foo = bar'), Arel::Attributes::Attribute.new(table, 'id'))
 
         stmt.to_sql.must_be_like %{ UPDATE "users" SET foo = bar }
       end
 
       it 'copies where clauses' do
-        engine  = EngineProxy.new Table.engine
         table   = Table.new :users
-        manager = Arel::SelectManager.new engine
+        manager = Arel::SelectManager.new Table.engine
         manager.where table[:id].eq 10
         manager.from table
-        stmt = manager.compile_update(table[:id] => 1)
+        stmt = manager.compile_update({table[:id] => 1}, Arel::Attributes::Attribute.new(table, 'id'))
 
         stmt.to_sql.must_be_like %{
           UPDATE "users" SET "id" = 1 WHERE "users"."id" = 10
@@ -983,13 +918,12 @@ module Arel
       end
 
       it 'copies where clauses when nesting is triggered' do
-        engine  = EngineProxy.new Table.engine
         table   = Table.new :users
-        manager = Arel::SelectManager.new engine
+        manager = Arel::SelectManager.new Table.engine
         manager.where table[:foo].eq 10
         manager.take 42
         manager.from table
-        stmt = manager.compile_update(table[:id] => 1)
+        stmt = manager.compile_update({table[:id] => 1}, Arel::Attributes::Attribute.new(table, 'id'))
 
         stmt.to_sql.must_be_like %{
           UPDATE "users" SET "id" = 1 WHERE "users"."id" IN (SELECT "users"."id" FROM "users" WHERE "users"."foo" = 10 LIMIT 42)
@@ -997,11 +931,10 @@ module Arel
       end
 
       it 'executes an update statement' do
-        engine  = EngineProxy.new Table.engine
         table   = Table.new :users
-        manager = Arel::SelectManager.new engine
+        manager = Arel::SelectManager.new Table.engine
         manager.from table
-        stmt = manager.compile_update(table[:id] => 1)
+        stmt = manager.compile_update({table[:id] => 1}, Arel::Attributes::Attribute.new(table, 'id'))
 
         stmt.to_sql.must_be_like %{
           UPDATE "users" SET "id" = 1
@@ -1019,16 +952,14 @@ module Arel
 
       it 'takes strings' do
         manager = Arel::SelectManager.new Table.engine
-        manager.project Nodes::SqlLiteral.new('*')
+        manager.project '*'
         manager.to_sql.must_be_like %{ SELECT * }
       end
 
       it "takes sql literals" do
         manager = Arel::SelectManager.new Table.engine
         manager.project Nodes::SqlLiteral.new '*'
-        manager.to_sql.must_be_like %{
-          SELECT *
-        }
+        manager.to_sql.must_be_like %{ SELECT * }
       end
     end
 

data/test/visitors/test_bind_visitor.rb

@@ -4,7 +4,7 @@ require 'support/fake_record'
 
 module Arel
   module Visitors
-    class TestBindVisitor < MiniTest::Unit::TestCase 
+    class TestBindVisitor < Minitest::Test
       
       ##
       # Tests visit_Arel_Nodes_Assignment correctly

data/test/visitors/test_depth_first.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 module Arel
   module Visitors
-    class TestDepthFirst < MiniTest::Unit::TestCase
+    class TestDepthFirst < Minitest::Test
       Collector = Struct.new(:calls) do
         def call object
           calls << object

data/test/visitors/test_dot.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 module Arel
   module Visitors
-    class TestDot < MiniTest::Unit::TestCase
+    class TestDot < Minitest::Test
       def setup
         @visitor = Visitors::Dot.new
       end

data/test/visitors/test_to_sql.rb

@@ -92,7 +92,14 @@ module Arel
         assert_equal 'omg(*, *)', @visitor.accept(function)
       end
 
-      describe 'equality' do
+      describe 'Nodes::Equality' do
+        it "should escape strings" do
+          test = Table.new(:users)[:name].eq 'Aaron Patterson'
+          @visitor.accept(test).must_be_like %{
+            "users"."name" = 'Aaron Patterson'
+          }
+        end
+
         it 'should handle false' do
           sql = @visitor.accept Nodes::Equality.new(false, false)
           sql.must_be_like %{ 'f' = 'f' }
@@ -103,6 +110,23 @@ module Arel
           sql = @visitor.accept Nodes::Equality.new(table[:id], '1-fooo')
           sql.must_be_like %{ "users"."id" = 1 }
         end
+
+        it 'should handle nil' do
+          sql = @visitor.accept Nodes::Equality.new(@table[:name], nil)
+          sql.must_be_like %{ "users"."name" IS NULL }
+        end
+      end
+
+      describe 'Nodes::NotEqual' do
+        it 'should handle false' do
+          sql = @visitor.accept Nodes::NotEqual.new(@table[:active], false)
+          sql.must_be_like %{ "users"."active" != 'f' }
+        end
+
+        it 'should handle nil' do
+          sql = @visitor.accept Nodes::NotEqual.new(@table[:name], nil)
+          sql.must_be_like %{ "users"."name" IS NOT NULL }
+        end
       end
 
       it "should visit string subclass" do
@@ -412,15 +436,6 @@ module Arel
         end
       end
 
-      describe 'Equality' do
-        it "should escape strings" do
-          test = Table.new(:users)[:name].eq 'Aaron Patterson'
-          @visitor.accept(test).must_be_like %{
-            "users"."name" = 'Aaron Patterson'
-          }
-        end
-      end
-
       describe 'Constants' do
         it "should handle true" do
           test = Table.new(:users).create_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 5.0.1.20140414130214
 platform: ruby
 authors:
 - Aaron Patterson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -47,19 +47,19 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.6'
 description: |-
   Arel is a SQL AST manager for Ruby. It
 
   1. Simplifies the generation of complex SQL queries
-  2. Adapts to various RDBMS systems
+  2. Adapts to various RDBMSes
 
   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
@@ -189,7 +189,6 @@ files:
 - test/nodes/test_update_statement.rb
 - test/nodes/test_window.rb
 - test/support/fake_record.rb
-- test/test_activerecord_compat.rb
 - test/test_attributes.rb
 - test/test_crud.rb
 - test/test_delete_manager.rb
@@ -233,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: arel
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Arel is a SQL AST manager for Ruby
@@ -266,7 +265,6 @@ test_files:
 - test/nodes/test_true.rb
 - test/nodes/test_update_statement.rb
 - test/nodes/test_window.rb
-- test/test_activerecord_compat.rb
 - test/test_attributes.rb
 - test/test_crud.rb
 - test/test_delete_manager.rb

data/test/test_activerecord_compat.rb

@@ -1,18 +0,0 @@
-require 'helper'
-
-module Arel
-  describe 'activerecord compatibility' do
-    describe 'select manager' do
-      it 'provides wheres' do
-        table   = Table.new :users
-        manager = Arel::SelectManager.new Table.engine
-        manager.where table[:id].eq 1
-        manager.where table[:name].eq 'Aaron'
-
-        manager.wheres.map { |x|
-          x.value
-        }.join(', ').must_equal "\"users\".\"id\" = 1, \"users\".\"name\" = 'Aaron'"
-      end
-    end
-  end
-end