arel 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43df8ad0c214e6f273a245b06ad740700735eadb
-  data.tar.gz: 15084841b2ad5743e4d81722bebbff6bc7471a2f
+  metadata.gz: fe1827bf9b3fb8d0df377a874b604c6d1fbb4387
+  data.tar.gz: 050b51b492c74c09be3aa3f4a58487ef3150c57b
 SHA512:
-  metadata.gz: f8c37e0d0b37551a9b27cbce6d7c3b7509bdbb98847175446a57fae35198ab9c996153baed4f9d3f7c7df018d4efa0830c9c150fc9f413a59087aa73cb09eebe
-  data.tar.gz: 439ace13cbdee92401d629c1874a82d9355c2a53a9fbc6b8b086a2fa1fac5a59fa9a6feb47163014bc452358154ded999b36fd2991a870c5557f5ea7ebe6fa3e
+  metadata.gz: 200b67f47b08b79e6b514035398fd8f00d810e786af0de57862ee68ec4ff228f68b036419273add78450df7c18f6da4b54b68e6b78eeacbb98575c40d426d2be
+  data.tar.gz: 692a06c47c099852541d12c6499ef2c9bbe0f943fc5f2023f6523e6a819c14d43e7add74e834b9aa0290a17156bc4bf38ba32d043daf6248e20765664104141c

data/.travis.yml

@@ -2,7 +2,6 @@ script: "rake test"
 rvm:
   - rbx-19mode
   - jruby
-  - 1.9.2
   - 1.9.3
   - 2.0.0
 notifications:

data/History.txt

@@ -1,3 +1,10 @@
+=== 4.0.2 / 2014-02-05
+
+* Bug Fixes
+
+  * Fix `SqlLiteral` YAML serialization
+  * PostgreSQL bugfix for invalid SQL in subqueries
+
 == 4.0.1 / 2013-10-22
 
 * Enhancements

data/arel.gemspec

@@ -1,12 +1,14 @@
 # -*- encoding: utf-8 -*-
+# stub: arel 4.0.2.20140205180311 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "arel"
-  s.version = "4.0.1.20131022201058"
+  s.version = "4.0.2.20140205180311"
 
   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 = "2013-10-22"
+  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.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"]
@@ -14,9 +16,8 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/rails/arel"
   s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.markdown"]
-  s.require_paths = ["lib"]
   s.rubyforge_project = "arel"
-  s.rubygems_version = "2.0.6"
+  s.rubygems_version = "2.2.0"
   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"]
 
@@ -24,17 +25,17 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 5.0"])
+      s.add_development_dependency(%q<minitest>, ["~> 5.2"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.7"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.8"])
     else
