squeel 0.8.0 → 0.8.1

data/lib/squeel/adapters/active_record.rb

@@ -1,3 +1,5 @@
+ActiveRecord::Relation.send :include, Squeel::Nodes::Aliasing
+
 case ActiveRecord::VERSION::MAJOR
 when 3
   case ActiveRecord::VERSION::MINOR

data/lib/squeel/adapters/active_record/3.0/compat.rb

@@ -1,5 +1,11 @@
 module Arel
 
+  class SelectManager
+    def as other
+      Nodes::TableAlias.new Nodes::SqlLiteral.new(other), Nodes::Grouping.new(@ast)
+    end
+  end
+
   class Table
     alias :table_name :name
 
@@ -130,6 +136,11 @@ module Arel
           end
         }.join ', '})"
       end
+
+      def quote_table_name name
+        return name if Arel::Nodes::SqlLiteral === name
+        @quoted_tables[name] ||= @connection.quote_table_name(name)
+      end
     end
   end
 

data/lib/squeel/adapters/active_record/relation.rb

@@ -101,7 +101,7 @@ module Squeel
         end
 
         # reverse_sql_order doesn't understand ARel ordering nodes, so we
-        # need to convert them to their corresponding SQL
+        # need to convert them to their corresponding SQL (for now)
         def sqlify_order(order)
           order.map do |o|
             o.respond_to?(:to_sql) ? o.to_sql : o

data/lib/squeel/nodes/as.rb

@@ -4,6 +4,9 @@ module Squeel
   module Nodes
     # A node representing an SQL alias, which will result in same when visited.
     class As < Binary
+      alias :expr :left
+      alias :alias :right
+
       # @param left The node to be aliased
       # @param right The alias name
       def initialize(left, right)

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/lib/squeel/visitors/attribute_visitor.rb

@@ -145,6 +145,15 @@ module Squeel
         accept(o.left, parent).as(o.right)
       end
 
+      # Visit an ActiveRecord Relation, returning an Arel::SelectManager
+      # @param [ActiveRecord::Relation] o The Relation to visit
+      # @param parent The parent object in the context
+      # @return [Arel::SelectManager] The ARel select manager that represents
+      #   the relation's query
+      def visit_ActiveRecord_Relation(o, parent)
+        o.arel
+      end
+
       # @return [Boolean] Whether the given value implies a context change
       # @param v The value to consider
       def implies_context_change?(v)

data/lib/squeel/visitors/predicate_visitor.rb

@@ -115,6 +115,8 @@ module Squeel
           case arg
           when Nodes::Function
             accept(arg, parent)
+          when ActiveRecord::Relation
+            arg.arel.ast
           when Nodes::KeyPath
             can_accept?(arg.endpoint) ? accept(arg, parent) : contextualize(traverse(arg, parent))[arg.endpoint.to_sym]
           when Symbol, Nodes::Stub

data/spec/squeel/adapters/active_record/relation_spec.rb

@@ -366,6 +366,13 @@ module Squeel
             relation.first.flanderized_name.should eq 'Aric Smith-diddly'
           end
 
+          it 'allows a subquery in the select values' do
+            subquery = Article.where(:person_id => 1).select(:id).order{id.desc}.limit(1)
+            relation = Person.where(:id => 1).select{[id, name, subquery.as('last_article_id')]}
+            aric = relation.first
+            aric.last_article_id.should eq Article.where(:person_id => 1).last.id
+          end
+
         end
 
         describe '#group' do
@@ -583,6 +590,18 @@ module Squeel
 
         end
 
+        describe '#as' do
+
+          it 'aliases the relation in an As node' do
+            relation = Person.where{name == 'ernie'}
+            node = relation.as('ernie')
+            node.should be_a Squeel::Nodes::As
+            node.expr.should eq relation
+            node.alias.should eq 'ernie'
+          end
+
+        end
+
         describe '#merge' do
 
           it 'merges relations with the same base' do

