arel_extensions 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b42393f60593054c04105afad4f4500dc826cd93
-  data.tar.gz: 383b4bc32619fe292c7f7ba31f867f1f49c8da80
+  metadata.gz: 2d8dec1f213ad0c9708bec8dba67bf1f1e69a08c
+  data.tar.gz: 0d14b1fab3067c427d370cf0e7b005f3ff285349
 SHA512:
-  metadata.gz: 7a724f2bd5c6d6ecedf567d44cc5d9be29f4270043b9d816b0090e19fce6380af13af3e5d4930f5252add2b4542d58ff7f6a21c202e1a5001665c7aa10b9aee3
-  data.tar.gz: 29f68d3d37bee531b23098ccace43491c42d781f719c451d1a7bbbaa4c0067b54abbf356940be7f955ad72984a07132e59e1bc4b8cea0f061e0abeb7099c416b
+  metadata.gz: 0af7b4d42096aebda99cf375a2757275dfe04820ebc9d54916018eb335b22e086d23a17e0b9e48559add9bc49830c60001e96a9e68aaf84ad17eb8f750b4800d
+  data.tar.gz: 4b747e27a9d89aef3fa764625f19210f166bf8bcd81996728e4818fb62a3fb154322159494e90ca67dccc386fa5c13ebeee2b94957146c65f2f3aab7974e2773

data/.travis.yml

@@ -6,14 +6,14 @@ cache:
   - $ORACLE_HOME
 before_install:
   - chmod +x .travis/sqlite3/extension-functions.sh
-  - chmod +x .travis/oracle/download.sh
-  - chmod +x .travis/oracle/install.sh
-  - chmod +x .travis/setup_accounts.sh
+#  - chmod +x .travis/oracle/download.sh
+#  - chmod +x .travis/oracle/install.sh
+#  - chmod +x .travis/setup_accounts.sh
   - sudo apt-get install -y sqlite3-pcre curl
   - .travis/sqlite3/extension-functions.sh
-  - .travis/oracle/download.sh
-  - sh -ex .travis/oracle/install.sh
-  - .travis/setup_accounts.sh
+#  - .travis/oracle/download.sh
+#  - sh -ex .travis/oracle/install.sh
+#  - .travis/setup_accounts.sh
 install:
   - gem install bundler
   - bundle install
@@ -34,17 +34,17 @@ script:
 - bundle exec rake test:sqlite
 - bundle exec rake test:mysql
 - bundle exec rake test:postgresql
-- bundle exec rake test:oracle # service unavailable
+#- bundle exec rake test:oracle # service unavailable
 env:
   global:
   - JRUBY_OPTS='--dev -J-Xmx1024M'
-  - ORACLE_COOKIE=sqldev
-  - ORACLE_FILE=oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
-  - ORACLE_OJDBC_URL=http://download.oracle.com/otn/utilities_drivers/jdbc/11204/ojdbc6.jar
+#  - ORACLE_COOKIE=sqldev
+#  - ORACLE_FILE=oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
+#  - ORACLE_OJDBC_URL=http://download.oracle.com/otn/utilities_drivers/jdbc/11204/ojdbc6.jar
   - TNS_ADMIN=$ORACLE_HOME/network/admin