-      s.add_dependency(%q<minitest>, ["~> 5.0"])
+      s.add_dependency(%q<minitest>, ["~> 5.2"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.7"])
+      s.add_dependency(%q<hoe>, ["~> 3.8"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 5.0"])
+    s.add_dependency(%q<minitest>, ["~> 5.2"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.7"])
+    s.add_dependency(%q<hoe>, ["~> 3.8"])
   end
 end

data/lib/arel.rb

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

data/lib/arel/nodes/sql_literal.rb

@@ -5,6 +5,10 @@ module Arel
       include Arel::Predications
       include Arel::AliasPredication
       include Arel::OrderPredications
+
+      def encode_with(coder)
+        coder.scalar = self.to_s
+      end
     end
 
     class BindParam < SqlLiteral

data/lib/arel/visitors/postgresql.rb

@@ -4,10 +4,12 @@ module Arel
       private
 
       def visit_Arel_Nodes_Matches o, a
+        a = o.left if Arel::Attributes::Attribute === o.left
         "#{visit o.left, a} ILIKE #{visit o.right, a}"
       end
 
       def visit_Arel_Nodes_DoesNotMatch o, a
+        a = o.left if Arel::Attributes::Attribute === o.left
         "#{visit o.left, a} NOT ILIKE #{visit o.right, a}"
       end
 

data/lib/arel/visitors/visitor.rb

@@ -9,8 +9,8 @@ module Arel
 
       DISPATCH = Hash.new do |hash, visitor_class|
         hash[visitor_class] =
-          Hash.new do |hash, node_class|
-            hash[node_class] = "visit_#{(node_class.name || '').gsub('::', '_')}"
+          Hash.new do |method_hash, node_class|
+            method_hash[node_class] = "visit_#{(node_class.name || '').gsub('::', '_')}"
           end
       end
 

data/test/nodes/test_sql_literal.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'yaml'
 
 module Arel
   module Nodes
@@ -56,6 +57,13 @@ module Arel
           @visitor.accept(node).must_be_like %{ (foo = 1 AND foo = 2) }
         end
       end
+
+      describe 'serialization' do
+        it 'serializes into YAML' do
+          yaml_literal = SqlLiteral.new('foo').to_yaml
+          assert_equal('foo', YAML.load(yaml_literal))
+        end
+      end
     end
   end
 end

data/test/visitors/test_postgres.rb

@@ -5,6 +5,8 @@ module Arel
     describe 'the postgres visitor' do
       before do
         @visitor = PostgreSQL.new Table.engine.connection
+        @table = Table.new(:users)
+        @attr = @table[:id]
       end
 
       describe 'locking' do
@@ -43,6 +45,40 @@ module Arel
         core.set_quantifier = Arel::Nodes::Distinct.new
         assert_equal 'SELECT DISTINCT', @visitor.accept(core)
       end
+
+      describe "Nodes::Matches" do
+        it "should know how to visit" do
+          node = @table[:name].matches('foo%')
+          @visitor.accept(node).must_be_like %{
+            "users"."name" ILIKE 'foo%'
+          }
+        end
+
+        it 'can handle subqueries' do
+          subquery = @table.project(:id).where(@table[:name].matches('foo%'))
+          node = @attr.in subquery
+          @visitor.accept(node).must_be_like %{
+            "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" ILIKE 'foo%')
+          }
+        end
+      end
+
+      describe "Nodes::DoesNotMatch" do
+        it "should know how to visit" do
+          node = @table[:name].does_not_match('foo%')
+          @visitor.accept(node).must_be_like %{
+            "users"."name" NOT ILIKE 'foo%'
+          }
+        end
+
+        it 'can handle subqueries' do
+          subquery = @table.project(:id).where(@table[:name].does_not_match('foo%'))
+          node = @attr.in subquery
+          @visitor.accept(node).must_be_like %{
+            "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" NOT ILIKE 'foo%')
+          }
+        end
+      end
     end
   end
 end

data/test/visitors/test_to_sql.rb

@@ -194,6 +194,40 @@ module Arel
         @visitor.accept(test).must_be_like %{ "users"."bool" = 't' }
       end
 
+      describe "Nodes::Matches" do
+        it "should know how to visit" do
+          node = @table[:name].matches('foo%')
+          @visitor.accept(node).must_be_like %{
+            "users"."name" LIKE 'foo%'
+          }
+        end
+
+        it 'can handle subqueries' do
+          subquery = @table.project(:id).where(@table[:name].matches('foo%'))
+          node = @attr.in subquery
+          @visitor.accept(node).must_be_like %{
+            "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" LIKE 'foo%')
+          }
+        end
+      end
+
+      describe "Nodes::DoesNotMatch" do
+        it "should know how to visit" do
+          node = @table[:name].does_not_match('foo%')
+          @visitor.accept(node).must_be_like %{
+            "users"."name" NOT LIKE 'foo%'
+          }
+        end
+
+        it 'can handle subqueries' do
+          subquery = @table.project(:id).where(@table[:name].does_not_match('foo%'))
+          node = @attr.in subquery
+          @visitor.accept(node).must_be_like %{
+            "users"."id" IN (SELECT id FROM "users" WHERE "users"."name" NOT LIKE 'foo%')
+          }
+        end
+      end
+
       describe "Nodes::Ordering" do
         it "should know how to visit" do
           node = @attr.desc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Aaron Patterson
@@ -11,50 +11,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 description: |-
   Arel is a SQL AST manager for Ruby. It
 
@@ -77,9 +77,9 @@ extra_rdoc_files:
 - Manifest.txt
 - README.markdown
 files:
-- .autotest
-- .gemtest
-- .travis.yml
+- ".autotest"
+- ".gemtest"
+- ".travis.yml"
 - Gemfile
 - History.txt
 - MIT-LICENSE.txt
@@ -217,23 +217,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.markdown
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: arel
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Arel is a SQL AST manager for Ruby