arel_extensions 0.9.7.3 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90dbf2b395e62dd412838ecbab920e0fba59de5a
-  data.tar.gz: 0ea5797f50889bbe887f32679fef7e4155f15306
+  metadata.gz: 37c0984cf29025e6a939c3c414c8adc08ed35fa2
+  data.tar.gz: 4344e373d9059ea8517db8f1dc8a41e9176358cb
 SHA512:
-  metadata.gz: c010c2248558442c0fdefcbfc2bef58b2f4667856a1403c4d08632361c0f741bff1d0e929c4b3a8f03781f7a38b8687ea5ed27944df62d001aa61b09235c0a0e
-  data.tar.gz: a03da2a7a55e3862a21fb6d7a295b45c2d7e4d60b63251ffb1149af3782e94eb93ed47bbc705477b139cad9efaabc1687232c38df60523e69efb46832e276f26
+  metadata.gz: 7f53b62f6ab162cd2e9b36dd5989117e7faea7da8febb6c6419f42c164afd6af97a782fd3c58f4097a1a86fed470af5efff3b1615b673c6b3f914ca0c831efd9
+  data.tar.gz: 567ec3f76cc130715855dbb0a674b3e0a89291f1945fd100c297ba7864b3473adc25bce974af00c272786fc14f5c5630adc0b7209bc41550ef42d7628970f5be

data/.rubocop.yml

@@ -0,0 +1,40 @@
+AllCops:
+  DisabledByDefault: true
+  Exclude:
+  - "test/**/*"
+
+Layout/EndOfLine:
+  Enabled: true
+
+Layout/ExtraSpacing:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/TrailingBlankLines:
+  Enabled: true
+
+Style/CollectionMethods:
+  Enabled: true
+
+Style/CommandLiteral:
+  Enabled: true
+
+Style/CommentAnnotation:
+  Enabled: true
+
+Style/ConditionalAssignment:
+  Enabled: true
+
+Style/EmptyElse:
+  Enabled: true
+
+Style/Encoding:
+  Enabled: true
+
+Style/FileName:
+  Enabled: true
+
+Style/MethodCallWithArgsParentheses:
+  Enabled: false

data/.travis/sqlite3/extension-functions.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+sudo curl -L https://sqlite.org/contrib/download/extension-functions.c?get=25 -o /tmp/extension-functions.c
+sudo gcc -fPIC -lm -shared /tmp/extension-functions.c -o /usr/lib/sqlite3/extension-functions.so

data/.travis.yml

@@ -5,10 +5,13 @@ cache:
   directories:
   - $ORACLE_DOWNLOAD_DIR
 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
 install:
+- sudo apt-get install -y sqlite3-pcre curl
+- .travis/sqlite3/extension-functions.sh
 - .travis/oracle/download.sh
 - .travis/oracle/install.sh
 - .travis/setup_accounts.sh
@@ -16,6 +19,7 @@ install:
 - bundle install
 gemfile:
 - gemfiles/rails4.gemfile
+- gemfiles/rails5_0.gemfile
 - gemfiles/rails5.gemfile
 services:
 - mysql
@@ -48,6 +52,7 @@ rvm:
 - 2.1
 - 2.2.5
 - 2.3.1
+- 2.4.0
 - rbx-2
 - jruby-9.0.5.0
 - jruby-head
@@ -79,6 +84,10 @@ matrix:
     jdk: openjdk7
   - rvm: 2.3.1
     jdk: oraclejdk7
+  - rvm: 2.4.0
+    jdk: openjdk7
+  - rvm: 2.4.0
+    jdk: oraclejdk7
   - rvm: ruby-head
     jdk: openjdk7
   - rvm: ruby-head
@@ -91,9 +100,21 @@ matrix:
     gemfile: gemfiles/rails5.gemfile
   - rvm: ruby-head
     gemfile: gemfiles/rails4.gemfile
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails5_0.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/rails5_0.gemfile
+  - rvm: rbx-2
+    gemfile: gemfiles/rails5_0.gemfile
   allow_failures:
   - rvm: rbx-2
     gemfile: gemfiles/rails4.gemfile
+  - rvm: rbx-2
+    gemfile: gemfiles/rails5_0.gemfile
+  - rvm: jruby-9.0.5.0
+    gemfile: gemfiles/rails5_0.gemfile
+  - rvm: jruby-head
+    gemfile: gemfiles/rails5_0.gemfile
   - rvm: rbx-2
     gemfile: gemfiles/rails5.gemfile
   - rvm: jruby-9.0.5.0