-  - ORACLE_BASE=/u01/app/oracle
-  - ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
-  - ORACLE_SID=XE
+#  - ORACLE_BASE=/u01/app/oracle
+#  - ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
+#  - ORACLE_SID=XE
   - DATABASE_NAME=XE
   - NLS_LANG=AMERICAN_AMERICA.AL32UTF8
   - secure: 0RUuF4l0e3J8UIIMlgb8x/aYy2pH6Wb+EWylOr2W1EQechivoFw6IEYD1EZWIOZ/uNpkQ2h/urbUqW3/HpKhZn+NYP2sQI41Xyu1TD+6HPWAHpEvLzemhQSJV6eIeLRQoVDLUmqF23nUZDtKQAwOOyJVMeqHMahJi5K7N/cfQmifs2QcBnMxPnANIcrSXxOCBoqCl6BERG9JTeKERG/lWG1I9vRIe9ISNyOPUQVVI6SfTJwhJP5NLkxSJG1q2PLPK7p6zQ684sS4zSnS5oV23yDsQWWIwxk78CVu1jnFBu8Qq3ngWsInlkHrPotjtaxmTxM8JQd4fgE5NMO2Pjnj8w7zg+sbl+3OVtareX+M9+OLdUD5xBQhecPpzflMqib2qZ0fr9tdoT8kAZJTiXtQrptZfaXleZlH74l2dO/PYxkoWMusYQnSbQl0G3AoyYH+l7YpefL4arm0s5IIiOK+ZiCoZ14pl26rYAA1iPUe5AT+hecKi+fwqhyFE7fMX+zC+AvzsQL8jrP0CXL/hmPkoFYxvcDgUoYhvOq+mmQHdOfU7ny4hH5z5d9691qceduHFvF7fNZ4pSofj03eGqfTTk+SDNeZIo6NXNlayayjV2L/DxL6d7vetxkWwipx47PI76gBAqJlxgODJuzoOtyQkPyIVsDlzI1UPoS+UbrU51w=
@@ -57,12 +57,17 @@ rvm:
 - 2.5.0
 - rbx-2
 - jruby-9.0.5.0
+- jruby-9.2.0.0
 - jruby-head
 - ruby-head
 jdk:
 - openjdk7
 - oraclejdk8
 - oraclejdk9
+- openjdk10
+- oraclejdk10
+- openjdk11
+- oraclejdk11
 matrix:
   fast_finish: true
   exclude:
@@ -97,7 +102,73 @@ matrix:
   - rvm: 2.5.0
     jdk: oraclejdk8
   - rvm: ruby-head
-    jdk: oraclejdk8    
+    jdk: oraclejdk8
+  - rvm: rbx-2
+    jdk: oraclejdk10
+  - rvm: 2.0.0
+    jdk: oraclejdk10
+  - rvm: 2.1
+    jdk: oraclejdk10
+  - rvm: 2.2.5
+    jdk: oraclejdk10
+  - rvm: 2.3.1
+    jdk: oraclejdk10
+  - rvm: 2.4.0
+    jdk: oraclejdk10
+  - rvm: 2.5.0
+    jdk: oraclejdk10
+  - rvm: ruby-head
+    jdk: oraclejdk10
+  - rvm: rbx-2
+    jdk: openjdk10
+  - rvm: 2.0.0
+    jdk: openjdk10
+  - rvm: 2.1
+    jdk: openjdk10
+  - rvm: 2.2.5
+    jdk: openjdk10
+  - rvm: 2.3.1
+    jdk: openjdk10
+  - rvm: 2.4.0
+    jdk: openjdk10
+  - rvm: 2.5.0
+    jdk: openjdk10
+  - rvm: ruby-head
+    jdk: openjdk10
+  - rvm: rbx-2
+    jdk: oraclejdk11
+  - rvm: 2.0.0
+    jdk: oraclejdk11
+  - rvm: 2.1
+    jdk: oraclejdk11
+  - rvm: 2.2.5
+    jdk: oraclejdk11
+  - rvm: 2.3.1
+    jdk: oraclejdk11
+  - rvm: 2.4.0
+    jdk: oraclejdk11
+  - rvm: 2.5.0
+    jdk: oraclejdk11
+  - rvm: ruby-head
+    jdk: oraclejdk11    
+  - rvm: rbx-2
+    jdk: openjdk11
+  - rvm: 2.0.0
+    jdk: openjdk11
+  - rvm: 2.1
+    jdk: openjdk11
+  - rvm: 2.2.5
+    jdk: openjdk11
+  - rvm: 2.3.1
+    jdk: openjdk11
+  - rvm: 2.4.0
+    jdk: openjdk11
+  - rvm: 2.5.0
+    jdk: openjdk11
+  - rvm: ruby-head
+    jdk: openjdk11   
+  - rvm: jruby-9.2.0.0
+    jdk: openjdk7
   - rvm: jruby-head
     jdk: openjdk7
   - rvm: 2.0.0
