squeel 0.8.3 → 0.8.4

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

@@ -41,11 +41,18 @@ module Arel
       end
     end
 
+    class Function < Arel::Nodes::Node
+      include Arel::Predications
+
+      def as aliaz
+        self.alias = SqlLiteral.new(aliaz)
+        self
+      end
+    end
+
     class NamedFunction < Arel::Nodes::Function
       attr_accessor :name, :distinct
 
-      include Arel::Predications
-
       def initialize name, expr, aliaz = nil
         super(expr, aliaz)
         @name = name

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/lib/squeel/visitors/attribute_visitor.rb

@@ -100,7 +100,9 @@ module Squeel
             quote arg
           end
         end
-        Arel::Nodes::NamedFunction.new(o.name, args, o.alias)
+        func = Arel::Nodes::NamedFunction.new(o.name, args)
+
+        o.alias ? func.as(o.alias) : func
       end
 
       # Visit an Operation node. Each operand will be accepted or

data/lib/squeel/visitors/predicate_visitor.rb

@@ -125,7 +125,9 @@ module Squeel
             quote arg
           end
         end
-        Arel::Nodes::NamedFunction.new(o.name, args, o.alias)
+        func = Arel::Nodes::NamedFunction.new(o.name, args)
+
+        o.alias ? func.as(o.alias) : func
       end
 
       # Visit an ActiveRecord Relation, returning an Arel::SelectManager

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-06-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156248280 !ruby/object:Gem::Requirement
+  requirement: &2156148420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156248280
+  version_requirements: *2156148420
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156247580 !ruby/object:Gem::Requirement
+  requirement: &2156147780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156247580
+  version_requirements: *2156147780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156246920 !ruby/object:Gem::Requirement
+  requirement: &2156147200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2156246920
+  version_requirements: *2156147200
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &2156246220 !ruby/object:Gem::Requirement
+  requirement: &2156146440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2156246220
+  version_requirements: *2156146440
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2156245480 !ruby/object:Gem::Requirement
+  requirement: &2156145780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *2156245480
+  version_requirements: *2156145780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156244820 !ruby/object:Gem::Requirement
+  requirement: &2156145020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2156244820
+  version_requirements: *2156145020
 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