arel_extensions 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68ee590a18210a1a5692c9ba7c4caf3c47a11f4e
-  data.tar.gz: a78126c03105531c7e0c25cee082c34c18eb7fdd
+  metadata.gz: c605fff28ecad52dbb7519c17ea982844ecad5fc
+  data.tar.gz: ad640c79367460a9b06ce89bffd6ef587ec1f30d
 SHA512:
-  metadata.gz: fd66f0377b2c25fe6e18c3ee250e1fc55e699d6a423e43c65fee38749752955e1e3f33ca58f31200d9ed26fcc818da44c2d1f02c7ee11e05c9a7756f5a560f1f
-  data.tar.gz: d7b6f047370c4cc2af72b632adb10678ed70ba9ef2e58e6a1630d1672ed8a3dc562f093a2787cd15611454a92c2be1f94f98b74f877e48bdf49420107129f7a1
+  metadata.gz: f113a241aec0ab76d42be635e1db174f82c02e2f8bdb0f5320a02b92b84b9d237f8ac1c2da27411a8ced881bdd752cf61f7d60224eca2e62683befde0f90ec74
+  data.tar.gz: a60110f2acf2d1b46b2a576d2800fe1718b923c307e1691e960153c6cf72db8cce65e932fc5bac397af413b0dd1a8499a067522ad00080e76a34094837ec2a43

data/.travis.yml

@@ -15,7 +15,7 @@ before_install:
 #  - sh -ex .travis/oracle/install.sh
 #  - .travis/setup_accounts.sh
 install:
-  - gem install bundler
+  - gem install bundler -v 1.17.3
   - bundle install
 gemfile:
 - gemfiles/rails4.gemfile

data/Gemfile

@@ -5,15 +5,15 @@ gemspec
 group :development, :test do
   gem "sqlite3", :platforms => [:mri, :mswin, :x64_mingw, :mingw]
   gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :x64_mingw, :mingw]
-  gem "pg", :platforms => [:mri, :mingw, :x64_mingw, :mswin]
+  gem "pg", '< 1', :platforms => [:mri, :mingw, :x64_mingw, :mswin]
 
   gem "jdbc-sqlite3", :platforms => :jruby
   gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
   gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
   gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
 
-  gem "tiny_tds", '~> 1.3.0' ,:require => false, :platforms => [:mingw, :x64_mingw, :mswin]
-  gem "activerecord-sqlserver-adapter", '~> 4.2.0', :platforms => [:mingw, :x64_mingw, :mswin]
+  gem "tiny_tds", '~> 1.3.0' ,:require => false, :platforms => [:mri,:mingw, :x64_mingw, :mswin]
+  gem "activerecord-sqlserver-adapter", '~> 4.2.0', :platforms => [:mri, :mingw, :x64_mingw, :mswin]
   
   gem 'ruby-oci8', :platforms => [:mri, :mswin, :x64_mingw, :mingw] 
   gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0'

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,ArelExtensions::Nodes::Case
 		  return case self.return_type
 		  when :string, :text			
 			self.concat(other)
@@ -72,7 +72,7 @@ module ArelExtensions
 		else		
 		  Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
 		end
-	  when ArelExtensions::Nodes::Function
+	  when ArelExtensions::Nodes::Function, ArelExtensions::Nodes::Case
 		  case self.return_type
 		  when :string, :text # ???
 			Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other)) # ??

data/lib/arel_extensions/nodes/case.rb

@@ -4,6 +4,7 @@ module ArelExtensions
 			class Case < Arel::Nodes::Node
 				include Arel::Expressions
 				include Arel::OrderPredications
+				include ArelExtensions::Math
 				include ArelExtensions::Comparators
 				include ArelExtensions::Predications
 				include ArelExtensions::MathFunctions
@@ -17,19 +18,47 @@ module ArelExtensions
 					@conditions = []
 					@default = default
 				end
+				
+				def return_type
+					obj = if @conditions.length > 0
+							@conditions.last.right
+						elsif @default
+							@default.expr
+						else
+							nil
+						end
+					if obj.respond_to?(:return_type)
+						obj.return_type
+					else
+						case obj
+						when Integer, Float
+							:number
+						when Date, DateTime,Time
+							:datetime
+						when Arel::Attributes::Attribute
+							begin 							
+								Arel::Table.engine.connection.schema_cache.columns_hash(obj.relation.table_name)[obj.name.to_s].cast_type.type
+							rescue Exception
+								:string
+							end
+						else
+							:string
+						end
+					end	
+				end
 
 				def when condition, expression = nil