data/Gemfile

@@ -3,21 +3,20 @@ source "https://rubygems.org"
 gemspec
 
 group :development, :test do
-	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
-	gem "mysql2", :platforms => [:mri, :mswin, :mingw]
-    gem "pg", :platforms => [:mri, :mingw, :mswin]
+  gem "sqlite3", :platforms => [:mri, :mswin, :x64_mingw, :mingw]
+  gem "mysql2", :platforms => [:mri, :mswin, :x64_mingw, :mingw]
+  gem "pg", :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 "jdbc-sqlite3", :platforms => :jruby
+  gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+  gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+  gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
 
-	if RUBY_PLATFORM =~ /[^r]win\d\d/
-    	gem "tiny_tds", :require => false, :platforms => [:mri, :mingw, :mswin]
-    	gem "activerecord-sqlserver-adapter", '~> 4.2.0', :platforms => [:mri, :mingw, :mswin]
-	end
+	
+  gem "tiny_tds", :require => false, :platforms => [:mingw, :x64_mingw, :mswin]
+  gem "activerecord-sqlserver-adapter", '~> 4.2.0', :platforms => [:mingw, :x64_mingw, :mswin]
 
-	gem 'activesupport', '~> 4.0'
-  	gem 'activemodel', '~> 4.0'
-  	gem 'activerecord', '~> 4.0'
-end
+  gem 'activesupport', '~> 4.0'
+  gem 'activemodel', '~> 4.0'
+  gem 'activerecord', '~> 4.0'
+end

data/README.md

@@ -14,6 +14,17 @@ It allows to use more advanced SQL functions for any supported RDBMS.
 ## Requirements
 
 Arel 6 (Rails 4) or Arel 7+ (Rails 5).
