arel_extensions 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 709b543bdf84952b555236ce66c94f37e33b4183
-  data.tar.gz: 053561c6aa304247471bf9effb7712eb913ec281
+  metadata.gz: e6b6035bcab431e9db110bac526dba5d7ae50cf9
+  data.tar.gz: afb3bd312dbcd6ecc15ba1658b4ad2229f47e8d7
 SHA512:
-  metadata.gz: 72d08bc341ea513e51f0650cc1677b781929f4af3a2aff55af45c5044643cecd9d7fd82caaa353e4cf8a807477d46c8c2fe394d741d607df9726eb29c623c0a9
-  data.tar.gz: 647156dfc77c72a0bef98112815ed16b050a7523402608c439ddbb704345bea69d990a4df8bc08600426bf92de24f2358cdd0196e1c423166d59378ea20719da
+  metadata.gz: f98fda0e062afc38ab6b9b10d9f72c857b348551095f396e0821b953296c9097067593ccdc50b764f35e5fb30e8994ef5c445491e7a0fc94a16ca19ed251da9f
+  data.tar.gz: e616f743571bde26c649646067dc3d25f8a60abdf8c479c204761ea2851824536534ba5d31d519ff3bc3b8b3fd04dc6056e696688fc732dfe2003282bb908742

data/SQL_Challenges.md

@@ -7,7 +7,7 @@ A good way could be to create user defined functions to ensure a total transpare
 
 ## SQLite (without extension)
 - FIND_IN_SET
-- LOCATE
+- LOCATE / instr
 - REGEXP
 - SOUNDEX
 

data/TODO

@@ -17,7 +17,6 @@ Code quality:
 
 
 New features:
-- UPCASE / DOWNCASE
 - POSIX format numbers (%.2f)
 - easy unions
 - cast, to_char

data/lib/arel_extensions/math.rb

@@ -12,6 +12,13 @@ module ArelExtensions
     #Date and integer adds or subtracts a specified time interval from a date.
     def +(other)
       return ArelExtensions::Nodes::Concat.new [self, other] if self.is_a?(Arel::Nodes::Quoted)
+      if self.is_a?(Arel::Nodes::Grouping)
+        if self.expr.left.is_a?(String) || self.expr.right.is_a?(String)
+          return ArelExtensions::Nodes::Concat.new [self, other]
+        else
+          return Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+        end
+      end
       return case self.class.return_type
       when :string, :text
         ArelExtensions::Nodes::Concat.new [self, other]

data/lib/arel_extensions/nodes/change_case.rb

@@ -0,0 +1,11 @@
+module ArelExtensions
+  module Nodes
+    class Downcase < Function
+    	@@return_type = :string
+    end
+
+    class Upcase < Function
+    	@@return_type = :string
+    end
+  end
+end

data/lib/arel_extensions/nodes/locate.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Nodes
     class Locate < Function
+    	@@return_type = :integer
 
 		def initialize expr
 			tab = expr.map do |arg|
@@ -9,10 +10,6 @@ module ArelExtensions
 			return super(tab)
 		end
 
-		def +(other)
-	        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
-		end
-
     end
   end
 end

data/lib/arel_extensions/nodes/substring.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Nodes
     class Substring < Function
+    	@@return_type = :string
 
 		def initialize expr
 			tab = [convert_to_node(expr[0]), convert_to_node(expr[1])]
@@ -12,9 +13,10 @@ module ArelExtensions
 			return super(tab)
 		end
 
-		def +(other)
-	        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
-		end
+#		def +(other)
+#			puts "[Substring] : #{other.inspect} (#{self.expressions.inspect})"
+#	        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
+#		end
 
     end
   end

data/lib/arel_extensions/string_functions.rb

@@ -7,6 +7,7 @@ require 'arel_extensions/nodes/find_in_set'
 require 'arel_extensions/nodes/replace'
 require 'arel_extensions/nodes/soundex'
 require 'arel_extensions/nodes/trim'
+require 'arel_extensions/nodes/change_case'
 require 'arel_extensions/nodes/blank'
 require 'arel_extensions/nodes/format'
 
@@ -94,6 +95,14 @@ module ArelExtensions
       ArelExtensions::Nodes::Rtrim.new [self, other]
     end
 
+    def downcase
+      ArelExtensions::Nodes::Downcase.new [self]
+    end
+
+    def upcase
+      ArelExtensions::Nodes::Upcase.new [self]
+    end
+
     def blank
       ArelExtensions::Nodes::Blank.new [self]
     end

data/lib/arel_extensions/tasks.rb

@@ -1,12 +1,12 @@
-namespace :arelextensions do
-	desc 'Install DB functions'
+namespace :arel_extensions do
+	desc 'Install DB functions into current DB'
 	task :install_functions => :environment do
