Add #extract, which produces ANSI SQL function EXTRACT(<field> from <expr>).

5 files changed, 38 insertions, 0 deletions

diff --git a/lib/arel/expressions.rb b/lib/arel/expressions.rb
index d1fbfd83d9..fa18f15b67 100644
--- a/lib/arel/expressions.rb
+++ b/lib/arel/expressions.rb
@@ -19,5 +19,9 @@ module Arel
     def average
       Nodes::Avg.new [self], Nodes::SqlLiteral.new('avg_id')
     end
+
+    def extract field
+      Nodes::Extract.new [self], field
+    end
   end
 end
diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb
index b9b5353df7..0477591cae 100644
--- a/lib/arel/nodes.rb
+++ b/lib/arel/nodes.rb
@@ -36,6 +36,7 @@ require 'arel/nodes/and'
 # We should make Function a Unary node and deprecate the use of "aliaz"
 require 'arel/nodes/function'
 require 'arel/nodes/count'
+require 'arel/nodes/extract'
 require 'arel/nodes/values'
 require 'arel/nodes/named_function'
 
diff --git a/lib/arel/nodes/extract.rb b/lib/arel/nodes/extract.rb
new file mode 100644
index 0000000000..1c9ee78816
--- /dev/null
+++ b/lib/arel/nodes/extract.rb
@@ -0,0 +1,23 @@
+module Arel
+  module Nodes
+
+    class Extract < Arel::Nodes::Unary
+      include Arel::Expression
+      include Arel::Predications
+
+      attr_accessor :field
+      attr_accessor :alias
+
+      def initialize expr, field, aliaz = nil
+        super(expr)
+        @field = field
+        @alias = aliaz && SqlLiteral.new(aliaz)
+      end
+
+      def as aliaz
+        self.alias = SqlLiteral.new(aliaz)
+        self
+      end
+    end
+  end
+end
diff --git a/lib/arel/visitors/dot.rb b/lib/arel/visitors/dot.rb
index 800b44b602..8a83ebf48e 100644
--- a/lib/arel/visitors/dot.rb
+++ b/lib/arel/visitors/dot.rb
@@ -103,6 +103,12 @@ module Arel
       alias :visit_Arel_Nodes_Avg    :function
       alias :visit_Arel_Nodes_Sum    :function
 
+      def extract o
+        visit_edge o, "expressions"
+        visit_edge o, "alias"
+      end
+      alias :visit_Arel_Nodes_Extract :extract
+
       def visit_Arel_Nodes_NamedFunction o
         visit_edge o, "name"
         visit_edge o, "expressions"
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index c22df6289d..a6be451e6f 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -272,6 +272,10 @@ key on UpdateManager using UpdateManager#key=
         }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
       end
 
+      def visit_Arel_Nodes_Extract o
+        "EXTRACT(#{o.field.to_s.upcase} FROM #{visit o.expr})#{o.alias ? " AS #{visit o.alias}" : ''}"
+      end
+
       def visit_Arel_Nodes_Count o
         "COUNT(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
           visit x