+[Arel Repository](http://github.com/rails/arel)
+
+## Usage
+
+Most of the features will work just by adding the gem to your Gemfiles. To make sure to get all the features for any dbms, you should execute the next line as soon as you get your connection to your DB:
+
+```ruby
+ArelExtensions::CommonSqlFunctions.new(ActiveRecord::Base.connection).add_sql_functions()
+```
+
+It will add common SQL features in your DB to align ti with current routines. Technically, it will execute SQL scripts from init folder.
 
 
 ## Examples
@@ -212,7 +223,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <th class="tg-ffjm" rowspan="12"><div>String functions</div></th>
+    <th class="tg-ffjm" rowspan="13"><div>String functions</div></th>
     <td class="tg-yw4l">CONCAT<br>column + "string"</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
@@ -234,7 +245,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="tg-yw4l">LOCATE<br>column.locate("string")</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">INSTR()</td>
+    <td class="tg-j6lv">INSTR() or Ruby function</td>
     <td class="ok">✔</td>
     <td class="tg-j6lv">CHARINDEX()</td>
     <td class="ok">✔</td>
@@ -252,7 +263,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="tg-yw4l">FIND_IN_SET<br>column &amp; ("l")</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-orpl">db.create_function( "find_in_set", 1 ) <br>do |func, value1, value2|,<br>func.result =value1.index(value2)<br>end <br></td>
+    <td class="tg-orpl">Ruby function</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>

data/Rakefile

@@ -36,4 +36,4 @@ end
 
 	  # Make sure the adapter test evaluates the env setting task
 	task "test_#{adapter}" => ["#{adapter}:env", "test:#{adapter}"]
-end
+end

data/SQL_Challenges.md

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

data/TODO

@@ -15,11 +15,14 @@ Code quality:
 [![security](https://hakiri.io/github/faveod/arel_extensions/master.svg)](https://hakiri.io/github/faveod/arel_extensions/master)
 [![codebeat](https://codebeat.co/badges/<change>)](https://codebeat.co/projects/github-com-faveod-arel_extensions)
 
+TODO:
+- all skips in tests
 
 New features:
-- POSIX format numbers (%.2f)
+- POSIX format numbers (%.2f), dates (man 3 printf)
 - easy unions
 - cast, to_char
+- avoid incompatible queries in PgSQL/Oracle/SQLServer when columns are used outside of group by columns (in select or order by)
 
 Tests improvements:
 - SQL Server

data/arel_extensions.gemspec

@@ -1,4 +1,3 @@
-# # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "arel_extensions/version"
 

data/gemfiles/rails5.gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'arel', '~> 7.0'
+gem 'arel', '~> 8'
 
 group :development, :test do
 	gem 'activesupport', '~> 5'
@@ -15,7 +15,7 @@ group :development, :test do
 #    gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
 
 	gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
-	gem 'activerecord-oracle_enhanced-adapter', '~> 1.7.0' if ENV.has_key? 'ORACLE_HOME'
+	gem 'activerecord-oracle_enhanced-adapter', '~> 1.8' if ENV.has_key? 'ORACLE_HOME'
 
 	# for JRuby
 	gem 'activerecord-jdbc-adapter', :platforms => :jruby

data/gemfiles/rails5_0.gemfile

@@ -0,0 +1,29 @@
+source "https://rubygems.org"
+
+gem 'arel', '~> 7.0'
+
+group :development, :test do
+	gem 'activesupport', '~> 5.0'
+	gem 'activemodel', '~> 5.0'
+	gem 'activerecord', '~> 5.0'
+
+	gem "sqlite3", :platforms => [:mri, :mswin, :mingw]
+	gem "mysql2", :platforms => [:mri, :mswin, :mingw]
+    gem "pg", :platforms => [:mri, :mingw]
+
+    gem "tiny_tds", :platforms => [:mri, :mingw]
+#    gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
+
+	gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+	gem 'activerecord-oracle_enhanced-adapter', '~> 1.7' if ENV.has_key? 'ORACLE_HOME'
+
+	# for JRuby
+	gem 'activerecord-jdbc-adapter', :platforms => :jruby
+	gem "jdbc-sqlite3", :platforms => :jruby
+	gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+	gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
+	gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
+	gem "activerecord-jdbcmssql-adapter", :platforms => :jruby
+end
+
+gemspec :path => "../"

data/lib/arel_extensions/attributes.rb

@@ -23,4 +23,4 @@ module ArelExtensions
     end
 
   end
-end
+end

data/lib/arel_extensions/boolean_functions.rb

@@ -23,4 +23,4 @@ end
 
 Arel::Nodes::Or.class_eval do
   include ArelExtensions::BooleanFunctions
-end
+end

data/lib/arel_extensions/common_sql_functions.rb

@@ -0,0 +1,62 @@
+module ArelExtensions
+  class CommonSqlFunctions
+
+    def initialize(cnx)
+      @cnx = cnx
+      if cnx && cnx.adapter_name =~ /sqlite/i && !$load_extension_disabled
+        begin
+          db = cnx.raw_connection
+          db.enable_load_extension(1)
+          db.load_extension("/usr/lib/sqlite3/pcre.so")
+          db.load_extension("/usr/lib/sqlite3/extension-functions.so")
+          db.enable_load_extension(0)
+        rescue => e
+          $load_extension_disabled = true
+          puts "can not load extensions #{e.inspect}"
+        end
+      end
+    end
+
+    def add_sqlite_functions
+      db = @cnx.raw_connection
+      db.create_function("find_in_set", 1) do |func, val, list|
+        case list
+        when String
+          i = list.split(',').index(val.to_s)
+          func.result = i ? (i+1) : 0
+        when NilClass
+          func.result = nil
+        else
+          i = list.to_s.split(',').index(val.to_s)
+          func.result = i ? (i+1) : 0
+        end
+      end
+      db.create_function("instr", 1) do |func, value1, value2|
+        i = value1.to_s.index(value2.to_s)
+        func.result = i ? (i+1) : 0
+      end rescue "function instr already here (>= 3.8.5)"
+    end
+
+    def add_sql_functions(env_db = nil)
+      env_db ||= @cnx.adapter_name
+      if env_db =~ /sqlite/i
+        begin
+          add_sqlite_functions
+        rescue => e
+          puts "can not add sqlite functions #{e.inspect}"
+        end
+      end
+      if File.exist?("init/#{env_db}.sql")
+        sql = File.read("init/#{env_db}.sql")
+        if env_db == 'mssql'
+          sql.split(/^GO\s*$/).each {|str|
+            @cnx.execute(str.strip) unless str.blank?
+          }
+        else
+          @cnx.execute(sql) unless sql.blank?
+        end
+      end
+    end
+
+  end
+end

data/lib/arel_extensions/date_duration.rb

@@ -45,4 +45,4 @@ module ArelExtensions
     end
 
   end
-end
+end

data/lib/arel_extensions/insert_manager.rb

@@ -30,4 +30,4 @@ module ArelExtensions
 	end
 
   end
-end
+end

data/lib/arel_extensions/math.rb

@@ -34,7 +34,7 @@ module ArelExtensions
         other = other.to_i if other.is_a?(String)
         Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
       elsif arg == :decimal || arg == :float
-        other = Arel.sql(other) if other.is_a?(String)  # Arel should accept Float & BigDecimal!
+        other = Arel.sql(other) if other.is_a?(String) # Arel should accept Float & BigDecimal!
         Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
       elsif arg == :datetime || arg == :date
         ArelExtensions::Nodes::DateAdd.new [self, other]
@@ -44,7 +44,7 @@ module ArelExtensions
     end
 
     #function returns the time between two dates
-    #function returns the susbration between two int
+    #function returns the substraction between two ints
     def -(other)
       return case self.class.return_type
       when :string, :text # ???
@@ -68,12 +68,12 @@ module ArelExtensions
           end
         when Arel::Nodes::Node, DateTime, Time, String, Date
           ArelExtensions::Nodes::DateDiff.new [self, other]
-        when Fixnum
+        when Integer
           ArelExtensions::Nodes::DateSub.new [self, other]
         end
       else
         case other
-        when Fixnum, Float, BigDecimal
+        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)))

data/lib/arel_extensions/nodes/blank.rb

@@ -18,4 +18,4 @@ module ArelExtensions
     end
 
   end
-end
+end

data/lib/arel_extensions/nodes/coalesce.rb

@@ -12,7 +12,7 @@ module ArelExtensions
         case expr.first
         when String
           @left_node_type = :string
-        when Integer, Fixnum, Float
+        when Integer, Float
           @left_node_type = :number
         when ArelExtensions::Nodes::Coalesce, ArelExtensions::Nodes::Function
           @left_node_type = expr.first.try(:left_node_type)

data/lib/arel_extensions/nodes/date_diff.rb

@@ -129,14 +129,14 @@ module ArelExtensions
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node, ActiveSupport::Duration
           object
-        when Fixnum, Integer
+        when Integer
           object.days
         when DateTime, Time, Date
-          raise(ArgumentError, "#{object.class} can not be converted to Fixnum")
+          raise(ArgumentError, "#{object.class} can not be converted to Integer")
         when String
           Arel::Nodes.build_quoted(object)
         else
-          raise(ArgumentError, "#{object.class} can not be converted to Fixnum")
+          raise(ArgumentError, "#{object.class} can not be converted to Integer")
         end
       end
     end
@@ -150,7 +150,7 @@ module ArelExtensions
 
       def convert_number(object)
         case object
-        when Arel::Attributes::Attribute, Arel::Nodes::Node, Fixnum, Integer
+        when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
           object
         when String
           object.to_i
@@ -162,4 +162,4 @@ module ArelExtensions
     end
 
   end
-end
+end

data/lib/arel_extensions/nodes/format.rb

@@ -12,4 +12,4 @@ module ArelExtensions
     	end
     end
   end
-end
+end

data/lib/arel_extensions/nodes/function.rb

@@ -31,14 +31,14 @@ module ArelExtensions
           Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
         when ArelExtensions::Nodes::Function
           att.class.return_type
-        else
-          nil
+#        else
+#          nil
         end
       end
 
       def convert_to_node(object)
         case object
-        when Arel::Attributes::Attribute, Arel::Nodes::Node, Fixnum, Integer
+        when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
           object
         when DateTime, Time
           Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
@@ -59,7 +59,7 @@ module ArelExtensions
         case object
         when Arel::Nodes::Node
           object
-        when Fixnum, Integer
+        when Integer
           Arel::Nodes.build_quoted(object.to_s)
         when Arel::Attributes::Attribute
           case self.type_of_attribute(object)
@@ -117,7 +117,7 @@ module ArelExtensions
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node
           object
-        when Fixnum, Integer
+        when Integer
           object.to_i.abs
         when DateTime, Date, Time, String, ActiveSupport::Duration
           object.to_i.abs
@@ -130,4 +130,4 @@ module ArelExtensions
 
     end
   end
-end
+end

data/lib/arel_extensions/nodes/length.rb

@@ -5,4 +5,4 @@ module ArelExtensions
 
     end
   end
-end
+end

data/lib/arel_extensions/nodes.rb

@@ -1 +1 @@
-require 'arel_extensions/nodes/function'
+require 'arel_extensions/nodes/function'

data/lib/arel_extensions/null_functions.rb

@@ -16,4 +16,4 @@ module ArelExtensions
     end
 
   end
-end
+end

data/lib/arel_extensions/railtie.rb

@@ -6,4 +6,4 @@ module ArelExtensions
     		load 'arel_extensions/tasks.rb'
     	end
 	end
-end
+end

data/lib/arel_extensions/string_functions.rb

@@ -112,4 +112,4 @@ module ArelExtensions
     end
 
   end
-end
+end

data/lib/arel_extensions/tasks.rb

@@ -1,18 +1,12 @@
 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
-          @env_db = (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
-        else
-          @env_db = ENV['DB'] || ActiveRecord::Base.connection.adapter_name
-        end
-        ActiveRecord::Base.establish_connection(Rails.env)
-        @cnx = ActiveRecord::Base.connection
-        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\n"
-          end
-        end
+		@env_db = if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
+                (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
+              else
+                ENV['DB'] || ActiveRecord::Base.connection.adapter_name
+              end
+    ActiveRecord::Base.establish_connection(Rails.env)
+    CommonSqlFunctions.new(ActiveRecord::Base.connection).add_sql_functions(@env_db)
 	end
-end
+end

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/ibm_db.rb

@@ -12,7 +12,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Trim o, collector
         collector << "LTRIM(RTRIM("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << Arel::Visitors::IBM_DB::COMMA unless i == 0
           collector = visit arg, collector
         }
         collector << "))"
@@ -20,7 +20,7 @@ module ArelExtensions
       end
 
 
-      def visit_ArelExtensions_Nodes_DateDiff  o, collector
+      def visit_ArelExtensions_Nodes_DateDiff o, collector
         collector << "DAY("
         collector = visit o.left, collector
         collector << ","
@@ -34,7 +34,7 @@ module ArelExtensions
       end
 
 
-      def visit_ArelExtensions_Nodes_Duration o , collector
+      def visit_ArelExtensions_Nodes_Duration o, collector
         #visit left for period
         if o.left == "d"
           collector << "DAY("

data/lib/arel_extensions/visitors/mssql.rb

@@ -3,12 +3,12 @@ module ArelExtensions
     module MSSQL
       Arel::Visitors::MSSQL::DATE_MAPPING = {'d' => 'day', 'm' => 'month', 'y' => 'year', 'wd' => 'weekday', 'w' => 'week', 'h' => 'hour', 'mn' => 'minute', 's' => 'second'}
       Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES = {
-        '%Y' => 'YYYY', '%C' => '', '%y' => 'YY', '%m' => 'MM', '%B' =>   '', '%b' => '', '%^b' => '',      # year, month
-        '%d' => 'DD', '%e' => '', '%j' =>   '', '%w' => 'dw', '%A' => '',                               # day, weekday
-        '%H' => 'hh', '%k' => '', '%I' =>   '', '%l' =>   '', '%P' => '', '%p' => '',                 # hours
+        '%Y' => 'YYYY', '%C' => '', '%y' => 'YY', '%m' => 'MM', '%B' =>   '', '%b' => '', '%^b' => '', # year, month
+        '%d' => 'DD', '%e' => '', '%j' =>   '', '%w' => 'dw', '%A' => '', # day, weekday
+        '%H' => 'hh', '%k' => '', '%I' =>   '', '%l' =>   '', '%P' => '', '%p' => '', # hours
         '%M' => 'mi', '%S' => 'ss', '%L' => 'ms', '%N' => 'ns', '%z' => 'tz'
       }
-      # TODO all others... http://www.sql-server-helper.com/tips/date-formats.aspx
+      # TODO; all others... http://www.sql-server-helper.com/tips/date-formats.aspx
       Arel::Visitors::MSSQL::DATE_CONVERT_FORMATS = {
         'YYYY-MM-DD' => 120,
         'YY-MM-DD'  => 120,
@@ -71,16 +71,16 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-        if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
-          collector << "DATEDIFF(second"
-        else
-          collector << "DATEDIFF(day"
-        end
+        collector << if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
+                        'DATEDIFF(second'
+                    else
+                      'DATEDIFF(day'
+                    end
         collector << Arel::Visitors::MSSQL::COMMA
         collector = visit o.right, collector
         collector << Arel::Visitors::MSSQL::COMMA
         collector = visit o.left, collector
-        collector << ")"
+        collector << ')'
         collector
       end
 
@@ -138,17 +138,13 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Substring o, collector
-        collector << "SUBSTRING("
+        collector << 'SUBSTRING('
         collector = visit o.expressions[0], collector
         collector << Arel::Visitors::MSSQL::COMMA
         collector = visit o.expressions[1], collector
         collector << Arel::Visitors::MSSQL::COMMA
-        if !o.expressions[2]
-          collector = visit o.expressions[0].length, collector
-        else
-          collector = visit o.expressions[2], collector
-        end
-        collector << ")"
+        collector = o.expressions[2] ? visit(o.expressions[2], collector) : visit(o.expressions[0].length, collector)
+        collector << ')'
         collector
       end
 
@@ -273,8 +269,7 @@ module ArelExtensions
         collector
       end
 
-
-      # TODO manage case insensitivity
+      # TODO; manage case insensitivity
       def visit_ArelExtensions_Nodes_IMatches o, collector
         collector = infix_value o, collector, ' LIKE '
         if o.escape
@@ -285,7 +280,7 @@ module ArelExtensions
         end
       end
 
-      # TODO manage case insensitivity
+      # TODO; manage case insensitivity
       def visit_ArelExtensions_Nodes_IDoesNotMatch o, collector
         collector = infix_value o, collector, ' NOT LIKE '
         if o.escape
@@ -308,7 +303,7 @@ module ArelExtensions
         collector
       end
 
-      # TODO
+      # TODO; 
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "(LISTAGG("
         collector = visit o.left, collector
@@ -322,8 +317,6 @@ module ArelExtensions
         collector
       end
 
-
-
     end
   end
-end
+end

data/lib/arel_extensions/visitors/mysql.rb

@@ -105,11 +105,11 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-        if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
-          collector << 'TIMESTAMPDIFF(SECOND, '
-        else
-          collector << "DATEDIFF("
-        end
+        collector << if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
+                      'TIMESTAMPDIFF(SECOND, '
+                    else
+                      'DATEDIFF('
+                    end
         collector = visit o.right, collector
         collector << Arel::Visitors::MySQL::COMMA
         collector = visit o.left, collector

data/lib/arel_extensions/visitors/oracle.rb

@@ -266,6 +266,7 @@ module ArelExtensions
         collector
       end
 
+    if Arel::VERSION.to_i < 7
       def visit_ArelExtensions_InsertManager_BulkValues o, collector
         table = collector.value.sub(/\AINSERT INTO/, '')
         into = " INTO#{table}"
@@ -289,6 +290,36 @@ module ArelExtensions
         collector << ' SELECT 1 FROM dual'
         collector
       end
+    else
+      def visit_ArelExtensions_InsertManager_BulkValues o, collector
+        table = collector.value.sub(/\AINSERT INTO/, '')
+        into = " INTO#{table}"
+        collector = Arel::Collectors::SQLString.new
+        collector << "INSERT ALL\n"
+        o.left.each_with_index do |row, idx|
+          collector << "#{into} VALUES ("
+          v = Arel::Nodes::Values.new(row, o.cols)
+          len = v.expressions.length - 1
+          v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
+              case value
+              when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                collector = visit value, collector
+              else
+                if attr && attr.able_to_type_cast?
+                  collector << quote(attr.type_cast_for_database(value))
+                else
+                  collector << quote(value).to_s
+                end
+              end
+              collector << Arel::Visitors::Oracle::COMMA unless i == len
+          }
+          collector << ')'
+        end
+        collector << ' SELECT 1 FROM dual'
+        collector
+      end
+    end
+
     end
   end
-end
+end

data/lib/arel_extensions/visitors/postgresql.rb

@@ -4,9 +4,9 @@ module ArelExtensions
       Arel::Visitors::PostgreSQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'DOW', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       Arel::Visitors::PostgreSQL::DATE_FORMAT_DIRECTIVES = {
         '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
-        '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day',                             # day, weekday
-        '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
-        '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                              # seconds, subseconds
+        '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day', # day, weekday
+        '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM', # hours
+        '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz' # seconds, subseconds
       }
 
       def visit_ArelExtensions_Nodes_Rand o, collector
@@ -155,10 +155,10 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Wday o, collector
         collector << "EXRTACT(DOW, "
         collector = visit o.date, collector
-        collector << ")"
+        collector << ')'
         collector
       end
 
     end
   end
-end
+end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -3,10 +3,10 @@ module ArelExtensions
     Arel::Visitors::SQLite.class_eval do
       Arel::Visitors::SQLite::DATE_MAPPING = {'d' => '%d', 'm' => '%m', 'w' => '%W', 'y' => '%Y', 'wd' => '%w', 'M' => '%M', 'h' => '%H', 'mn' => '%M', 's' => '%S'}
       Arel::Visitors::SQLite::DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
-        '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b',  # year, month
-        '%d' => '%d', '%e' => '%e', '%j' => '%j', '%w' => '%w', '%A' => '%W',                               # day, weekday
-        '%H' => '%H', '%k' => '%k', '%I' => '%I', '%l' => '%l', '%P' => '%p', '%p' => '%p',                 # hours
-        '%M' => '%M', '%S' => '%S', '%L' =>   '', '%N' => '%f', '%z' => ''                                # seconds, subseconds
+        '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b', # year, month
+        '%d' => '%d', '%e' => '%e', '%j' => '%j', '%w' => '%w', '%A' => '%W', # day, weekday
+        '%H' => '%H', '%k' => '%k', '%I' => '%I', '%l' => '%l', '%P' => '%p', '%p' => '%p', # hours
+        '%M' => '%M', '%S' => '%S', '%L' =>   '', '%N' => '%f', '%z' => '' # seconds, subseconds
       }
 
       #String functions
@@ -153,6 +153,7 @@ module ArelExtensions
         collector
       end
 
+    if Arel::VERSION.to_i < 7
       def visit_ArelExtensions_InsertManager_BulkValues o, collector
         o.left.each_with_index do |row, idx|
           collector << 'SELECT '
@@ -175,7 +176,36 @@ module ArelExtensions
         end
         collector
       end
+    else
+      def visit_ArelExtensions_InsertManager_BulkValues o, collector
+        o.left.each_with_index do |row, idx|
+          collector << 'SELECT '
+          v = Arel::Nodes::Values.new(row, o.cols)
+          len = v.expressions.length - 1
+          v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
+              case value
+              when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                collector = visit value.as(attr.name), collector
+              else
+                if attr && attr.able_to_type_cast?
+                  collector << quote(attr.type_cast_for_database(value))
+                else
+#                  collector << quote(value, column_for(attr))
+                  collector << quote(value).to_s
+                end
+                if idx == 0
+                  collector << " AS "
+                  collector << quote(attr.name)
+                end
+              end
+              collector << Arel::Visitors::SQLite::COMMA unless i == len
+          }
+          collector << ' UNION ALL ' unless idx == o.left.length - 1
+        end
+        collector
+      end
+    end
 
     end
   end
-end
+end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -335,7 +335,7 @@ module ArelExtensions
         collector
       end
 
-
+    if Arel::VERSION.to_i < 7
       def visit_ArelExtensions_InsertManager_BulkValues o, collector
         collector << "VALUES "
         row_nb = o.left.length
@@ -356,8 +356,35 @@ module ArelExtensions
         end
         collector
       end
+    else
+      def visit_ArelExtensions_InsertManager_BulkValues o, collector
+        collector << "VALUES "
+        row_nb = o.left.length
+        o.left.each_with_index do |row, idx|
+          collector << '('
+          v = Arel::Nodes::Values.new(row, o.cols)
+          len = v.expressions.length - 1
+          v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
+              case value
+              when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                collector = visit value, collector
+              else
+                if attr && attr.able_to_type_cast?
+                  collector << quote(attr.type_cast_for_database(value))
+                else
+                  collector << quote(value).to_s
+                end
+              end
+              collector << Arel::Visitors::ToSql::COMMA unless i == len
+          }
+          collector << (idx == row_nb-1 ? ')' : '), ')
+        end
+        collector
+      end
+    end
+
 
   	end
 
   end