-					@conditions << When.new(Arel::Nodes.build_quoted(condition), expression)
+					@conditions << When.new(condition, expression)
 					self
 				end
 
 				def then expression
-					@conditions.last.right = Arel::Nodes.build_quoted(expression)
+					@conditions.last.right = expression
 					self
 				end
 
 				def else expression
-					@default = Else.new Arel::Nodes.build_quoted(expression)
+					@default = Else.new expression
 					self
 				end
 
@@ -67,8 +96,13 @@ module ArelExtensions
 		
 			class Case < Arel::Nodes::Case	
 				include Arel::Expressions
+				include Arel::OrderPredications
+				include ArelExtensions::Math
 				include ArelExtensions::Comparators
 				include ArelExtensions::Predications
+				include ArelExtensions::MathFunctions
+				include ArelExtensions::StringFunctions
+				include ArelExtensions::NullFunctions
 				
 			end
 			

data/lib/arel_extensions/nodes/levenshtein_distance.rb

@@ -0,0 +1,11 @@
+module ArelExtensions
+  module Nodes
+    class LevenshteinDistance < Function
+    	RETURN_TYPE = :number
+		
+		def initialize expr
+		  super [convert_to_node(expr.first), Arel::Nodes.build_quoted(expr[1])]		  
+		end
+    end
+  end
+end

data/lib/arel_extensions/predications.rb

@@ -1,8 +1,8 @@
 module ArelExtensions
 	module Predications				
 		if Arel::VERSION.to_i < 7 
-			def when right
-				ArelExtensions::Nodes::Case.new(self).when(right)
+			def when right, expression=nil
+				ArelExtensions::Nodes::Case.new(self).when(right,expression)
 			end
 		end
 		

data/lib/arel_extensions/string_functions.rb

@@ -147,6 +147,10 @@ module ArelExtensions
     def repeat other = 1 
 	  ArelExtensions::Nodes::Repeat.new [self, other]
     end
+    
+    def levenshtein_distance other
+	  ArelExtensions::Nodes::LevenshteinDistance.new [self, other]
+    end
 
   end
 end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.1.3".freeze
+  VERSION = "1.1.4".freeze
 end

data/lib/arel_extensions/visitors.rb

@@ -1,6 +1,7 @@
 require 'arel_extensions/visitors/to_sql'
 require 'arel_extensions/visitors/mysql'
 require 'arel_extensions/visitors/oracle'
+require 'arel_extensions/visitors/oracle12'
 require 'arel_extensions/visitors/postgresql'
 require 'arel_extensions/visitors/sqlite'
 require 'arel_extensions/visitors/mssql'

data/lib/arel_extensions/visitors/mssql.rb

@@ -461,15 +461,14 @@ module ArelExtensions
 			before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
 			middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
 			after  = o.flags.include?('-') ? repeated_char : ''
-			full_number =  col.when(0).then('0').else(
+			full_number =  
 				ArelExtensions::Nodes::Concat.new([
 					before,
 					sign,
 					middle,
 					number,
 					after
-				])
-			)				
+				])		
 			collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
 			collector		
 		end

data/lib/arel_extensions/visitors/oracle.rb

@@ -1,6 +1,8 @@
+#require 'oracle_visitor'
 module ArelExtensions
   module Visitors