@@ -116,18 +187,6 @@ matrix:
     gemfile: gemfiles/rails5_2.gemfile
   - rvm: 2.1
     gemfile: gemfiles/rails5_2.gemfile
-  - rvm: jruby-9.0.5.0 
-    gemfile: gemfiles/rails5_2.gemfile
-    jdk: openjdk7
-  - rvm: jruby-head 
-    gemfile: gemfiles/rails5_2.gemfile
-    jdk: openjdk7
-  - rvm: jruby-9.0.5.0 
-    gemfile: gemfiles/rails5_2.gemfile
-    jdk: oraclejdk8
-  - rvm: jruby-head 
-    gemfile: gemfiles/rails5_2.gemfile
-    jdk: oraclejdk8
   allow_failures:
   - rvm: rbx-2
     gemfile: gemfiles/rails4.gemfile    
@@ -137,23 +196,23 @@ matrix:
     gemfile: gemfiles/rails5_1_4.gemfile    
   - rvm: rbx-2
     gemfile: gemfiles/rails5_2.gemfile
-  - rvm: jruby-head 
-    gemfile: gemfiles/rails4.gemfile
-    jdk: oraclejdk9
-  - rvm: jruby-head
-    gemfile: gemfiles/rails5_0.gemfile    
-    jdk: oraclejdk9
   - rvm: rbx-2
     gemfile: gemfiles/rails5_1_4.gemfile
-  - rvm: jruby-head
-    gemfile: gemfiles/rails5_1_4.gemfile
-    jdk: oraclejdk9  
   - rvm: jruby-9.0.5.0 
+    gemfile: gemfiles/rails5_2.gemfile 
+  - rvm: jruby-9.2.0.0
+    jdk: oraclejdk9
     gemfile: gemfiles/rails5_2.gemfile
-    jdk: oraclejdk9  
-  - rvm: jruby-head 
-    gemfile: gemfiles/rails5_2.gemfile
-    jdk: oraclejdk9  
+  - jdk: openjdk10
+  - jdk: oraclejdk10
+  - jdk: openjdk11
+  - jdk: oraclejdk11
+  - rvm: ruby-head
+  - rvm: jruby-head
+  - rvm: jruby-9.2.0.0
+    jdk: oraclejdk9
+  - rvm: jruby-9.0.5.0
+    jdk: oraclejdk9
 bundler_args: "--jobs 3 --retry 2"
 notifications:
   email: 

data/README.md

