arel_extensions 1.0.5 → 1.0.6

data/test/visitors/test_to_sql.rb

@@ -40,6 +40,7 @@ module ArelExtensions
       end
 
       it "should return right calculations on numbers" do
+		#puts (@price.abs + 42).inspect
         compile(@price.abs + 42).must_be_like %{(ABS("products"."price") + 42)}
         compile(@price.ceil + 42).must_be_like %{(CEIL("products"."price") + 42)}
         compile(@price.floor + 42).must_be_like %{(FLOOR("products"."price") + 42)}
@@ -62,8 +63,9 @@ module ArelExtensions
       it "should accept functions on strings" do
         c = @table[:name]
         compile(c + 'test').must_be_like %{CONCAT(\"users\".\"name\", 'test')}
-        compile(c + 'test' + ' chain').must_be_like %{CONCAT(\"users\".\"name\", 'test', ' chain')}
+        compile(c + 'test' + ' chain').must_be_like %{CONCAT(CONCAT(\"users\".\"name\", 'test'), ' chain')}
         compile(c.length).must_be_like %{LENGTH("users"."name")}
+        #puts (c.length.round + 42).inspect
         compile(c.length.round + 42).must_be_like %{(ROUND(LENGTH("users"."name")) + 42)}
         compile(c.locate('test')).must_be_like %{LOCATE('test', "users"."name")}
         compile(c & 42).must_be_like %{FIND_IN_SET(42, "users"."name")}
@@ -75,6 +77,11 @@ module ArelExtensions
         compile(c.imatches('%test%')).must_be_like %{"users"."name" ILIKE '%test%'}
         compile(c.imatches_any(['%test%', 't2'])).must_be_like %{("users"."name" ILIKE '%test%' OR "users"."name" ILIKE 't2')}
         compile(c.idoes_not_match('%test%')).must_be_like %{"users"."name" NOT ILIKE '%test%'}
+        
+        compile(c.substring(1)).must_be_like %{SUBSTRING("users"."name", 1)}        
+        compile(c + '0').must_be_like %{CONCAT("users"."name", '0')}
+        compile(c.substring(1) + '0').must_be_like %{CONCAT(SUBSTRING("users"."name", 1), '0')}
+        compile(c.substring(1) + c.substring(2)).must_be_like %{CONCAT(SUBSTRING("users"."name", 1), SUBSTRING("users"."name", 2))}
       end
 
       # Comparators
@@ -235,10 +242,23 @@ module ArelExtensions
             .must_be_like %{CASE "users"."name" WHEN 'smith' THEN 'cool' ELSE 'uncool' END ILIKE 'value'}  			     									
      end
      
+     it "should be possible to use as on anything" do
+		compile(@table[:name].as('alias')).must_be_like %{"users"."name" AS alias}
+		compile(@table[:name].concat(' test').as('alias')).must_be_like %{CONCAT("users"."name", ' test') AS alias}		
+		compile((@table[:name] + ' test').as('alias')).must_be_like %{CONCAT("users"."name", ' test') AS alias}
+		compile((@table[:age] + 42).as('alias')).must_be_like %{("users"."age" + 42) AS alias}		
+		compile(@table[:name].coalesce('').as('alias')).must_be_like %{COALESCE("users"."name", '') AS alias}
+		compile(Arel::Nodes.build_quoted('test').as('alias')).must_be_like %{'test' AS alias}
+		compile(@table.project(@table[:name]).as('alias')).must_be_like %{(SELECT "users"."name" FROM "users") alias}
+		compile(@table[:name].when("smith").then("cool").else("uncool").as('alias')).
+			must_be_like %{CASE "users"."name" WHEN 'smith' THEN 'cool' ELSE 'uncool' END AS alias}  			     									
+     end
      
 	  it "should accept comparators on functions" do
 		  c = @table[:name]
 		  compile(c.soundex == 'test').must_be_like %{SOUNDEX("users"."name") = 'test'}
+		  compile(c.soundex != 'test').must_be_like %{SOUNDEX("users"."name") != 'test'}
+		  compile(c.length >= 0 ).must_be_like %{LENGTH("users"."name") >= 0}
 	  end
 	  
 	  

data/test/with_ar/all_agnostic_test.rb

@@ -57,7 +57,7 @@ module ArelExtensions
         @sophie = User.where(:id => u.id)
         u = User.create :age => 20, :name => "Camille", :created_at => d, :score => -20.16
         @camille = User.where(:id => u.id)
-        u = User.create :age => 21, :name => "Arthur", :created_at => d, :score => 65.62
+        u = User.create :age => 21, :name => "Arthur", :created_at => d, :score => 65.62, :comments => 'arrêté'
         @arthur = User.where(:id => u.id)
         u = User.create :age => 23, :name => "Myung", :created_at => d, :score => 20.16, :comments => ' '
         @myung = User.where(:id => u.id)
@@ -200,6 +200,10 @@ module ArelExtensions
         end
         assert_equal 'Lu', t(@lucas, @name[0,2])
         assert_equal 'Lu', t(@lucas, @name[0..1])
+        
+        #substring should accept string function
+        assert_equal 'Ce', t(@camille, @name.substring(1, 1).concat('e'))
+        assert_equal 'Ce', t(@camille, @name.substring(1, 1)+'e')
       end
 
       def test_find_in_set
@@ -255,6 +259,7 @@ module ArelExtensions
       end
 
       def test_imatches
+		#puts User.where(@name.imatches('m%')).to_sql
         assert_equal 1, User.where(@name.imatches('m%')).count
         assert_equal 4, User.where(@name.imatches_any(['L%', '%e'])).count
         assert_equal 6, User.where(@name.idoes_not_match('L%')).count
@@ -360,7 +365,7 @@ module ArelExtensions
 
       def test_date_duration
         #Year
-        assert_equal 2016, t(@lucas, @created_at.year).to_i
+        assert_equal 2016, t(@lucas, @created_at.year).to_i        
         assert_equal 0, User.where(@created_at.year.eq("2012")).count
         #Month
         assert_equal 5, t(@camille, @created_at.month).to_i
@@ -415,11 +420,13 @@ module ArelExtensions
       def test_cast_types
 		assert_equal "5", t(@lucas, @age.cast(:string))
 		if @env_db == 'mysql' || @env_db == 'postgresql' || @env_db == 'oracle'			
-			assert_equal "12:42:21", t(@laure, @duration.cast(:time).cast(:string))
+			assert_equal 1, t(@laure,ArelExtensions::Nodes::Case.new.when(@duration.cast(:time).cast(:string).eq("12:42:21")).then(1).else(0))
+			assert_equal 1, t(@laure,ArelExtensions::Nodes::Case.new.when(@duration.cast(:time).eq("12:42:21")).then(1).else(0))
 		end
       end
 
-      def test_is_null
+      def test_is_null	
+		#puts User.where(@age.is_null).select(@name).to_sql
         assert_equal "Test", User.where(@age.is_null).select(@name).first.name
       end
 
@@ -490,24 +497,63 @@ module ArelExtensions
 	  end
 	  
 	  def test_format_numbers
+		skip "Not yet implemented" if @env_db != 'mysql'
 		#score of Arthur = 65.62
-		if @env_db == 'mysql'
-			assert_equal "AZERTY65,62" , t(@arthur, @score.format_number("AZERTY%.2f","fr_FR"))
-			assert_equal "65,62AZERTY" , t(@arthur, @score.format_number("%.2fAZERTY","fr_FR"))
-			assert_equal "$ 65.62 €" , t(@arthur, @score.format_number("$ %.2f €","en_EN"))		
-			assert_equal "$ 0065,62 €" , t(@arthur, @score.format_number("$ %07.2f €","fr_FR"))
-			assert_equal "$ 65,62   €" , t(@arthur, @score.format_number("$ %-07.2f €","fr_FR"))
-			assert_equal "$ 65,62   €" , t(@arthur, @score.format_number("$ %-7.2f €","fr_FR"))
-			assert_equal "$   65,62 €" , t(@arthur, @score.format_number("$ % 7.2f €","fr_FR"))
-			assert_equal "$  +65,62 €" , t(@arthur, @score.format_number("$ % +7.2f €","fr_FR"))		
-			assert_equal "$ +065,62 €" , t(@arthur, @score.format_number("$ %0+7.2f €","fr_FR"))	
-			assert_equal "$ 6,56e1 €" , t(@arthur, @score.format_number("$ %.2e €","fr_FR"))			
-			assert_equal "$ 6,56E1 €" , t(@arthur, @score.format_number("$ %.2E €","fr_FR"))	
-			assert_equal "Wrong Format" , t(@arthur, @score.format_number("$ %...234.6F €","fr_FR"))
-		end
+		assert_equal "AZERTY65,62" , t(@arthur, @score.format_number("AZERTY%.2f","fr_FR"))
+		assert_equal "65,62AZERTY" , t(@arthur, @score.format_number("%.2fAZERTY","fr_FR"))
+		assert_equal "$ 65.62 €" , t(@arthur, @score.format_number("$ %.2f €","en_EN"))		
+		assert_equal "$ 0065,62 €" , t(@arthur, @score.format_number("$ %07.2f €","fr_FR"))
+		assert_equal "$ 65,62   €" , t(@arthur, @score.format_number("$ %-07.2f €","fr_FR"))
+		assert_equal "$ 65,62   €" , t(@arthur, @score.format_number("$ %-7.2f €","fr_FR"))
+		assert_equal "$   65,62 €" , t(@arthur, @score.format_number("$ % 7.2f €","fr_FR"))
+		assert_equal "$  +65,62 €" , t(@arthur, @score.format_number("$ % +7.2f €","fr_FR"))		
+		assert_equal "$ +065,62 €" , t(@arthur, @score.format_number("$ %0+7.2f €","fr_FR"))	
+		assert_equal "$ 6,56e1 €" , t(@arthur, @score.format_number("$ %.2e €","fr_FR"))			
+		assert_equal "$ 6,56E1 €" , t(@arthur, @score.format_number("$ %.2E €","fr_FR"))	
+		assert_equal "Wrong Format" , t(@arthur, @score.format_number("$ %...234.6F €","fr_FR"))
 	  end
 	  
-
+	  def test_accent_insensitive
+		skip "SQLite is natively Case Insensitive and Accent Sensitive" if $sqlite
+		skip "Not finished" if @env_db == 'mysql'
+		# actual comments value: "arrêté"		
+		#AI & CI	
+		if !['postgresql'].include?(@env_db) # Extension unaccent required on PG
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arrêté")).then("1").else("0"))
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arrete")).then("1").else("0"))		  		  
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("àrrétè")).then("1").else("0"))		  		  
+			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("arretez")).then("1").else("0"))		  
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("Arrete")).then("1").else("0"))
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_imatches("Arrêté")).then("1").else("0"))
+			#AI & CS
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arrêté")).then("1").else("0"))
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arrete")).then("1").else("0"))		  		  
+			assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("àrrétè")).then("1").else("0"))		  		  
+			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("arretez")).then("1").else("0"))		  
+			if !['oracle','postgresql','mysql'].include?(@env_db) # AI => CI
+				assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("Arrete")).then("1").else("0"))
+				assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.ai_matches("Arrêté")).then("1").else("0"))
+			end			
+		end
+		#AS & CI
+		assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arrêté")).then("1").else("0"))
+		if !['mysql'].include?(@env_db) # CI => AI in utf8 (AI not possible in latin1)
+			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arrete")).then("1").else("0"))		  		  
+			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("àrrétè")).then("1").else("0"))		  		  
+		end		  
+		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("arretez")).then("1").else("0"))		  
+		if !['mysql'].include?(@env_db) # CI => AI in utf8 (AI not possible in latin1)
+			assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("Arrete")).then("1").else("0"))
+		end
+		assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.imatches("Arrêté")).then("1").else("0"))
+		#AS & CS
+		assert_equal "1", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("arrêté")).then("1").else("0"))
+		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("arrete")).then("1").else("0"))		  		  
+		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("àrrétè")).then("1").else("0"))		  		  
+		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("arretez")).then("1").else("0"))		  
+		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("Arrete")).then("1").else("0"))
+		assert_equal "0", t(@arthur,ArelExtensions::Nodes::Case.new.when(@comments.smatches("Arrêté")).then("1").else("0"))  
+	  end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -103,7 +103,7 @@ files:
 - gemfiles/rails4.gemfile
 - gemfiles/rails5_0.gemfile
 - gemfiles/rails5_1_4.gemfile
-- gemfiles/rails5_2_beta.gemfile
+- gemfiles/rails5_2.gemfile
 - init/mssql.sql
 - init/mysql.sql
 - init/oracle.sql
@@ -127,6 +127,7 @@ files:
 - lib/arel_extensions/nodes/ceil.rb
 - lib/arel_extensions/nodes/change_case.rb
 - lib/arel_extensions/nodes/coalesce.rb
+- lib/arel_extensions/nodes/collate.rb
 - lib/arel_extensions/nodes/concat.rb
 - lib/arel_extensions/nodes/date_diff.rb
 - lib/arel_extensions/nodes/duration.rb