arel_extensions 2.0.1 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6fcaaa3eed836e24e7838198a33d805aa3a344fdf773435bdee7035a06dede8
-  data.tar.gz: b56147c3b2b87d0e69ce413e40ca0e4b1c35a2ff9d6183d46d2f808ef1584aaa
+  metadata.gz: 808040009223c9a359d5e61e55f84a51dad939ee8b388ec04e52cfd6554f0ef9
+  data.tar.gz: 836a734a724fd5328a66483d8d433a93eef9cbbaf78cf5e4ea10877c283c9ddc
 SHA512:
-  metadata.gz: a614bd78ccd04e2f70175e30abd2857dd6edd4a4cdb1b530ef83d274de8a406d9320b8f6b0a6b6f9c537407326b1147780366ea36137d23b52d6c28961f3cd2f
-  data.tar.gz: 22b0f75d7df193228edc5f4e071bde066ff5232eadaf34d06dfa48c5b23b07122dae0cc6d280c03ed8c4ec1c61fdde69df3efcdf0398f6a0fb00af28d1264e67
+  metadata.gz: eb328d50ea6213bf785f0a03ebb1b23494fb66e8c60bf7a8873ffc84f3d78e5f9d2ec57367b7a5475872a899134edf5332e2b8dfe90128d22a7fe650e95c4f95
+  data.tar.gz: e9098b71c1fdb119c5a3e6a18409ce3096487eb8a5adffc827dde03fbf65139d37fe1bef525c4b261a1ddfbfb3cfa4f0ca079152519c6f3c5813975b5a9b3c5b

data/.rubocop.yml

@@ -12,7 +12,10 @@ Layout/ExtraSpacing:
 Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: true
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
+  Enabled: true
+
+Naming/FileName:
   Enabled: true
 
 Style/CollectionMethods:
@@ -33,12 +36,12 @@ Style/EmptyElse:
 Style/Encoding:
   Enabled: true
 
-Style/FileName:
-  Enabled: true
-
 Style/MethodCallWithArgsParentheses:
   Enabled: false
 
+# Performance cops have been transferred to rubocop-performance gem.
+require: rubocop-performance
+
 Performance/DoubleStartEndWith:
   Enabled: true
 

data/.travis.yml

@@ -86,7 +86,7 @@ matrix:
   - rvm: 2.5.0
     jdk: openjdk7
   - rvm: ruby-head
-    jdk: openjdk7  
+    jdk: openjdk7
   - rvm: rbx-2
     jdk: oraclejdk8
   - rvm: 2.0.0
@@ -150,7 +150,7 @@ matrix:
   - rvm: 2.5.0
     jdk: oraclejdk11
   - rvm: ruby-head
-    jdk: oraclejdk11    
+    jdk: oraclejdk11
   - rvm: rbx-2
     jdk: openjdk11
   - rvm: 2.0.0
@@ -166,7 +166,7 @@ matrix:
   - rvm: 2.5.0
     jdk: openjdk11
   - rvm: ruby-head
-    jdk: openjdk11   
+    jdk: openjdk11
   - rvm: jruby-9.2.0.0
     jdk: openjdk7
   - rvm: jruby-head
@@ -182,7 +182,7 @@ matrix:
   - rvm: 2.0.0
     gemfile: gemfiles/rails5_0.gemfile
   - rvm: 2.1
-    gemfile: gemfiles/rails5_0.gemfile  
+    gemfile: gemfiles/rails5_0.gemfile
   - rvm: jruby-9.0.5.0
     gemfile: gemfiles/rails5_1_4.gemfile
   - rvm: 2.0.0
@@ -191,17 +191,17 @@ matrix:
     gemfile: gemfiles/rails5_2.gemfile
   allow_failures:
   - rvm: rbx-2
-    gemfile: gemfiles/rails4.gemfile    
+    gemfile: gemfiles/rails4.gemfile
   - rvm: rbx-2
-    gemfile: gemfiles/rails5_0.gemfile    
+    gemfile: gemfiles/rails5_0.gemfile
   - rvm: rbx-2