-end
+end

data/lib/arel_extensions/visitors.rb

@@ -21,4 +21,4 @@ begin
 rescue LoadError
 rescue => e
 	e
-end
+end

data/lib/arel_extensions.rb

@@ -42,6 +42,8 @@ require 'arel_extensions/string_functions'
 
 require 'arel_extensions/insert_manager'
 
+require 'arel_extensions/common_sql_functions'
+
 module Arel
   def self.rand
     ArelExtensions::Nodes::Rand.new
@@ -87,4 +89,4 @@ end
 
 Arel::InsertManager.class_eval do
   include ArelExtensions::InsertManager
-end
+end

data/test/with_ar/all_agnostic_test.rb

@@ -6,7 +6,7 @@ module ArelExtensions
 
     class ListTest < Minitest::Test
       require 'minitest/pride'
-      def setup_db
+      def connect_db
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
           @env_db = (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
@@ -17,37 +17,13 @@ module ArelExtensions
         ActiveRecord::Base.establish_connection(@env_db.try(:to_sym) || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
         ActiveRecord::Base.default_timezone = :utc
         @cnx = ActiveRecord::Base.connection
-        $sqlite ||= false
-        if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
-          $sqlite = true
-          db = @cnx.raw_connection
-          $load_extension_disabled ||= false
-          if !$load_extension_disabled
-            begin
-              db.create_function("find_in_set", 1) do |func, value1, value2|
-                func.result = value1.index(value2)
-              end
-              db.enable_load_extension(1)
-              db.load_extension("/usr/lib/sqlite3/pcre.so")
-              db.load_extension("/usr/lib/sqlite3/extension-functions.so")
-              db.enable_load_extension(0)
-              #function find_in_set
-            rescue => e
-              $load_extension_disabled = true
-              puts "can not load extensions #{e.inspect}"
-            end
-          end
-        end
-        if File.exist?("init/#{@env_db}.sql")
-          sql = File.read("init/#{@env_db}.sql")
-          if @env_db == 'mssql'
-            sql.split(/^GO\s*$/).each {|str|
-              @cnx.execute(str.strip) unless str.blank?
-            }
-          else
-            @cnx.execute(sql) unless sql.blank?
-          end
-        end
+        $sqlite = @cnx.adapter_name =~ /sqlite/i
+        $load_extension_disabled ||= false
+        csf = CommonSqlFunctions.new(@cnx)
+        csf.add_sql_functions(@env_db)
+      end
+
+      def setup_db
         @cnx.drop_table(:user_tests) rescue nil 
         @cnx.create_table :user_tests do |t|
           t.column :age, :integer
@@ -72,6 +48,7 @@ module ArelExtensions
 
       def setup
         d = Date.new(2016, 5, 23)
+        connect_db
         setup_db
         u = User.create :age => 5, :name => "Lucas", :created_at => d, :score => 20.16, :updated_at => Time.utc(2014, 3, 3, 12, 42, 0)
         @lucas = User.where(:id => u.id)
@@ -192,12 +169,20 @@ module ArelExtensions
 
       def test_substring
         assert_equal 'C', t(@camille, @name.substring(1, 1))
-        assert_equal(@env_db == 'oracle' ? nil : '', t(@lucas, @name.substring(42)))
+        if @env_db == 'oracle'
+          assert_nil(t(@lucas, @name.substring(42)))
+        else
+          assert_equal('', t(@lucas, @name.substring(42)))
+        end
         assert_equal 'Lu', t(@lucas, @name.substring(1,2))
 
         assert_equal 'C', t(@camille, @name[0, 1])
         assert_equal 'C', t(@camille, @name[0])
-        assert_equal(@env_db == 'oracle' ? nil : '', t(@lucas, @name[42]))
+        if @env_db == 'oracle'
+          assert_nil(t(@lucas, @name[42]))
+        else
+          assert_equal('', t(@lucas, @name[42]))
+        end
         assert_equal 'Lu', t(@lucas, @name[0,2])
         assert_equal 'Lu', t(@lucas, @name[0..1])
       end
@@ -367,9 +352,11 @@ module ArelExtensions
         else
           assert_equal 42, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 12, 41, 18)).to_i
           assert_equal(-3600, t(@lucas, @updated_at - Time.utc(2014, 3, 3, 13, 42)).to_i)