data/spec/squeel/core_ext/symbol_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Symbol do
+  describe '#asc' do
+    it 'creates an ascending order node' do
+      order = :blah.asc
+      order.should be_a Squeel::Nodes::Order
+      order.expr.should eq :blah
+      order.should be_ascending
+    end
+  end
+
+  describe '#desc' do
+    it 'creates a descending order node' do
+      order = :blah.desc
+      order.should be_a Squeel::Nodes::Order
+      order.expr.should eq :blah
+      order.should be_descending
+    end
+  end
+
+  describe '#func' do
+    it 'creates a function node' do
+      function = :blah.func('foo')
+      function.should be_a Squeel::Nodes::Function
+      function.name.should eq :blah
+      function.args.should eq ['foo']
+    end
+  end
+
+  describe '#inner' do
+    it 'creates an inner join' do
+      join = :blah.inner
+      join.should be_a Squeel::Nodes::Join
+      join._name.should eq :blah
+      join._type.should eq Arel::InnerJoin
+    end
+  end
+
+  describe '#outer' do
+    it 'creates an outer join' do
+      join = :blah.outer
+      join.should be_a Squeel::Nodes::Join
+      join._name.should eq :blah
+      join._type.should eq Arel::OuterJoin
+    end
+  end
+
+  describe '#of_class' do
+    it 'creates an inner polymorphic join with the given class' do
+      join = :blah.of_class(Person)
+      join.should be_a Squeel::Nodes::Join
+      join._name.should eq :blah
+      join._type.should eq Arel::InnerJoin
+      join._klass.should eq Person
+    end
+  end
+end

data/spec/squeel/visitors/attribute_visitor_spec.rb

@@ -67,6 +67,12 @@ module Squeel
         ordering.direction.should eq :asc
       end
 
+      it 'allows a subquery as a selection' do
+        relation = Person.where(:name => 'Aric Smith').select(:id)
+        node = @v.accept(relation.as('aric'))
+        node.to_sql.should be_like "(SELECT \"people\".\"id\" FROM \"people\"  WHERE \"people\".\"name\" = 'Aric Smith') aric"
+      end
+
       it 'creates an ARel NamedFunction node for a Function node' do
         function = @v.accept(:find_in_set.func())
         function.should be_a Arel::Nodes::NamedFunction

data/spec/squeel/visitors/predicate_visitor_spec.rb

@@ -207,6 +207,13 @@ module Squeel
         predicate.to_sql.should be_like '"people"."id" IN (SELECT  "people"."id" FROM "people"  ORDER BY "people"."id" DESC LIMIT 3)'
       end
 
+      it 'converts ActiveRecord::Relation values in function arguments to their ARel AST' do
+        predicate = @v.accept(dsl{exists(Person.where{name == 'Aric Smith'})})
+        predicate.should be_a Arel::Nodes::NamedFunction
+        predicate.expressions.first.should be_a Arel::Nodes::SelectStatement
+        predicate.to_sql.should be_like "exists(SELECT \"people\".* FROM \"people\"  WHERE \"people\".\"name\" = 'Aric Smith')"
+      end
+
       it "doesn't try to sanitize_sql an array of strings in the value of a Predicate" do
         predicate = @v.accept(dsl{name >> ['Aric Smith', 'Gladyce Kulas']})
         predicate.should be_a Arel::Nodes::In

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-13 00:00:00.000000000Z
+date: 2011-06-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153399220 !ruby/object:Gem::Requirement
+  requirement: &2153932760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153399220
+  version_requirements: *2153932760
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153398720 !ruby/object:Gem::Requirement
+  requirement: &2153932260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153398720
+  version_requirements: *2153932260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153398260 !ruby/object:Gem::Requirement
+  requirement: &2153931800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153398260
+  version_requirements: *2153931800
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &2153397780 !ruby/object:Gem::Requirement
+  requirement: &2153931340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2153397780
+  version_requirements: *2153931340
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2153397280 !ruby/object:Gem::Requirement
+  requirement: &2153930880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *2153397280
+  version_requirements: *2153930880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153396780 !ruby/object:Gem::Requirement
+  requirement: &2153961900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2153396780
+  version_requirements: *2153961900
 description: ! "\n      Squeel unlocks the power of ARel in your Rails 3 application
   with\n      a handy block-based syntax. You can write subqueries, access named\n
   \     functions provided by your RDBMS, and more, all without writing\n      SQL
@@ -150,6 +150,7 @@ files:
 - spec/squeel/adapters/active_record/join_association_spec.rb
 - spec/squeel/adapters/active_record/join_dependency_spec.rb
 - spec/squeel/adapters/active_record/relation_spec.rb
+- spec/squeel/core_ext/symbol_spec.rb
 - spec/squeel/dsl_spec.rb
 - spec/squeel/nodes/function_spec.rb
 - spec/squeel/nodes/join_spec.rb
@@ -216,6 +217,7 @@ test_files:
 - spec/squeel/adapters/active_record/join_association_spec.rb
 - spec/squeel/adapters/active_record/join_dependency_spec.rb
 - spec/squeel/adapters/active_record/relation_spec.rb
+- spec/squeel/core_ext/symbol_spec.rb
 - spec/squeel/dsl_spec.rb
 - spec/squeel/nodes/function_spec.rb
 - spec/squeel/nodes/join_spec.rb