-    gemfile: gemfiles/rails5_1_4.gemfile    
+    gemfile: gemfiles/rails5_1_4.gemfile
   - rvm: rbx-2
     gemfile: gemfiles/rails5_2.gemfile
   - rvm: rbx-2
     gemfile: gemfiles/rails5_1_4.gemfile
-  - rvm: jruby-9.0.5.0 
-    gemfile: gemfiles/rails5_2.gemfile 
+  - rvm: jruby-9.0.5.0
+    gemfile: gemfiles/rails5_2.gemfile
   - rvm: jruby-9.2.0.0
     jdk: oraclejdk9
     gemfile: gemfiles/rails5_2.gemfile
@@ -217,7 +217,7 @@ matrix:
     jdk: oraclejdk9
 bundler_args: "--jobs 3 --retry 2"
 notifications:
-  email: 
+  email:
     notifications:
       - julien.delporte@faveod.com
       - yann.azoury@faveod.com

data/Gemfile

@@ -1,29 +1,24 @@
 source "https://rubygems.org"
 
-gem 'rails', '~> 6.0.0.rc2'
-
+gemspec
 
 group :development, :test do
-  gem 'activesupport', '~> 6.0.0.rc2'
-  gem 'activemodel', '~> 6.0.0.rc2'
-  gem 'activerecord', '~> 6.0.0.rc2'
-
-  gem "sqlite3", '~> 1.4', :platforms => [:mri, :mswin, :mingw]
-  gem "mysql2", '0.5.2', :platforms => [:mri, :mswin, :mingw]
-  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
-
-  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 'activerecord-oracle_enhanced-adapter', '~> 6.0.0.rc2' if ENV.has_key? 'ORACLE_HOME'
+  gem "sqlite3", '<= 1.3.13', :platforms => [:mri, :mswin, :x64_mingw, :mingw]
+  gem "mysql2", '0.4.10', :platforms => [:mri, :mswin, :x64_mingw, :mingw]
+  gem "pg", '< 1', :platforms => [:mri, :mingw, :x64_mingw, :mswin]
 
-  # 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
 
+  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'
+
+  gem 'activesupport', '~> 4.0'
+  gem 'activemodel', '~> 4.0'
+  gem 'activerecord', '~> 4.0'
+end

data/README.md