-
-          skip "Pb with order in Oracle" if @env_db == 'oracle'
-          assert_includes [nil, 0, 'f', false], t(@lucas, (@updated_at - Time.utc(2014, 3, 3, 12, 41, 18)) < -1)
+          if @env_db == 'mssql'
+            assert_equal 0, @lucas.where((@updated_at - Time.utc(2014, 3, 3, 12, 41, 18)) < -1).count
+          else
+            assert_includes [nil, 0, 'f', false], t(@lucas, (@updated_at - Time.utc(2014, 3, 3, 12, 41, 18)) < -1)
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 0.9.7.3
+  version: 0.9.8
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -81,12 +81,14 @@ extra_rdoc_files:
 - functions.html
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".travis/oracle/download.js"
 - ".travis/oracle/download.sh"
 - ".travis/oracle/download_ojdbc.js"
 - ".travis/oracle/install.sh"
 - ".travis/setup_accounts.sh"
+- ".travis/sqlite3/extension-functions.sh"
 - Gemfile
 - MIT-LICENSE.txt
 - README.md
@@ -99,6 +101,7 @@ files:
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
 - gemfiles/rails5.gemfile
+- gemfiles/rails5_0.gemfile
 - init/mssql.sql
 - init/mysql.sql
 - init/oracle.sql
@@ -107,6 +110,7 @@ files:
 - lib/arel_extensions.rb
 - lib/arel_extensions/attributes.rb
 - lib/arel_extensions/boolean_functions.rb
+- lib/arel_extensions/common_sql_functions.rb
 - lib/arel_extensions/comparators.rb
 - lib/arel_extensions/date_duration.rb
 - lib/arel_extensions/insert_manager.rb