@@ -2,8 +2,6 @@
 
 [![Travis Build Status](https://img.shields.io/travis/Faveod/arel-extensions.svg?label=Travis%20build)](http://travis-ci.org/Faveod/arel-extensions)
 [![AppVeyor Build Status](https://img.shields.io/appveyor/ci/yazfav/arel-extensions.svg?label=AppVeyor%20build)](https://ci.appveyor.com/project/yazfav/arel-extensions)
-[![Code Climate](https://img.shields.io/codeclimate/github/Faveod/arel-extensions.svg)](https://codeclimate.com/github/Faveod/arel-extensions)
-[![Gemnasium](https://img.shields.io/gemnasium/Faveod/arel-extensions.svg)](https://gemnasium.com/github.com/Faveod/arel-extensions)
 [![Security](https://hakiri.io/github/Faveod/arel-extensions/master.svg)](https://hakiri.io/github/Faveod/arel-extensions/master)
 ![](http://img.shields.io/badge/license-MIT-brightgreen.svg)
 
@@ -72,7 +70,8 @@ With Arel Extensions:
 ```
 
 Other functions : ABS, RAND, ROUND, FLOOR, CEIL, FORMAT
-Exemples :
+
+For Example:
 ```ruby 
 t[:price].format_number("%07.2f €","fr_FR")
 # equivalent to 'sprintf("%07.2f €",price)' plus locale management 

data/gemfiles/rails5_2.gemfile

@@ -19,7 +19,7 @@ group :development, :test do
 	gem 'activerecord-oracle_enhanced-adapter', '~> 5.2.0' if ENV.has_key? 'ORACLE_HOME'
 
 	# for JRuby
-	gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v51.0', :platforms => :jruby
+	gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v52.0', :platforms => :jruby
 	gem "jdbc-sqlite3", :platforms => :jruby
 	gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 	gem "activerecord-jdbcmysql-adapter", :platforms => :jruby

data/lib/arel_extensions/math.rb

@@ -24,7 +24,7 @@ module ArelExtensions
 		else		
 		  return Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
 		end
-	  when ArelExtensions::Nodes::Function
+	  when  ArelExtensions::Nodes::Function
 		  return case self.return_type
 		  when :string, :text			
 			self.concat(other)
@@ -35,10 +35,14 @@ module ArelExtensions
 		  else
 			self.concat(other)
 		  end 
-	  when Arel::Nodes::Function
-		return Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
-	  else
-		  col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
+	  when  Arel::Nodes::Function
+		Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+	  else		  
+		  begin 
+			col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
+		  rescue Exception
+			col = nil
+		  end
 		  if (!col) #if the column doesn't exist in the database
 			Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new(self, other))
 		  else
@@ -61,55 +65,69 @@ module ArelExtensions
     #function returns the time between two dates
     #function returns the substraction between two ints
     def -(other)
-	  if self.is_a?(Arel::Nodes::Grouping)
+	  case self
+	  when Arel::Nodes::Grouping
 		if self.expr.left.is_a?(Date) || self.expr.left.is_a?(DateTime) 
-		  return Arel::Nodes::Grouping.new(ArelExtensions::Nodes::DateSub.new [self, other])
+		  Arel::Nodes::Grouping.new(ArelExtensions::Nodes::DateSub.new [self, other])
 		else		
-		  return Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+		  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
 		end
-	  end
-	  return case self.return_type
-	  when :string, :text # ???
-		Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other)) # ??
-	  when :integer, :decimal, :float, :number
-		Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
-	  when :date, :datetime
-		ArelExtensions::Nodes::DateSub.new [self, other]
-	  else
+	  when ArelExtensions::Nodes::Function
+		  case self.return_type
+		  when :string, :text # ???
+			Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other)) # ??
+		  when :integer, :decimal, :float, :number
+			Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+		  when :date, :datetime
+			ArelExtensions::Nodes::DateSub.new [self, other]
+		  else
+			Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+		  end 
+	  when Arel::Nodes::Function
 		Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
-	  end if self.is_a?(ArelExtensions::Nodes::Function)
-	  col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
-	  if (!col) #if the column doesn't exist in the database
-		return Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
 	  else
-		arg = col.type
-		if (arg == :date || arg == :datetime)
-			case other
-			when Arel::Attributes::Attribute
-			  col2 = Arel::Table.engine.connection.schema_cache.columns_hash(other.relation.table_name)[other.name.to_s]
-			  if (!col2) #if the column doesn't exist in the database				
-				ArelExtensions::Nodes::DateSub.new [self, other]
-			  else
-				arg2 = col2.type
-				if arg2 == :date || arg2 == :datetime
+		
+		begin 
+			col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
+		rescue Exception
+			col = nil
+		end
+		if (!col) #if the column doesn't exist in the database
+			Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+		else
+			arg = col.type
+			if (arg == :date || arg == :datetime)
+				case other
+				when Arel::Attributes::Attribute
+				  begin 
+				    col2 = Arel::Table.engine.connection.schema_cache.columns_hash(other.relation.table_name)[other.name.to_s]
+				  rescue Exception
+					col = nil
+				  end
+				  if (!col2) #if the column doesn't exist in the database
+					ArelExtensions::Nodes::DateSub.new [self, other]
+				  else
+					arg2 = col2.type
+					if arg2 == :date || arg2 == :datetime
+					  ArelExtensions::Nodes::DateDiff.new [self, other]
+					else
+					  ArelExtensions::Nodes::DateSub.new [self, other]
+					end
+				  end  
+				when Arel::Nodes::Node, DateTime, Time, String, Date
 				  ArelExtensions::Nodes::DateDiff.new [self, other]
-				else
+				when Integer
 				  ArelExtensions::Nodes::DateSub.new [self, other]
 				end
-			  end  
-			when Arel::Nodes::Node, DateTime, Time, String, Date
-			  ArelExtensions::Nodes::DateDiff.new [self, other]
-			when Integer
-			  ArelExtensions::Nodes::DateSub.new [self, other]
-			end
-		else
-			case other
-			when Integer, Float, BigDecimal
-			  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other.to_s)))
-			when String
-			  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other)))
 			else
