arel_extensions 2.0.21 → 2.2.2

data/README.md

@@ -1,16 +1,15 @@
 # Arel Extensions
 
-[![Travis Build Status](https://img.shields.io/travis/Faveod/arel-extensions.svg?label=Travis%20build)](http://travis-ci.org/Faveod/arel-extensions)
-[![AppVeyor Build Status](https://img.shields.io/appveyor/ci/yazfav/arel-extensions.svg?label=AppVeyor%20build)](https://ci.appveyor.com/project/yazfav/arel-extensions)
-[![Security](https://hakiri.io/github/Faveod/arel-extensions/master.svg)](https://hakiri.io/github/Faveod/arel-extensions/master)
+![GitHub workflow](https://github.com/Faveod/arel-extensions/actions/workflows/ruby.yml/badge.svg)
+[![AppVeyor Build Status](https://img.shields.io/appveyor/ci/jdelporte/arel-extensions.svg?label=AppVeyor%20build)](https://ci.appveyor.com/project/jdelporte/arel-extensions)
 ![](http://img.shields.io/badge/license-MIT-brightgreen.svg)
 
 Gem: [![Latest Release](https://img.shields.io/gem/v/arel_extensions.svg)](https://rubygems.org/gems/arel_extensions)
 [![Gem](https://ruby-gem-downloads-badge.herokuapp.com/arel_extensions?type=total)](https://rubygems.org/gems/arel_extensions)
 [![Gem](https://ruby-gem-downloads-badge.herokuapp.com/arel_extensions?label=downloads-current-version)](https://rubygems.org/gems/arel_extensions)
 
-Arel Extensions adds shortcuts, fixes and new ORM mappings (ruby to SQL) to Arel.
-It aims to ensure pure ruby syntax for the biggest number of usual cases.
+Arel Extensions adds shortcuts, fixes and new ORM mappings (Ruby to SQL) to Arel.
+It aims to ensure pure Ruby syntax for most usual cases.
 It allows to use more advanced SQL functions for any supported RDBMS.
 
 
@@ -37,7 +36,8 @@ It will add common SQL features in your DB to align ti with current routines. Te
 
 ## Examples
 
-t is an Arel::Table for table my_table
+In the following examples
+`t` is an `Arel::Table` for table `my_table` (i.e., `t = Arel::Table.new('my_table')`).
 
 ## Comparators
 
@@ -51,7 +51,7 @@ t is an Arel::Table for table my_table
 # => my_table.nb > 42
 ```
 
-Other operators : <, >=, <=, =~
+Other operators: <, >=, <=, =~
 
 
 ## Maths
@@ -74,7 +74,7 @@ With Arel Extensions:
 # => SUM(my_table.nb) + 42
 ```
 
-Other functions : ABS, RAND, ROUND, FLOOR, CEIL, FORMAT
+Other functions: ABS, RAND, ROUND, FLOOR, CEIL, FORMAT
 
 For Example:
 ```ruby
@@ -95,14 +95,29 @@ t[:price].format_number("%07.2f €","fr_FR")
 # => TRIM(TRIM(TRIM(COALESCE(my_table.name, '')), '\t'), '\n') = ''
 
 (t[:name] =~ /\A[a-d_]+/).to_sql
-# => my_table.name REGEXP '\^[a-d_]+'
+# => my_table.name REGEXP '^[a-d_]+'
 ```
 
-Other functions : SOUNDEX, LENGTH, REPLACE, LOCATE, SUBSTRING, TRIM
+The `replace` function supports string and regex patterns.
+For instance
+
+```ruby
+t[:email].replace('@', ' at ').replace('.', ' dot ').to_sql
+# => REPLACE(REPLACE(`my_table`.`email`, '@', ' at '), '.', ' dot ')
+```
+
+Captures are supported when using regex patterns.  The replace string may then reference the capture groups using `\1`, `\2`, etc.  For instance
+
+```ruby
+t[:email].replace(/^(.*)@(.*)$/, 'user: \1, host: \2').to_sql
+# => REGEXP_REPLACE(`my_table`.`email`, '(?-mix:^(.*)@(.*)$)', 'user: \\1, host: \\2')
+```
+
+Other functions: SOUNDEX, LENGTH, REPLACE, LOCATE, SUBSTRING, TRIM
 
 ### String Array operations
 
-```t[:list]``` is a classical varchar containing a comma separated list ("1,2,3,4")
+`t[:list]` is a classical varchar containing a comma separated list (`"1,2,3,4"`).
 
 ```ruby
 (t[:list] & 3).to_sql
@@ -130,11 +145,76 @@ t[:birthdate].month.to_sql
 
 t[:birthdate].year.to_sql
 # => YEAR(my_table.birthdate)
+```
+
+### Datetime
+
+```ruby
+# datetime difference
+t[:birthdate] - Time.utc(2014, 3, 3, 12, 41, 18)
+
+# comparison
+t[:birthdate] >= '2014-03-03 10:10:10'
+```
 
+### Format and Time Zone Conversion
+
+`format` has two forms:
+
+```ruby
 t[:birthdate].format('%Y-%m-%d').to_sql
 # => DATE_FORMAT(my_table.birthdate, '%Y-%m-%d')
 ```
 
+Which formats the datetime without any time zone conversion.
+The second form accepts 2 kinds of values:
+
+1. String:
+
+```ruby
+t[:birthdate].format('%Y/%m/%d %H:%M:%S', 'posix/Pacific/Tahiti')
+# => DATE_FORMAT(CONVERT_TZ(CAST(my_table.birthdate AS datetime), 'UTC', 'posix/Pacific/Tahiti'), '%Y/%m/%d %H:%i:%S')                             ## MySQL
+# => TO_CHAR(CAST(my_table.birthdate AS timestamp with time zone) AT TIME ZONE 'UTC' AT TIME ZONE 'posix/Pacific/Tahiti', 'YYYY/MM/DD HH24:MI:SS') ## PostgreSQL
+# => CONVERT(datetime, my_table.birthdate) AT TIME ZONE 'UTC' AT TIME ZONE N'posix/Pacific/Tahiti'                                                 ## SQL Server (& truncated for clarity)
+#                                                                            ^^^^^^^^^^^^^^^^^^^^ 🚨 Invalid timezone for SQL Server. Explanation below.
+```
+
+which will convert the datetime field to the supplied time zone. This generally
+means that you're letting the RDBMS decide or infer what is the timezone of the
+column before conversion to the supplied timezone.
+
+1. Hash of the form `{ src_time_zone => dst_time_zone }`:
+
+```ruby
+t[:birthdate].format('%Y/%m/%d %H:%M:%S', { 'posix/Europe/Paris' => 'posix/Pacific/Tahiti' })
+```
+
+which will explicitly indicate the original timestamp that should be considered
+by the RDBMS.
+
+Warning:
+
+- ⚠️ Time Zone names are specific to each RDBMS. While `PostgreSQL` and `MySQL`
+  have overlaping names (the ones prefixed with `posix`), you should always
+  read your vendor's documentation. `SQL Server` is a black sheep and has its
+  own conventions.
+- ⚠️ Daylight saving is managed by the RDBMS vendor. Choose the approptiate time
+  zone name that enforces proper daylight saving conversions.
+  - ☣️ Choosing `GMT+offset` will certainly bypass daylight saving computations.
+  - ☣️ Choosing abbreviate forms like `CET`, which stands for `Central European
+    Time` will behave differently on `PostgreSQL` and `MySQL`. Don't assume
+    uniform behavior, or even a _rational_ one.
+- ⚠️ Pay attention to the type of the `datetime` column you're working with. For
+  example, in Postgres, a `datetime` can be one of the following types:
+  1. `timestamp with time zone`
+  2. `timestamp without time zone`
+  In the first case, you don't need to supply a conversion hash because postgres
+  knows how to convert it to the desired time zone. However, if you do the same
+  for the second case, you might get surprises, especially if your Postgres
+  installation's default timezone is not `UTC`.
+- ⚠️ SQLite is not supported.
+- 🚨 Always test against your setup 🚨
+
 ## Unions
 
 ```ruby
@@ -164,15 +244,15 @@ t[:id].cast('char').to_sql
 ## Stored Procedures and User-defined functions
 
 To optimize queries, some classical functions are defined in databases missing any alternative native functions.
-Examples :
-- FIND_IN_SET
+Examples:
+- `FIND_IN_SET`
 
 ## BULK INSERT / UPSERT
 
 Arel Extensions improves InsertManager by adding bulk_insert method, which allows to insert multiple rows in one insert.
 
 
-```
+```ruby
 @cols = ['id', 'name', 'comments', 'created_at']
 @data = [
    	[23, 'name1', "sdfdsfdsfsdf", '2016-01-01'],
@@ -228,6 +308,15 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="ok">✔</td>
   </tr>
+  <tr>
+    <td class="tg-yw4l">POSIX FORMATTING<br>column.format_number("$ %7.2f","en_US")</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ko">not implemented</td>
+  </tr>
   <tr>
     <td class="tg-yw4l">RAND<br>Arel.rand</td>
     <td class="ok">✔</td>
@@ -256,24 +345,33 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">POSIX FORMATTING<br>column.format_number("$ %7.2f","en_US")</td>
-    <td class="ok">✔</td>
+    <th class="tg-ffjm" rowspan="17"><div>String functions</div></th>
+    <td class="tg-yw4l">CONCAT<br>column + "string"</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv"> ||</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">+</td>
     <td class="ok">✔</td>
-    <td class="ko">not implemented</td>
   </tr>
   <tr>
-    <th class="tg-ffjm" rowspan="17"><div>String functions</div></th>
-    <td class="tg-yw4l">CONCAT<br>column + "string"</td>
+    <td class="tg-yw4l">FIND_IN_SET<br>column &amp; ("l")</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv"> ||</td>
+    <td class="tg-orpl">Ruby function</td>
+    <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">+</td>
     <td class="ok">✔</td>
   </tr>
+  <tr>
+    <td class="tg-yw4l">ILIKE (in Arel6)<br/>column.imatches('%pattern')</td>
+    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
+    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
+    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
+  </tr>
   <tr>
     <td class="tg-yw4l">LENGTH<br>column.length</td>
     <td class="ok">✔</td>
@@ -293,30 +391,57 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">SUBSTRING<br/>column[1..2]<br/>column.substring(1)<br/>column.substring(1, 1)</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">SUBSTR()</td>
-    <td class="tg-j6lv">SUBSTR()</td>
-    <td class="tg-j6lv">SUBSTR()</td>
+    <td class="tg-yw4l">Matching Accent/Case Insensitive<br>column.ai_imatches('blah')</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">unaccent required</td>
+    <td class="tg-j6lv">not supported</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">?</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">FIND_IN_SET<br>column &amp; ("l")</td>
-    <td class="ok">✔</td>
-    <td class="ok">✔</td>
-    <td class="tg-orpl">Ruby function</td>
+    <td class="tg-yw4l">Matching Accent Insensitive<br>column.ai_matches('blah')</td>
+    <td class="ok">not supported</td>
+    <td class="tg-j6lv">not supported</td>
+    <td class="tg-j6lv">not supported</td>
+    <td class="ok">not supported</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">?</td>
+  </tr>
+  <tr>
+    <td class="tg-yw4l">Matching Case Insensitive<br>column.imatches('blah')</td>
+    <td class="ok">not supported</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">✔</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">?</td>
+  </tr>
+  <tr>
+    <td class="tg-yw4l">Matching Accent/Case Sensitive<br>column.smatches('blah')</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">not supported</td>
     <td class="ok">✔</td>
+    <td class="tg-j6lv">✔</td>
+    <td class="tg-j6lv">?</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">SOUNDEX<br>column.soundex</td>
+    <td class="tg-yw4l">NOT_REGEXP<br>column != "pattern"</td>
     <td class="ok">✔</td>
-    <td class="tg-3oug">require fuzzystrmatch</td>
+    <td class="ok">✔<br></td>
+    <td class="tg-3oug">require pcre.so</td>
+    <td class="tg-j6lv">NOT REGEXP_LIKE </td>
+    <td class="tg-j6lv">NOT LIKE</td>
     <td class="ok">✔</td>
+  </tr>
+  <tr>
+    <td class="tg-yw4l">REGEXP<br>column =~ "pattern"<br></td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
+    <td class="tg-3oug">require pcre.so</td>
+    <td class="tg-j6lv">REGEXP_LIKE</td>
+    <td class="tg-j6lv">LIKE</td>
     <td class="ok">✔</td>
   </tr>
   <tr>
@@ -329,31 +454,31 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">REGEXP<br>column =~ "pattern"<br></td>
+    <td class="tg-yw4l">REPLACE<br>column.replace(/re/,"X")</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-3oug">require pcre.so</td>
-    <td class="tg-j6lv">REGEXP_LIKE</td>
-    <td class="tg-j6lv">LIKE</td>
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">NOT_REGEXP<br>column != "pattern"</td>
+    <td class="tg-yw4l">SOUNDEX<br>column.soundex</td>
+    <td class="ok">✔</td>
+    <td class="tg-3oug">require fuzzystrmatch</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="ok">✔<br></td>
-    <td class="tg-3oug">require pcre.so</td>
-    <td class="tg-j6lv">NOT REGEXP_LIKE </td>
-    <td class="tg-j6lv">NOT LIKE</td>
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">ILIKE (in Arel6)<br/>column.imatches('%pattern')</td>
-    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
+    <td class="tg-yw4l">SUBSTRING<br/>column[1..2]<br/>column.substring(1)<br/>column.substring(1, 1)</td>
+    <td class="ok">✔</td>
+    <td class="tg-j6lv">SUBSTR()</td>
+    <td class="tg-j6lv">SUBSTR()</td>
+    <td class="tg-j6lv">SUBSTR()</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
-    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
-    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
-    <td class="tg-j6lv">LOWER() LIKE LOWER()</td>
   </tr>
   <tr>
     <td class="tg-yw4l">TRIM (leading)<br>column.trim("LEADING","M")</td>
@@ -382,43 +507,6 @@ User.connection.execute(insert_manager.to_sql)
     <td class="tg-j6lv">LTRIM(RTRIM())</td>
     <td class="tg-j6lv">TRIM()</td>
   </tr>
-  <tr>
-    <td class="tg-yw4l">Matching Accent/Case Insensitive<br>column.ai_imatches('blah')</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">unaccent required</td>
-    <td class="tg-j6lv">not supported</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">?</td>
-  </tr>
-  <tr>
-    <td class="tg-yw4l">Matching Accent Insensitive<br>column.ai_matches('blah')</td>
-    <td class="ok">not supported</td>
-    <td class="tg-j6lv">not supported</td>
-    <td class="tg-j6lv">not supported</td>
-    <td class="ok">not supported</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">?</td>
-  </tr>
-  <tr>
-    <td class="tg-yw4l">Matching Case Insensitive<br>column.imatches('blah')</td>
-    <td class="ok">not supported</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">?</td>
-  </tr>
-  <tr>
-    <td class="tg-yw4l">Matching Accent/Case Sensitive<br>column.smatches('blah')</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">not supported</td>
-    <td class="ok">✔</td>
-    <td class="tg-j6lv">✔</td>
-    <td class="tg-j6lv">?</td>
-  </tr>
-
   <tr>
     <th class="tg-4rp9" rowspan="6"><div>Date functions</div></th>
     <td class="tg-yw4l">DATEADD<br>column + 2.year<br></td>
@@ -475,7 +563,16 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
   </tr>
   <tr>
-    <th class="tg-72dn" rowspan="8"><div>Comparators functions</div></th>
+    <th class="tg-72dn" rowspan="13"><div>Comparators functions</div></th>
+    <td class="tg-yw4l">BLANK<br>column.blank<br></td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
+  <tr>
     <td class="tg-yw4l">COALESCE<br>column.coalesce(var)</td>
     <td class="ok">✔</td>
     <td class="ok">✔</td>
@@ -484,6 +581,24 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="ok">✔</td>
   </tr>
+  <tr>
+    <td class="tg-yw4l">COALESCE_BLANK<br>column.coalesce_blank(var)</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
+  <tr>
+    <td class="tg-yw4l">IF_PRESENT</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
   <tr>
     <td class="tg-yw4l">ISNULL<br>column.isnull()</td>
     <td class="tg-j6lv">IFNULL()</td>
@@ -493,6 +608,24 @@ User.connection.execute(insert_manager.to_sql)
     <td class="ok">✔</td>
     <td class="ok">✔</td>
   </tr>
+  <tr>
+    <td class="tg-yw4l">NOT_BLANK<br>column.not_blank<br></td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
+  <tr>
+    <td class="tg-yw4l">PRESENT<br>column.present<br>alias to NOT_BLANK<br></td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+    <td class="ok">✔</td>
+  </tr>
   <tr>
     <td class="tg-yw4l">==<br>column == integer</td>
     <td class="ok">✔</td>
@@ -596,3 +729,14 @@ User.connection.execute(insert_manager.to_sql)
   </tr>
   </tbody>
 </table>
+
+## Version Compatibility
+
+<table>
+  <tr><th>Ruby</th> <th>Rails</th>    <th>Arel Extensions</th></tr>
+  <tr><td>3.1</td>  <td>6.1</td>      <td>2</td></tr>
+  <tr><td>3.0</td>  <td>6.1</td>      <td>2</td></tr>
+  <tr><td>2.7</td>  <td>6.1, 6.0</td> <td>2</td></tr>
+  <tr><td>2.5</td>  <td>6.1, 6.0</td> <td>2</td></tr>
+  <tr><td>2.5</td>  <td>5.2</td>      <td>1</td></tr>
+</table>

data/Rakefile

@@ -1,9 +1,9 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks name: "arel_extensions"
+Bundler::GemHelper.install_tasks name: 'arel_extensions'
 
 require 'rake/testtask'
 
-desc "Default Task"
+desc 'Default Task'
 task default: [:test]
 
 Rake::TestTask.new(:test) do |t|
@@ -21,7 +21,7 @@ namespace :test do
     t.pattern = 'test/visitors/test_to_sql.rb'
     t.warning = true
     t.verbose = true
-    t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
+    t.ruby_opts = ['--dev'] if defined?(JRUBY_VERSION)
   }
 end
 
@@ -33,7 +33,7 @@ end
       t.pattern = 'test/with_ar/*_agnostic_test.rb'
       t.warning = false
       t.verbose = true
-      t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
+      t.ruby_opts = ['--dev'] if defined?(JRUBY_VERSION)
     }
   end
 
@@ -48,3 +48,10 @@ end
   # Make sure the adapter test evaluates the env setting task
   task "test_#{adapter}" => ["#{adapter}:env", "test:#{adapter}"]
 end
+
+# Useful shorthands.
+namespace :test do
+  task :sql => :to_sql
+  task :pg => :postgresql
+  task :postgres => :postgresql
+end

data/TODO

@@ -1,7 +1,6 @@
 Code quality:
 + codeclimate.com
 + gemnasium
-+ appveyor.com (windows)
 + hakiri.io
 - coveralls.io
 - inch-ci.org

data/appveyor.yml

@@ -1,44 +1,82 @@
+image: Visual Studio 2015
+
 version: "{build}"
 
 cache:
   - vendor/bundle
 
-branches:
-  only:
-    - master
-
-services:
-  - mssql2014
-
+environment:
+  matrix:
+    - RUBY_VERSION: 25-x64
+      RAILS: 4_2
+      SQL: MSSQL$SQL2012SP1
+    - RUBY_VERSION: 25-x64
+      RAILS: 4_2
+      SQL: MSSQL$SQL2014
+    - RUBY_VERSION: 25-x64
+      RAILS: 4_2
+      SQL: MSSQL$SQL2016
+    - RUBY_VERSION: 25-x64
+      RAILS: 5_2
+      SQL: MSSQL$SQL2012SP1
+    - RUBY_VERSION: 25-x64
+      RAILS: 5_2
+      SQL: MSSQL$SQL2014
+    - RUBY_VERSION: 25-x64
+      RAILS: 5_2
+      SQL: MSSQL$SQL2016
+    - RUBY_VERSION: 25-x64
+      RAILS: 6
+      SQL: MSSQL$SQL2012SP1
+    - RUBY_VERSION: 25-x64
+      RAILS: 6
+      SQL: MSSQL$SQL2014
+    - RUBY_VERSION: 25-x64
+      RAILS: 6
+      SQL: MSSQL$SQL2016
+    - RUBY_VERSION: 25-x64
+      RAILS: 6_1
+      SQL: MSSQL$SQL2012SP1
+    - RUBY_VERSION: 25-x64
+      RAILS: 6_1
+      SQL: MSSQL$SQL2014
+    - RUBY_VERSION: 25-x64
+      RAILS: 6_1
+      SQL: MSSQL$SQL2016
 
 install:
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - gem update --system
+  - gem install rubygems-update && update_rubygems
   - bundle config --local path vendor/bundle
+  - cp ./gemfiles/rails%RAILS%.gemfile ./Gemfile
+  - bundle config set gemfile ./gemfiles/rails%RAILS%.gemfile
   - bundle install
 
-# Disable normal Windows builds in favor of our test script.
 build: off
 
-
 before_test:
   - ruby -v
   - gem -v
   - bundle -v
 
 test_script:
-  - ruby --version
-  - gem --version
-  - bundler --version
-  - bundle exec rake test
-  - ps: Start-Service 'MSSQL$SQL2014'
-  - timeout /t 4 /nobreak > NUL
+  - ps: Get-Service '*SQL*'
+  - net start %SQL%
   - bundle exec rake test:mssql
 
-environment:
+for:
+-
   matrix:
-    - RUBY_VERSION: 200
-    - RUBY_VERSION: 21
-    - RUBY_VERSION: 22
-    - RUBY_VERSION: 23
-    - RUBY_VERSION: 23-x64
-
+    except:
+      - RAILS: 5_2
+  install:
+    - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+    - cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
+    - cp ./version_v2.rb lib/arel_extensions/version.rb
+    - cp ./gemfiles/rails%RAILS%.gemfile ./Gemfile
+    - gem update --system
+    - gem install rubygems-update && update_rubygems
+    - bundle config --local path vendor/bundle
+    - bundle config set gemfile ./gemfiles/rails%RAILS%.gemfile
+    - bundle install

data/arel_extensions.gemspec

@@ -1,28 +1,27 @@
-$:.push File.expand_path("../lib", __FILE__)
-require "arel_extensions/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'arel_extensions/version'
 
 Gem::Specification.new do |s|
-  s.name        = "arel_extensions"
+  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.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']
+  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.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