-    Arel::Visitors::Oracle.class_eval do
+    Arel::Visitors::Oracle.class_eval do    
+      
       SPECIAL_CHARS = {"\t" => 'CHR(9)', "\n" => 'CHR(10)', "\r" => 'CHR(13)'}
       Arel::Visitors::Oracle::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       Arel::Visitors::Oracle::DATE_FORMAT_DIRECTIVES = {
@@ -589,7 +591,6 @@ module ArelExtensions
 		end
 
 
-
     end
   end
 end

data/lib/arel_extensions/visitors/oracle12.rb

@@ -0,0 +1,68 @@
+module ArelExtensions
+  module Visitors
+    if Arel::VERSION.to_i < 7 
+	  class Arel::Visitors::Oracle12 < Arel::Visitors::Oracle
+	  
+		
+        def visit_Arel_Nodes_SelectStatement(o, collector)
+          # Oracle does not allow LIMIT clause with select for update
+          if o.limit && o.lock
+            raise ArgumentError, <<-MSG
+            'Combination of limit and lock is not supported.
+            because generated SQL statements
+            `SELECT FOR UPDATE and FETCH FIRST n ROWS` generates ORA-02014.`
+          MSG
+          end
+          super
+        end
+
+        def visit_Arel_Nodes_SelectOptions(o, collector)
+          collector = maybe_visit o.offset, collector
+          collector = maybe_visit o.limit, collector
+          maybe_visit o.lock, collector
+        end
+
+        def visit_Arel_Nodes_Limit(o, collector)
+          collector << "FETCH FIRST "
+          collector = visit o.expr, collector
+          collector << " ROWS ONLY"
+        end
+
+        def visit_Arel_Nodes_Offset(o, collector)
+          collector << "OFFSET "
+          visit o.expr, collector
+          collector << " ROWS"
+        end
+
+        def visit_Arel_Nodes_Except(o, collector)
+          collector << "( "
+          collector = infix_value o, collector, " MINUS "
+          collector << " )"
+        end
+
+        def visit_Arel_Nodes_UpdateStatement(o, collector)
+          # Oracle does not allow ORDER BY/LIMIT in UPDATEs.
+          if o.orders.any? && o.limit.nil?
+            # However, there is no harm in silently eating the ORDER BY clause if no LIMIT has been provided,
+            # otherwise let the user deal with the error
+            o = o.dup
+            o.orders = []
+          end
+
+          super
+        end
+
+        def visit_Arel_Nodes_BindParam(o, collector)
+          collector.add_bind(o.value) { |i| ":a#{i}" }
+        end
+
+        def is_distinct_from(o, collector)
+          collector << "DECODE("
+          collector = visit [o.left, o.right, 0, 1], collector
+          collector << ")"
+        end	    
+			
+	  end
+    end
+  end
+end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -481,20 +481,20 @@ module ArelExtensions
 			if o.default
 			  visit o.default, collector
 			  collector << " "
-			end
+			end			
 			collector << "END"
 		end
 
 		def visit_ArelExtensions_Nodes_When o, collector
 			collector << "WHEN "
-			visit o.left, collector
+			visit Arel::Nodes.build_quoted(o.left), collector
 			collector << " THEN "
-			visit o.right, collector
+			visit Arel::Nodes.build_quoted(o.right), collector
 		end
 
 		def visit_ArelExtensions_Nodes_Else o, collector
 			collector << "ELSE "
-			visit o.expr, collector
+			visit Arel::Nodes.build_quoted(o.expr), collector
 		end
 		
 		
@@ -524,6 +524,14 @@ module ArelExtensions
 			collector
 		end
 
+		def visit_ArelExtensions_Nodes_LevenshteinDistance o, collector
+			collector << "LEVENSHTEIN_DISTANCE("
+			collector = visit o.left, collector
+			collector << Arel::Visitors::ToSql::COMMA
+			collector = visit o.right, collector
+			collector << ')'
+			collector
+		end
 		
   	end
   end

data/test/visitors/test_to_sql.rb

@@ -69,7 +69,7 @@ module ArelExtensions
         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)}
+        compile(fake_table[:fake_att].coalesce(0) - 42).must_be_like %{(COALESCE("fake_tables"."fake_att", 0) - 42)}        
       end
 
       # String Functions
@@ -351,6 +351,13 @@ module ArelExtensions
 			.must_be_like %{((((LOCATE('test', "users"."name") + 1) + LOCATE('test', "users"."name")) - 1) + 1)}
 	  end
 	  
+	  it "should be possible to add and substract on some nodes" do
+		c = @table[:name]	
+        compile(c.when(0,0).else(42) + 42).must_be_like %{(CASE "users"."name" WHEN 0 THEN 0 ELSE 42 END + 42)}
+        compile(c.when(0,0).else(42) - 42).must_be_like %{(CASE "users"."name" WHEN 0 THEN 0 ELSE 42 END - 42)}
+        compile(c.when(0,"0").else("42") + "42").must_be_like %{CONCAT(CASE "users"."name" WHEN 0 THEN '0' ELSE '42' END, '42')}        
+	  end
+	  
 	  it "should be possible to desc and asc on functions" do
 		c = @table[:name]
 		compile(c.asc)

data/test/with_ar/all_agnostic_test.rb

@@ -501,7 +501,12 @@ module ArelExtensions
 
 	  # Case clause
 	  def test_case
-	    assert_equal 4, User.find_by_sql(@ut.project(@score.when(20.16).then(1).else(0).as('score_bin')).to_sql).sum(&:score_bin)
+	    assert_equal 4, User.find_by_sql(@ut.project(@score.when(20.16).then(1).else(0).as('score_bin')).to_sql).sum(&:score_bin)	    
+	    assert_equal 2, t(@arthur, @score.when(65.62,1).else(0)+1)    
+	    assert_equal 0, t(@arthur, @score.when(65.62,1).else(0)-1)
+	    assert_equal "11", t(@arthur, @score.when(65.62).then("1").else("0")+"1") 
+	    assert_equal 66.62, t(@arthur, @score.when(65.62,@score).else(@score)+1) 
+	    assert_equal "65.621", t(@arthur, @score.when(65.62,@score.cast(:string)).else(@score.cast(:string))+1).tr('0','') #tr is here because of precision on cast for some DBMS
 	  end
 	  
 	  def test_format_numbers 
@@ -523,8 +528,8 @@ module ArelExtensions
 		assert_includes ["$ 6,56e1 €","$ 6,56e+01 €"], t(@arthur, @score.format_number("$ %.2e €","fr_FR"))
 		assert_includes ["$ 6,56E1 €","$ 6,56E+01 €"], t(@arthur, @score.format_number("$ %.2E €","fr_FR"))
 		assert_includes ["$ 6,562E1 €","$ 6,562E+01 €"], t(@arthur, @score.format_number("$ %.3E €","fr_FR"))
-		assert_equal "123 456 765,6" , t(@arthur, (@score+123456700).format_number("%.1f","sv_SE"))
-		assert_equal "123456765,6" , t(@arthur, (@score+123456700).format_number("%.1f","fr_FR"))
+		assert_equal "123 456 765,6" , t(@arthur, (@score+123456700).format_number("%.1f","sv_SE")).gsub("\u00A0"," ") #some DBMS put no-break space here (it makes sense thus)
+		assert_equal "123456765,6" , t(@arthur, (@score+123456700).format_number("%.1f","fr_FR")).gsub("\u00A0","") #because SqlServer does it like no one else
 		assert_equal "123,456,765.6" , t(@arthur, (@score+123456700).format_number("%.1f","en_US"))
 		assert_equal "   123,456,765.6" , t(@arthur, (@score+123456700).format_number("%16.1f","en_US"))
 		assert_equal "$ 0,00 €" , t(@arthur, @score.when(65.62).then(Arel.sql("null")).else(1).format_number("$ %.2f €","fr_FR"))
@@ -666,7 +671,13 @@ module ArelExtensions
 		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
+	  
+	  #def test_levenshtein_distance
+		#assert 2,  t(@arthur,@name.levenshtein_distance("Artour"))
+	  #end
+	  
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -138,6 +138,7 @@ files:
 - lib/arel_extensions/nodes/function.rb
 - lib/arel_extensions/nodes/is_null.rb
 - lib/arel_extensions/nodes/length.rb
+- lib/arel_extensions/nodes/levenshtein_distance.rb
 - lib/arel_extensions/nodes/locate.rb
 - lib/arel_extensions/nodes/log10.rb
 - lib/arel_extensions/nodes/matches.rb
@@ -166,6 +167,7 @@ files:
 - lib/arel_extensions/visitors/mssql.rb
 - lib/arel_extensions/visitors/mysql.rb
 - lib/arel_extensions/visitors/oracle.rb
+- lib/arel_extensions/visitors/oracle12.rb
 - lib/arel_extensions/visitors/postgresql.rb
 - lib/arel_extensions/visitors/sqlite.rb
 - lib/arel_extensions/visitors/to_sql.rb
@@ -209,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Extending Arel