-			  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+				case other
+				when Integer, Float, BigDecimal
+				  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other.to_s)))
+				when String
+				  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, Arel.sql(other)))
+				else
+				  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+				end
 			end
 		end
 	  end

data/lib/arel_extensions/math_functions.rb

@@ -6,6 +6,7 @@ require 'arel_extensions/nodes/rand'
 require 'arel_extensions/nodes/formatted_number'
 require 'arel_extensions/nodes/log10'
 require 'arel_extensions/nodes/power'
+require 'arel_extensions/nodes/std'
 
 module ArelExtensions
   module MathFunctions
@@ -39,6 +40,15 @@ module ArelExtensions
     def power exposant = 0
         ArelExtensions::Nodes::Power.new [self,exposant]
     end
+    
+    # Aggregate Functions 
+    def std unbiased = true
+		ArelExtensions::Nodes::Std.new [self,unbiased]
+    end
+    
+    def variance unbiased = true
+		ArelExtensions::Nodes::Variance.new [self,unbiased]
+    end
 
 
     #function that can be invoked to produce random numbers between 0 and 1
@@ -73,7 +83,7 @@ module ArelExtensions
 			}
 			# opts = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
 			ArelExtensions::Nodes::FormattedNumber.new [self,opts]
-		rescue Exception => e
+		rescue Exception
 			Arel::Nodes.build_quoted('Wrong Format')
 		end
 	end	

data/lib/arel_extensions/nodes/std.rb

@@ -0,0 +1,26 @@
+module ArelExtensions
+  module Nodes
+    class Std < Function
+    	RETURN_TYPE = :number
+    	
+		attr_accessor :unbiased_estimator
+    	def initialize expr
+	        col = expr.first
+            @unbiased_estimator = expr[1]
+        	super [col]
+    	end    	
+    end
+    
+    class Variance < Function
+    	RETURN_TYPE = :number
+    	
+		attr_accessor :unbiased_estimator
+    	def initialize expr
+	        col = expr.first
+            @unbiased_estimator = expr[1]
+        	super [col]
+    	end    	
+    end    
+    
+  end
+end

data/lib/arel_extensions/predications.rb

@@ -6,8 +6,12 @@ module ArelExtensions
 			end
 		end
 		
-		def matches(other, escape=nil)
-			Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape)
+		def matches(other, escape=nil,case_sensitive= nil)
+			if Arel::VERSION.to_i < 7
+				Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape)
+			else
+				Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape, case_sensitive)
+			end
 		end
 		
 		def imatches(other, escape=nil)

data/lib/arel_extensions/string_functions.rb

@@ -107,14 +107,14 @@ module ArelExtensions
       ArelExtensions::Nodes::Replace.new [self, left, right]
     end
     
-    def concat other
-      res = ArelExtensions::Nodes::Concat.new [self, other]
-      if res.expressions.length == 1
-		res.expressions.first
-	  else
-		res
-      end
-    end
+	def concat other
+		res = ArelExtensions::Nodes::Concat.new [self, other]
+		if res.expressions.length == 1
+			res.expressions.first
+		else
+			res
+		end
+	end
 
     def group_concat sep = nil
       ArelExtensions::Nodes::GroupConcat.new [self, sep]

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.1".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -473,6 +473,21 @@ module ArelExtensions
 			collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
 			collector		
 		end
