arel_extensions 1.3.4 → 2.0.0.rc3

data/gemfiles/rails5_2.gemfile

@@ -1,31 +1,30 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gem 'rails', '~> 5.2.0'
 gem 'arel', '~> 9'
 
 group :development, :test do
-  gem 'bigdecimal', '1.3.5', platforms: [:mri, :mingw, :x64_mingw, :mswin]
   gem 'activesupport', '~> 5.2.0'
   gem 'activemodel', '~> 5.2.0'
   gem 'activerecord', '~> 5.2.0'
 
-  gem 'sqlite3', '<= 1.3.13', platforms: [:mri]
-  gem 'mysql2', '0.4.10', platforms: [:mri]
-  gem 'pg', '< 1.0.0', platforms: [:mri]
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
 
-  gem 'tiny_tds', platforms: [:mri, :mingw, :x64_mingw, :mswin]
-  gem 'activerecord-sqlserver-adapter', '~> 5.2', platforms: [:mri, :mingw, :x64_mingw, :mswin]
+  gem "tiny_tds", :platforms => [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
+  #gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
 
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+  gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
   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: 'v52.7', 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-jdbcsqlserver-adapter', '~> 52.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
+  gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
+  gem "activerecord-jdbcmssql-adapter", :platforms => :jruby
 end
 
-gemspec path: '../'
+gemspec :path => "../"

data/init/mssql.sql

@@ -83,7 +83,7 @@ BEGIN
     END
     SELECT @cv1 = @cv0, @i = @i + 1
   END
-  RETURN @c
+  RETURN @c 
 END
 GO
 
@@ -94,9 +94,9 @@ GO
 --RETURNS TABLE
 --AS
 --BEGIN
---    RETURN ( SELECT [Value] FROM
---      (
---        SELECT
+--    RETURN ( SELECT [Value] FROM 
+--      ( 
+--        SELECT 
 --          [Value] = LTRIM(RTRIM(SUBSTRING(@List, [Number],
 --          CHARINDEX(@Delim, @List + @Delim, [Number]) - [Number])))
 --        FROM (SELECT Number = ROW_NUMBER() OVER (ORDER BY name)

data/init/mysql.sql

@@ -1,45 +1,45 @@
 DELIMITER $$
 
 DROP FUNCTION IF EXISTS levenshtein_distance; $$
-CREATE FUNCTION levenshtein_distance( s1 VARCHAR(255), s2 VARCHAR(255) )
-  RETURNS INT
-  DETERMINISTIC
-  BEGIN
-    DECLARE s1_len, s2_len, i, j, c, c_temp, cost INT;
-    DECLARE s1_char CHAR;
-    -- max strlen=255
-    DECLARE cv0, cv1 VARBINARY(256);
+CREATE FUNCTION levenshtein_distance( s1 VARCHAR(255), s2 VARCHAR(255) ) 
+  RETURNS INT 
+  DETERMINISTIC 
+  BEGIN 
+    DECLARE s1_len, s2_len, i, j, c, c_temp, cost INT; 
+    DECLARE s1_char CHAR; 
+    -- max strlen=255 
+    DECLARE cv0, cv1 VARBINARY(256); 
     SET s1 = IFNULL(s1,''), s2 = IFNULL(s2,'');
-    SET s1_len = CHAR_LENGTH(IFNULL(s1,'')), s2_len = CHAR_LENGTH(IFNULL(s2,'')), cv1 = 0x00, j = 1, i = 1, c = 0;
-    IF s1_len = 0 THEN
-      RETURN s2_len;
-    ELSEIF s2_len = 0 THEN
-      RETURN s1_len;
-    ELSEIF s1 = s2 THEN
+    SET s1_len = CHAR_LENGTH(IFNULL(s1,'')), s2_len = CHAR_LENGTH(IFNULL(s2,'')), cv1 = 0x00, j = 1, i = 1, c = 0; 
+    IF s1_len = 0 THEN 
+      RETURN s2_len; 
+    ELSEIF s2_len = 0 THEN 
+      RETURN s1_len; 
+    ELSEIF s1 = s2 THEN 
       RETURN 0;
-    ELSE
-      WHILE j <= s2_len DO
-        SET cv1 = CONCAT(cv1, UNHEX(HEX(j))), j = j + 1;
-      END WHILE;
-      WHILE i <= s1_len DO
-        SET s1_char = SUBSTRING(s1, i, 1), c = i, cv0 = UNHEX(HEX(i)), j = 1;
-        WHILE j <= s2_len DO
-          SET c = c + 1;
-          IF s1_char = SUBSTRING(s2, j, 1) THEN
-            SET cost = 0; ELSE SET cost = 1;
-          END IF;
-          SET c_temp = CONV(HEX(SUBSTRING(cv1, j, 1)), 16, 10) + cost;
-          IF c > c_temp THEN SET c = c_temp; END IF;
-          SET c_temp = CONV(HEX(SUBSTRING(cv1, j+1, 1)), 16, 10) + 1;
-          IF c > c_temp THEN
-            SET c = c_temp;
-          END IF;
-          SET cv0 = CONCAT(cv0, UNHEX(HEX(c))), j = j + 1;
-        END WHILE;
-        SET cv1 = cv0, i = i + 1;
-      END WHILE;
-    END IF;
-    RETURN c;
+    ELSE 
+      WHILE j <= s2_len DO 
+        SET cv1 = CONCAT(cv1, UNHEX(HEX(j))), j = j + 1; 
+      END WHILE; 
+      WHILE i <= s1_len DO 
+        SET s1_char = SUBSTRING(s1, i, 1), c = i, cv0 = UNHEX(HEX(i)), j = 1; 
+        WHILE j <= s2_len DO 
+          SET c = c + 1; 
+          IF s1_char = SUBSTRING(s2, j, 1) THEN  
+            SET cost = 0; ELSE SET cost = 1; 
+          END IF; 
+          SET c_temp = CONV(HEX(SUBSTRING(cv1, j, 1)), 16, 10) + cost; 
+          IF c > c_temp THEN SET c = c_temp; END IF; 
+          SET c_temp = CONV(HEX(SUBSTRING(cv1, j+1, 1)), 16, 10) + 1; 
+          IF c > c_temp THEN  
+            SET c = c_temp;  
+          END IF; 
+          SET cv0 = CONCAT(cv0, UNHEX(HEX(c))), j = j + 1; 
+        END WHILE; 
+        SET cv1 = cv0, i = i + 1; 
+      END WHILE; 
+    END IF; 
+    RETURN c; 
   END;$$
-
+  
 DELIMITER ;

data/init/postgresql.sql

@@ -4,17 +4,17 @@ CREATE OR REPLACE FUNCTION public.find_in_set(n INTEGER, s TEXT)
 AS $function$
     SELECT * FROM (
       select int4(z.row_number) from (
-        select row_number() over(), y.x
+        select row_number() over(), y.x 
         from (select unnest(('{' || $2 || '}')::int[]) as x) as y
       ) as z
       where z.x = $1
-    UNION ALL
+    UNION ALL 
       SELECT 0) z
     LIMIT 1
 $function$
 ;
 
-CREATE OR REPLACE FUNCTION public.levenshtein_distance(s text, t text)
+CREATE OR REPLACE FUNCTION public.levenshtein_distance(s text, t text) 
 RETURNS integer AS $$
 DECLARE i integer;
 DECLARE j integer;
@@ -48,58 +48,58 @@ BEGIN
 			d[i*(n+1)+j] := LEAST(d[(i-1)*(n+1)+j]+1, d[i*(n+1)+j-1]+1, d[(i-1)*(n+1)+j-1]+c);
 		END LOOP;
 	END LOOP;
-
-	return d[m*(n+1)+n];
+ 
+	return d[m*(n+1)+n];	
 END;
 $$ LANGUAGE plpgsql IMMUTABLE;
 
-CREATE OR REPLACE FUNCTION public.DateDiff(units VARCHAR(30), start_t TIMESTAMP, end_t TIMESTAMP)
+CREATE OR REPLACE FUNCTION public.DateDiff(units VARCHAR(30), start_t TIMESTAMP, end_t TIMESTAMP) 
      RETURNS INT AS $$
    DECLARE
-     diff_interval INTERVAL;
+     diff_interval INTERVAL; 
      diff INT = 0;
      years_diff INT = 0;
    BEGIN
      IF units IN ('yy', 'yyyy', 'year', 'mm', 'm', 'month') THEN
        years_diff = DATE_PART('year', end_t) - DATE_PART('year', start_t);
-
+ 
        IF units IN ('yy', 'yyyy', 'year') THEN
          -- SQL Server does not count full years passed (only difference between year parts)
          RETURN years_diff;
        ELSE
          -- If end month is less than start month it will subtracted
-         RETURN years_diff * 12 + (DATE_PART('month', end_t) - DATE_PART('month', start_t));
+         RETURN years_diff * 12 + (DATE_PART('month', end_t) - DATE_PART('month', start_t)); 
        END IF;
      END IF;
-
-     -- Minus operator returns interval 'DDD days HH:MI:SS'
+ 
+     -- Minus operator returns interval 'DDD days HH:MI:SS'  
      diff_interval = end_t - start_t;
-
+ 
      diff = diff + DATE_PART('day', diff_interval);
-
+ 
      IF units IN ('wk', 'ww', 'week') THEN
        diff = diff/7;
        RETURN diff;
      END IF;
-
+ 
      IF units IN ('dd', 'd', 'day') THEN
        RETURN diff;
      END IF;
-
-     diff = diff * 24 + DATE_PART('hour', diff_interval);
-
+ 
+     diff = diff * 24 + DATE_PART('hour', diff_interval); 
+ 
      IF units IN ('hh', 'hour') THEN
         RETURN diff;
      END IF;
-
+ 
      diff = diff * 60 + DATE_PART('minute', diff_interval);
-
+ 
      IF units IN ('mi', 'n', 'minute') THEN
         RETURN diff;
      END IF;
-
+ 
      diff = diff * 60 + DATE_PART('second', diff_interval);
-
+ 
      RETURN diff;
    END;
 $$ LANGUAGE plpgsql;

data/lib/arel_extensions/attributes.rb

@@ -1,4 +1,3 @@
-require 'arel_extensions/aliases'
 require 'arel_extensions/math'
 require 'arel_extensions/comparators'
 require 'arel_extensions/date_duration'
@@ -9,7 +8,6 @@ require 'arel_extensions/predications'
 
 module ArelExtensions
   module Attributes
-    include ArelExtensions::Aliases
     include ArelExtensions::Math
     include ArelExtensions::Comparators
     include ArelExtensions::DateDuration
@@ -19,11 +17,12 @@ module ArelExtensions
     include ArelExtensions::Predications
 
     def ==(other)
-      Arel::Nodes::Equality.new self, Arel.quoted(other, self)
+      Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
     end
 
     def !=(other)
-      Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
+      Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
     end
+
   end
 end

data/lib/arel_extensions/boolean_functions.rb

@@ -2,12 +2,13 @@ require 'arel_extensions/nodes/then'
 
 module ArelExtensions
   module BooleanFunctions
+
     def ⋀(other)
       self.and(other)
     end
 
     def and *others
-      Arel::Nodes::And.new self, others
+      Arel::Nodes::And.new([self]+ others.flatten)
     end
 
     def ⋁(other)
@@ -15,7 +16,12 @@ module ArelExtensions
     end
 
     def or *others
-      Arel::Nodes::Or.new self, others
+      args = others.flatten
+      if args.length == 1
+        Arel::Nodes::Or.new(self, args.first)
+      else
+        ArelExtensions::Nodes::Or.new([self]+ args)
+      end
     end
 
     def then(t, f = nil)
@@ -24,61 +30,16 @@ module ArelExtensions
   end
 end
 
-class Arel::Nodes::And
+Arel::Nodes::And.class_eval do
   include ArelExtensions::BooleanFunctions
-
-  def self.new *children
-    children =
-      children.flatten.map { |c|
-        c.is_a?(self) ? c.children : c
-      }.flatten
-    super(children)
-  end
 end
 
-# For some reason, Arel's And is properly defined as variadic (it
-# stores @children, and hashes it all).  However Arel's Or is defined
-# as binary, with only @left and @right, and hashing only @left and @right.
-#
-# So reimplement its ctor and accessors.
-
-class Arel::Nodes::Or
+Arel::Nodes::Or.class_eval do
   include ArelExtensions::BooleanFunctions
+end
 
-  attr_reader :children
-
-  def self.new *children
-    children =
-      children.flatten.map { |c|
-        c.is_a?(self) ? c.children : c
-      }.flatten
-    super(*children)
-  end
-
-  def initialize *children
-    @children = children
-  end
-
-  def initialize_copy(other)
-    super
-    @children = other.children.copy if other.children
-  end
-
-  def left
-    children.first
-  end
-
-  def right
-    children[1]
-  end
+ArelExtensions::Nodes.const_set('Or',Class.new(Arel::Nodes::And)).class_eval do
+  include ArelExtensions::BooleanFunctions
+end
 
-  def hash
-    children.hash
-  end
 
-  def eql?(other)
-    self.class == other.class &&
-      children == other.children
-  end
-  alias :== :eql?
-end

data/lib/arel_extensions/common_sql_functions.rb

@@ -1,49 +1,49 @@
 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.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 "cannot load extensions #{e.inspect}"
+          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|
+      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
+          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
+          func.result = i ? (i+1) : 0
         end
       end
-      db.create_function('instr', 1) do |func, value1, value2|
+      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)'
+        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
-      env_db = 'mysql' if env_db =~ /mysql/i
       if env_db =~ /sqlite/i
         begin
           add_sqlite_functions
         rescue => e
-          puts "cannot add sqlite functions #{e.inspect}"
+          puts "can not add sqlite functions #{e.inspect}"
         end
       end
       if File.exist?("init/#{env_db}.sql")
@@ -52,14 +52,15 @@ module ArelExtensions
           sql.split(/^GO\s*$/).each {|str|
             @cnx.execute(str.strip) unless str.blank?
           }
-        elsif env_db == 'mysql'
-          sql.split('$$')[1..-2].each { |str|
-            @cnx.execute(str.strip) unless str.strip.blank?
-          }
+        elsif env_db == 'mysql' 
+			sql.split("$$")[1..-2].each { |str|
+				@cnx.execute(str.strip) unless str.strip.blank?
+			}
         else
           @cnx.execute(sql) unless sql.blank?
         end
       end
     end
+
   end
 end

data/lib/arel_extensions/comparators.rb

@@ -1,58 +1,59 @@
 module ArelExtensions
   module Comparators
+
     def >(other)
-      Arel::Nodes::GreaterThan.new self, Arel.quoted(other, self)
+      Arel::Nodes::GreaterThan.new self, Arel::Nodes.build_quoted(other, self)
     end
 
     def >=(other)
-      Arel::Nodes::GreaterThanOrEqual.new self, Arel.quoted(other, self)
+      Arel::Nodes::GreaterThanOrEqual.new self, Arel::Nodes.build_quoted(other, self)
     end
 
     def <(other)
-      Arel::Nodes::LessThan.new self, Arel.quoted(other, self)
+      Arel::Nodes::LessThan.new self, Arel::Nodes.build_quoted(other, self)
     end
 
     def <=(other)
-      Arel::Nodes::LessThanOrEqual.new self, Arel.quoted(other, self)
+      Arel::Nodes::LessThanOrEqual.new self, Arel::Nodes.build_quoted(other, self)
     end
 
-    # REGEXP function
-    # Pattern matching using regular expressions
+
+    #REGEXP function
+    #Pattern matching using regular expressions
     def =~(other)
-        #      arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
-        #      if arg == :string || arg == :text
-      Arel::Nodes::Regexp.new self, convert_regexp(other)
-      #      end
+#      arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
+#      if arg == :string || arg == :text
+        Arel::Nodes::Regexp.new self, convert_regexp(other)
+#      end
     end
 
-    # NOT_REGEXP function
-    # Negation of Regexp
+    #NOT_REGEXP function
+    #Negation of Regexp
     def !~(other)
-        #      arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
-        #      if arg == :string || arg == :text
-      Arel::Nodes::NotRegexp.new self, convert_regexp(other)
-      #      end
+#      arg = self.relation.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s].type
+#      if arg == :string || arg == :text
+        Arel::Nodes::NotRegexp.new self, convert_regexp(other)
+#      end
     end
 
     private
-
-    # Function used for not_regexp.
+    #Function use for not_regexp
     def convert_regexp(other)
       case other
       when String
-        # Do nothing.
+        #Do nothing
       when Regexp
-        other = other.source.gsub('\A', '^')
-        other.gsub!('\z', '$')
-        other.gsub!('\Z', '$')
-        other.gsub!('\d', '[0-9]')
-        other.gsub!('\D', '[^0-9]')
-        other.gsub!('\w', '[0-9A-Za-z]')
-        other.gsub!('\W', '[^A-Za-z0-9_]')
+        other = other.source.gsub('\A','^')
+        other.gsub!('\Z','$')
+        other.gsub!('\d','[0-9]')
+        other.gsub!('\D','[^0-9]')
+        other.gsub!('\w','[0-9A-Za-z]')
+        other.gsub!('\W','[^A-Za-z0-9_]')
       else
         raise(ArgumentError)
       end
-      Arel.quoted(other, self)
+      Arel::Nodes.build_quoted(other, self)
     end
+
   end
 end

data/lib/arel_extensions/date_duration.rb

@@ -4,24 +4,24 @@ require 'arel_extensions/nodes/wday'
 
 module ArelExtensions
   module DateDuration
-    # function returns the year (as a number) given a date value.
+    #function returns the year (as a number) given a date value.
     def year
-      ArelExtensions::Nodes::Duration.new 'y', self
+      ArelExtensions::Nodes::Duration.new "y", self
     end
 
-    # function returns the month (as a number) given a date value.
+  #function returns the month (as a number) given a date value.
     def month
-      ArelExtensions::Nodes::Duration.new 'm', self
+      ArelExtensions::Nodes::Duration.new "m", self
     end
 
-    # function returns the  week (as a number) given a date value.
+    #function returns the  week (as a number) given a date value.
     def week
-      ArelExtensions::Nodes::Duration.new 'w', self
+      ArelExtensions::Nodes::Duration.new "w", self
     end
 
-    # function returns the month (as a number) given a date value.
+    #function returns the month (as a number) given a date value.
     def day
-      ArelExtensions::Nodes::Duration.new 'd', self
+      ArelExtensions::Nodes::Duration.new "d", self
     end
 
     def wday
@@ -29,19 +29,20 @@ module ArelExtensions
     end
 
     def hour
-      ArelExtensions::Nodes::Duration.new 'h', self
+      ArelExtensions::Nodes::Duration.new "h", self
     end
 
     def minute
-      ArelExtensions::Nodes::Duration.new 'mn', self
+      ArelExtensions::Nodes::Duration.new "mn", self
     end
 
     def second
-      ArelExtensions::Nodes::Duration.new 's', self
+      ArelExtensions::Nodes::Duration.new "s", self
     end
 
-    def format(tpl, time_zone = nil)
-      ArelExtensions::Nodes::Format.new [self, tpl, time_zone]
+    def format(tpl)
+      ArelExtensions::Nodes::Format.new [self, tpl]
     end
+
   end
 end

data/lib/arel_extensions/insert_manager.rb

@@ -2,35 +2,32 @@ require 'arel'
 
 module ArelExtensions
   module InsertManager
+
     def bulk_insert(cols, data)
-      raise ArgumentError, 'cols must be present' if cols.blank?
-      columns =
-        case cols.first
+      case cols.first
+        when String, Symbol
+          cols.each { |c|
+            @ast.columns << @ast.relation[c]
+          }
         when Array
-          case cols.first.first
-          when Arel::Attributes::Attribute
-            cols
-          when String, Symbol
-            cols.map {|c| [@ast.relation[c.first]] }
-          else
-            raise ArgumentError, "cols has an invalid type: #{cols.first.first.class}"
+          if String === cols.first.first
+            @ast.columns = cols.map {|c| [@ast.relation[c.first]] }
+          elsif Arel::Attributes::Attribute == cols.first.first
+            @ast.columns = cols
           end
-        when String, Symbol
-          cols.map { |c| @ast.relation[c] }
-        else
-          raise ArgumentError, "cols has an invalid type: #{cols.first.class}"
-        end
-      self.values = BulkValues.new(columns, data)
-      @ast.columns = columns
+        when NilClass
+          @ast.columns = @ast.relation.columns
+      end
+      self.values = BulkValues.new(@ast.columns, data)
     end
 
     class BulkValues < Arel::Nodes::Node
       attr_accessor :left, :cols
-
       def initialize(cols, values)
         @left = values
         @cols = cols
       end
     end
+
   end
 end