@@ -19,6 +19,11 @@ It allows to use more advanced SQL functions for any supported RDBMS.
 Arel 6 (Rails 4) or Arel 7+ (Rails 5).
 [Arel Repository](http://github.com/rails/arel)
 
+or
+
+Rails 6
+[Arel Repository](http://github.com/rails/rails)
+
 ## 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:
@@ -72,9 +77,9 @@ With Arel Extensions:
 Other functions : ABS, RAND, ROUND, FLOOR, CEIL, FORMAT
 
 For Example:
-```ruby 
+```ruby
 t[:price].format_number("%07.2f €","fr_FR")
-# equivalent to 'sprintf("%07.2f €",price)' plus locale management 
+# equivalent to 'sprintf("%07.2f €",price)' plus locale management
 ```
 
 ## String operations
@@ -130,7 +135,7 @@ t[:birthdate].format('%Y-%m-%d').to_sql
 # => DATE_FORMAT(my_table.birthdate, '%Y-%m-%d')
 ```
 
-## Unions 
+## Unions
 
 ```ruby
 (t.where(t[:name].eq('str')) + t.where(t[:name].eq('test'))).to_sql
@@ -143,7 +148,7 @@ Arel-extensions allows to use functions on case clause
 
 ```ruby
 t[:name].when("smith").then(1).when("doe").then(2).else(0).sum.to_sql
-# => SUM(CASE "my_table"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END) 
+# => SUM(CASE "my_table"."name" WHEN 'smith' THEN 1 WHEN 'doe' THEN 2 ELSE 0 END)
 ```
 
 ## Cast Function
@@ -160,7 +165,7 @@ t[:id].cast('char').to_sql
 
 To optimize queries, some classical functions are defined in databases missing any alternative native functions.
 Examples :
-- FIND_IN_SET 
+- FIND_IN_SET
 
 ## BULK INSERT / UPSERT
 
@@ -209,7 +214,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="tg-yw4l">CEIL<br>column.ceil</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">CASE + ROUND</td>
+    <td class="tg-j6lv">CASE + CAST</td>
     <td class="ok">✔</td>
     <td class="tg-j6lv">CEILING()</td>
     <td class="tg-j6lv">CEILING()</td>
@@ -218,7 +223,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="tg-yw4l">FLOOR<br>column.floor</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">CASE + ROUND</td>
+    <td class="tg-j6lv">CASE + CAST</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
@@ -385,7 +390,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="tg-j6lv">✔</td>
     <td class="tg-j6lv">?</td>
-  </tr>  
+  </tr>
   <tr>
     <td class="tg-yw4l">Matching Accent Insensitive<br>column.ai_matches('blah')</td>
     <td class="ok">not supported</td>
@@ -394,7 +399,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">not supported</td>
     <td class="tg-j6lv">✔</td>
     <td class="tg-j6lv">?</td>
-  </tr>  
+  </tr>
   <tr>
     <td class="tg-yw4l">Matching Case Insensitive<br>column.imatches('blah')</td>
     <td class="ok">not supported</td>
@@ -403,7 +408,7 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="tg-j6lv">✔</td>
     <td class="tg-j6lv">?</td>
-  </tr>  
+  </tr>
   <tr>
     <td class="tg-yw4l">Matching Accent/Case Sensitive<br>column.smatches('blah')</td>
     <td class="ok">✔</td>
@@ -412,8 +417,8 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="tg-j6lv">✔</td>
     <td class="tg-j6lv">?</td>
-  </tr>  
-    
+  </tr>
+
   <tr>
     <th class="tg-4rp9" rowspan="6"><div>Date functions</div></th>
     <td class="tg-yw4l">DATEADD<br>column + 2.year<br></td>

data/Rakefile

@@ -7,33 +7,33 @@ desc "Default Task"
 task default: [ :test ]
 
 Rake::TestTask.new(:test) do |t|
- 	t.libs << 'lib'
-  	t.libs << 'test'
-  	t.pattern = 'test/**/test_*.rb'
-	t.warning = true
-  	t.verbose = true
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/test_*.rb'
+  t.warning = true
+  t.verbose = true
 end
 
 %w(mysql postgresql sqlite ibm_db oracle mssql).each do |adapter|
-	namespace :test do
-		Rake::TestTask.new(adapter => "#{adapter}:env") { |t|
-			t.libs << 'lib'
-		  	t.libs << 'test'
-		  	t.pattern = 'test/with_ar/*_agnostic_test.rb'
-		  	t.warning = true
-		  	t.verbose = true
-		  	t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
-		}
-	end
+  namespace :test do
+    Rake::TestTask.new(adapter => "#{adapter}:env") { |t|
+      t.libs << 'lib'
+      t.libs << 'test'
+      t.pattern = 'test/with_ar/*_agnostic_test.rb'
+      t.warning = true
+      t.verbose = true
+      t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
+    }
+  end
 
-	namespace adapter do
-	    task :test => "test_#{adapter}"
-	    task :isolated_test => "isolated_test_#{adapter}"
+  namespace adapter do
+    task :test => "test_#{adapter}"
+    task :isolated_test => "isolated_test_#{adapter}"
 
-	    # Set the connection environment for the adapter
-	    task(:env) { ENV['DB'] = adapter }
-	end
+    # Set the connection environment for the adapter
+    task(:env) { ENV['DB'] = adapter }
+  end
 
-	  # Make sure the adapter test evaluates the env setting task
-	task "test_#{adapter}" => ["#{adapter}:env", "test:#{adapter}"]
+  # Make sure the adapter test evaluates the env setting task
+  task "test_#{adapter}" => ["#{adapter}:env", "test:#{adapter}"]
 end

data/appveyor.yml

@@ -41,4 +41,4 @@ environment:
     - RUBY_VERSION: 22
     - RUBY_VERSION: 23
     - RUBY_VERSION: 23-x64
-    
+

data/arel_extensions.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency('activerecord', '>= 6.0.0')
+  s.add_dependency('arel', '>= 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
   s.add_development_dependency('rdoc', '~> 4.0')
-  s.add_development_dependency('rake', '~> 11')
+  s.add_development_dependency('rake', '~> 12.3.3')
 end

data/functions.html

@@ -55,7 +55,7 @@
     <td class="tg-yw4l">CEIL<br>column.ceil</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">CASE + ROUND</td>
+    <td class="tg-j6lv">CASE + CAST</td>
     <td class="ok">✔</td>
     <td class="tg-j6lv">CEILING()</td>
     <td class="tg-j6lv">CEILING()</td>
@@ -64,7 +64,7 @@
     <td class="tg-yw4l">FLOOR<br>column.floor</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">CASE + ROUND</td>
+    <td class="tg-j6lv">CASE + CAST</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
@@ -379,7 +379,7 @@
     <td class="ok">✔</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-  </tr> 
+  </tr>
   <tr>
     <th class="bulk_insert" rowspan="1"><div>Set<br/> Operators</div></th>
     <td class="tg-yw4l">UNION ( + )<br/>query + query</td>

data/gemfiles/rails6.gemfile

@@ -0,0 +1,30 @@
+source "https://rubygems.org"
+
+gem 'rails', '~> 6.0.0'
+
+
+group :development, :test do
+  gem 'activesupport', '~> 6.0.0'
+  gem 'activemodel', '~> 6.0.0'
+  gem 'activerecord', '~> 6.0.0'
+
+  gem "sqlite3", '~> 1.4', :platforms => [:mri, :mswin, :mingw]
+  gem "mysql2", '0.5.2', :platforms => [:mri, :mswin, :mingw]
+  gem "pg",'< 1.0.0', :platforms => [:mri, :mingw]
+
+  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 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' 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/gemspec_v2/arel_extensions-v2.gemspec

@@ -0,0 +1,28 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "arel_extensions/version"
+
+Gem::Specification.new do |s|
+  s.name        = "arel_extensions"
+  s.version     = ArelExtensions::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Yann Azoury", "Félix Bellanger", "Julien Delporte"]
+  s.email       = ["yann.azoury@faveod.com", "felix.bellanger@faveod.com", "julien.delporte@faveod.com"]
+  s.homepage    = "https://github.com/Faveod/arel-extensions"
+  s.description = "Adds new features to Arel"
+  s.summary     = "Extending Arel"
+  s.license     = 'MIT'
+
+  s.rdoc_options = ["--main", "README.md"]
+  s.extra_rdoc_files = ["MIT-LICENSE.txt", "README.md", 'functions.html']
+
+  # Manifest
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+
+  s.add_dependency('activerecord', '>= 6.0')
+
+  s.add_development_dependency('minitest', '~> 5.9')
+  s.add_development_dependency('rdoc', '~> 4.0')
+  s.add_development_dependency('rake', '~> 12.3.3')
+end

data/generate_gems.sh

@@ -0,0 +1,13 @@
+
+gem uninstall arel_extensions
+
+# VERSION ~> 1
+cp ./version_v1.rb lib/arel_extensions/version.rb
+gem build ./arel_extensions.gemspec
+
+# VERSION ~> 2
+cp ./version_v2.rb lib/arel_extensions/version.rb
+cp ./gemspec_v2/arel_extensions-v2.gemspec ./tmp.gemspec
+gem build ./tmp.gemspec
+cp ./version_v1.rb lib/arel_extensions/version.rb
+rm tmp.gemspec

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/boolean_functions.rb

@@ -41,5 +41,3 @@ end
 ArelExtensions::Nodes.const_set('Or',Class.new(Arel::Nodes::And)).class_eval do
   include ArelExtensions::BooleanFunctions
 end
-
-