+		
+		def visit_ArelExtensions_Nodes_Std o, collector		
+			collector << (o.unbiased_estimator ? "STDEV(" : "STDEVP(")
+			visit o.left, collector
+			collector << ")"
+			collector
+		end
+		
+		def visit_ArelExtensions_Nodes_Variance o, collector
+			collector << (o.unbiased_estimator ? "VAR(" : "VARP(")
+			visit o.left, collector
+			collector << ")"
+			collector
+		end
+
 
     end
   end

data/lib/arel_extensions/visitors/mysql.rb

@@ -299,7 +299,7 @@ module ArelExtensions
 
 		alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
 		def visit_Arel_Nodes_SelectStatement o, collector	
-			if !collector.value.blank? && o.limit.blank? && o.offset.blank? 				
+			if !(collector.value.blank? || (collector.value.is_a?(Array) && collector.value[0].blank?)) && o.limit.blank? && o.offset.blank?
 				o = o.dup
 				o.orders = []
 			end
@@ -351,6 +351,20 @@ module ArelExtensions
 			collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
 			collector		
 		end
+		
+		def visit_ArelExtensions_Nodes_Std o, collector		
+			collector << (o.unbiased_estimator ? "STDDEV_SAMP(" : "STDDEV_POP(")
+			visit o.left, collector
+			collector << ")"
+			collector
+		end
+		
+		def visit_ArelExtensions_Nodes_Variance o, collector	
+			collector << (o.unbiased_estimator ? "VAR_SAMP(" : "VAR_POP(")
+			visit o.left, collector
+			collector << ")"
+			collector
+		end
 
 
     end

data/lib/arel_extensions/visitors/oracle.rb

@@ -491,7 +491,7 @@ module ArelExtensions
 	
 	alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
 	def visit_Arel_Nodes_SelectStatement o, collector	
-		if !collector.value.blank? && o.limit.blank? && o.offset.blank? 					
+		if !(collector.value.blank? || (collector.value.is_a?(Array) && collector.value[0].blank?)) && o.limit.blank? && o.offset.blank?
 			o = o.dup
 			o.orders = []
 		end
@@ -571,6 +571,19 @@ module ArelExtensions
 		collector		
 	end
 
+		def visit_ArelExtensions_Nodes_Std o, collector		
+			collector << (o.unbiased_estimator ? "STDDEV_SAMP(" : "STDDEV_POP(")
+			visit o.left, collector
+			collector << ")"
+			collector
+		end
+		
+		def visit_ArelExtensions_Nodes_Variance o, collector	
+			collector << (o.unbiased_estimator ? "VAR_SAMP(" : "VAR_POP(")
+			visit o.left, collector
+			collector << ")"
+			collector
+		end
 
 
 

data/lib/arel_extensions/visitors/postgresql.rb

@@ -334,7 +334,8 @@ module ArelExtensions
 
 		alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
 		def visit_Arel_Nodes_SelectStatement o, collector	
-			if !collector.value.blank? && o.limit.blank? && o.offset.blank?  			
+		
+			if !(collector.value.blank? || (collector.value.is_a?(Array) && collector.value[0].blank?)) && o.limit.blank? && o.offset.blank?
 				o = o.dup
 				o.orders = []
 			end
@@ -358,6 +359,19 @@ module ArelExtensions
 			collector << "#{quote_table_name join_name}.#{quote_column_name o.name}"
 		end
 
+		def visit_ArelExtensions_Nodes_Std o, collector		
+			collector << (o.unbiased_estimator ? "STDDEV_SAMP(" : "STDDEV_POP(")
+			visit o.left, collector
+			collector << ")"
+			collector
+		end
+		
+		def visit_ArelExtensions_Nodes_Variance o, collector	
+			collector << (o.unbiased_estimator ? "VAR_SAMP(" : "VAR_POP(")
+			visit o.left, collector
+			collector << ")"
+			collector
+		end
 
     end
   end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -369,6 +369,7 @@ module ArelExtensions
 			collector
 		end
 		