-        if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
+		if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
           @env_db = (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
         else
-          @env_db = ENV['DB']
+          @env_db = ENV['DB'] || ActiveRecord::Base.connection.adapter_name
         end
-        ActiveRecord::Base.establish_connection(@env_db.try(:to_sym) || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
+        ActiveRecord::Base.establish_connection(Rails.env)
         @cnx = ActiveRecord::Base.connection
         if File.exist?("init/#{@env_db}.sql")
           sql = File.read("init/#{@env_db}.sql")

data/lib/arel_extensions/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module ArelExtensions
-  VERSION = "0.9.6".freeze
+  VERSION = "0.9.7".freeze
 end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -72,7 +72,7 @@ module ArelExtensions
         collector << "instr("
         collector = visit o.expr, collector
         collector << Arel::Visitors::SQLite::COMMA
-        collector = visit o.val, collector
+        collector = visit o.right, collector
         collector << ")"
         collector
       end
@@ -80,7 +80,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Substring o, collector
         collector << "SUBSTR("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << Arel::Visitors::SQLite::COMMA unless i == 0
           collector = visit arg, collector
         }
         collector << ")"

data/lib/arel_extensions/visitors/to_sql.rb

@@ -131,6 +131,26 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Downcase o, collector
+        collector << "LOWER("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
+      def visit_ArelExtensions_Nodes_Upcase o, collector
+        collector << "UPPER("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_Trim o, collector
         collector << "TRIM("
         o.expressions.each_with_index { |arg, i|

data/test/real_db_test.rb

@@ -21,7 +21,7 @@ def setup_db
         db.enable_load_extension(0)
       rescue => e
         $load_extension_disabled = true
-        puts "can not load extensions #{e.inspect}"
+        $stderr << "can not load extensions #{e.inspect}\n"
       end
     end
     #function find_in_set

data/test/with_ar/all_agnostic_test.rb

@@ -241,6 +241,12 @@ module ArelExtensions
         assert_equal "replace", t(@lucas, @name.replace(@name, "replace"))
       end
 
+      def test_replace_once
+        skip "TODO"
+#        skip "Sqlite version can't load extension for locate" if $sqlite && $load_extension_disabled
+        assert_equal "LuCas", t(@lucas, @name.substring(1, @name.locate('c') - 1) + 'C' + @name.substring(@name.locate('c') + 1, @name.length))
+      end
+
       def test_soundex
         skip "Sqlite version can't load extension for soundex" if $sqlite && $load_extension_disabled
         skip "PostgreSql version can't load extension for soundex" if @env_db == 'postgresql'
@@ -248,6 +254,12 @@ module ArelExtensions
         assert_equal 8, User.where(@name.soundex.eq(@name.soundex)).count
       end
 
+      def test_change_case
+        assert_equal "myung", t(@myung, @name.downcase)
+        assert_equal "MYUNG", t(@myung, @name.upcase)
+        assert_equal "myung", t(@myung, @name.upcase.downcase)
+      end
+
       def test_trim
         assert_equal "Myung", t(@myung, @name.trim)
         assert_equal "Myung", t(@myung, @name.trim.ltrim.rtrim)
@@ -290,7 +302,7 @@ module ArelExtensions
 
         assert_equal ' ', t(@myung, @comments.coalesce("Myung").coalesce('ignored'))
         assert_equal 'Laure', t(@laure, @comments.coalesce("Laure"))
-        assert_equal '', t(@laure, @comments.coalesce(""))
+        assert_equal (@env_db == 'oracle' ? nil : ''), t(@laure, @comments.coalesce(""))
 
         if @env_db == 'postgresql'
           assert_equal 100, t(@test, @age.coalesce(100))

data/test/with_ar/insert_agnostic_test.rb

@@ -20,7 +20,7 @@ module ArelExtensions
         if File.exist?("init/#{@env_db}.sql")
           sql = File.read("init/#{@env_db}.sql")
           unless sql.blank?
-            @cnx.execute(sql) rescue $stderr << "can't create functions"
+            @cnx.execute(sql) rescue $stderr << "can't create functions\n"
           end
         end
         @cnx.drop_table(:user_tests) rescue nil 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -116,6 +116,7 @@ files:
 - lib/arel_extensions/nodes/abs.rb
 - lib/arel_extensions/nodes/blank.rb
 - lib/arel_extensions/nodes/ceil.rb
+- lib/arel_extensions/nodes/change_case.rb
 - lib/arel_extensions/nodes/coalesce.rb
 - lib/arel_extensions/nodes/concat.rb
 - lib/arel_extensions/nodes/date_diff.rb