+			
     end
   end
 end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -510,6 +510,19 @@ module ArelExtensions
 			visit o.right, collector
 		end
 		
+		def visit_ArelExtensions_Nodes_Std o, collector		
+			collector << "STD("
+			visit o.left, collector
+			collector << ")"
+			collector
+		end
+		
+		def visit_ArelExtensions_Nodes_Variance o, collector		
+			collector << "VARIANCE("
+			visit o.left, collector
+			collector << ")"
+			collector
+		end
 
 		
   	end

data/test/visitors/test_to_sql.rb

@@ -57,6 +57,19 @@ module ArelExtensions
         compile((@price + 42).average).must_be_like %{AVG(("products"."price" + 42))}
         compile((Arel.rand * 9).round + 42).must_be_like %{(ROUND(RAND() * 9) + 42)}        
         compile((Arel.rand * @price).round(2) + @price).must_be_like %{(ROUND(RAND() * "products"."price", 2) + "products"."price")}        
+        
+        compile(@price.std + 42).must_be_like %{(STD("products"."price") + 42)}
+        compile(@price.variance + 42).must_be_like %{(VARIANCE("products"."price") + 42)}
+        
+        compile(@price.coalesce(0) - 42).must_be_like %{(COALESCE("products"."price", 0) - 42)}
+        compile(@price.sum - 42).must_be_like %{(SUM("products"."price") - 42)}
+        compile(@price.std - 42).must_be_like %{(STD("products"."price") - 42)}
+        compile(@price.variance - 42).must_be_like %{(VARIANCE("products"."price") - 42)}
+        
+        fake_table = Arel::Table.new('fake_tables')
+        
+        compile(fake_table[:fake_att] - 42).must_be_like %{("fake_tables"."fake_att" - 42)}        
+        compile(fake_table[:fake_att].coalesce(0) - 42).must_be_like %{(COALESCE("fake_tables"."fake_att", 0) - 42)}
       end
 
       # String Functions

data/test/with_ar/all_agnostic_test.rb

@@ -89,7 +89,7 @@ module ArelExtensions
       end
 
       def t(scope, node)
-        scope.select(node.as('res')).first.res
+        scope.select(node.as('res')).to_a.first.res
       end
 
       # Math Functions
@@ -646,7 +646,21 @@ module ArelExtensions
 						User.select(at[:id]).from(at).to_sql.downcase
 		end
 	  end
-	 
+	  
+	  def test_stat_functions	
+	  	skip "SQLite doesn't work for most on this functions" if $sqlite 
+	  	#puts t(User.where(nil), @score.average)
+	  	#puts t(User.where(nil), @score.variance(true))
+	  	#puts t(User.where(nil), @score.variance(false))
+	  	#puts t(User.where(nil), @score.std(true))
+	  	#puts t(User.where(nil), @score.std(false))
+	  	
+		assert ( 15.98625 - t(User.where(nil), @score.average)).abs < 0.01 
+		assert (613.75488 - t(User.where(nil), @score.variance)).abs < 0.01
+		assert ( 537.0355 - t(User.where(nil), @score.variance(false))).abs < 0.01
+		assert ( 24.77408 - t(User.where(nil), @score.std)).abs < 0.01		
+		assert ( 23.17403 - t(User.where(nil), @score.std(false))).abs < 0.01	  
+	  end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -147,6 +147,7 @@ files:
 - lib/arel_extensions/nodes/replace.rb
 - lib/arel_extensions/nodes/round.rb
 - lib/arel_extensions/nodes/soundex.rb
+- lib/arel_extensions/nodes/std.rb
 - lib/arel_extensions/nodes/substring.rb
 - lib/arel_extensions/nodes/then.rb
 - lib/arel_extensions/nodes/trim.rb