arel_extensions 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc58508a314b8bc3f5f4eb4aa704c4cba75783f6
-  data.tar.gz: a347453b0960efb17862dbb15e7433efa81cdc05
+  metadata.gz: 4f2ade749fb291100715cf14fb1429423d253532
+  data.tar.gz: 111e9e06da61b1949ea7c6e8a9d59c8332dfbbec
 SHA512:
-  metadata.gz: 9aab7c24f6cd74293a52b5064764a9cbbffcc5d208140ddfab546ddc985f1435fb6ccbe7418e86e32c03c844670567dc03d16474077d52cd3acea1d5169bcc63
-  data.tar.gz: c74789a394dabfd3a8061a174a270312a7eacd3e46e0decd8089b2b4043eda970c65406adc22a60f9278345c4a063c58d1e1ef3450113ebac506ecbddac99dc9
+  metadata.gz: f805809f0cf68defc693d50f82cc300118f990233c29f81eccc2accef50093f3b447f1ba1b4740072e9d675f646a82f75f9e9eeaaf813e323d1db7230a3cac9e
+  data.tar.gz: e4bd7faa243ae45fcc604294e662765e25055e13111a1889810327893dc545020c4bd1b465d2eaa4c16262fcdc282fbfd89cd4ceff95be986a9f9694538ecd5a

data/.travis/oracle/download.js

@@ -0,0 +1,116 @@
+// vim: set et sw=2 ts=2:
+"use strict";
+var env = process.env;
+var Promise = require('bluebird');
+var Phantom = Promise.promisifyAll(require('node-phantom-simple'));
+var PhantomError = require('node-phantom-simple/headless_error');
+
+var credentials = Object.keys(env)
+  .filter(function (key) { return key.indexOf('ORACLE_LOGIN_') == 0 })
+  .map(function (key) { return [key.substr(13), env[key]] });
+
+if (credentials.length <= 0) {
+  console.error("Missing ORACLE_LOGIN environment variables!");
+  process.exit(1);
+}
+
+Phantom.createAsync({ parameters: { 'ssl-protocol': 'tlsv1' } }).then(function (browser) {
+  browser = Promise.promisifyAll(browser, { suffix: 'Promise' });
+
+  // Configure the browser, open a tab
+  return browser
+  .addCookiePromise({'name': 'oraclelicense', 'value': "accept-" + env['ORACLE_COOKIE'] + "-cookie", 'domain': '.oracle.com' })
+  .then(function () {
+    return browser.createPagePromise();
+  })
+  .then(function (page) {
+    page = Promise.promisifyAll(page, { suffix: 'Promise' });
+
+    // Configure the tab
+    page.onResourceError = console.error.bind(console);
+    return page
+    .setPromise('settings.userAgent', env['USER_AGENT']) // PhantomJS configures the UA per tab
+
+    // Request the file, wait for the login page
+    .then(function () {
+      return page.openPromise("https://edelivery.oracle.com/akam/otn/linux/" + env['ORACLE_FILE']).then(function (status) {
+        if (status != 'success') throw "Unable to connect to oracle.com";
+        return page.waitForSelectorPromise('input[type=password]', 5000);
+      })
+      .catch(PhantomError, function (err) {
+        return page.getPromise('plainText').then(function (text) {
+          console.error("Unable to load login page. Last response was:\n" + text);
+          throw err;
+        });
+      });
+    })
+
+    // Export cookies for cURL
+    .then(function () {
+      return page.getPromise('cookies').then(function (cookies) {
+        var data = "";
+        for (var i = 0; i < cookies.length; ++i) {
+          var cookie = cookies[i];
+          data += cookie.domain + "\tTRUE\t" + cookie.path + "\t"
+            + (cookie.secure ? "TRUE" : "FALSE") + "\t0\t"
+            + cookie.name + "\t" + cookie.value + "\n";
+        }
+        return Promise.promisifyAll(require('fs')).writeFileAsync(env['COOKIES'], data);
+      });
+    })
+
+    // Submit the login form using cURL
+    .then(function () {
+      return page.evaluatePromise(function () {
+        var $form = jQuery(document.forms[0]);
+        return {
+          action: $form.prop('action'),
+          data: $form.serialize()
+        };
+      })
+      .then(function (form) {
+        return browser.exitPromise().then(function () {
+          var unapplied = credentials.filter(function (tuple) {
+            var applied = false;
+            form.data = form.data.replace(tuple[0] + '=', function (name) {
+              applied = true;
+              return name + encodeURIComponent(tuple[1]);
+            });
+            return !applied;
+          })
+          .map(function (tuple) { return tuple[0] });
+
+          if (unapplied.length > 0) {
+            console.warn("Unable to use all ORACLE_LOGIN environment variables: %j", unapplied);
+          }
+
+          var cmd = ['curl', [
+            '--cookie', env['COOKIES'],
+            '--cookie-jar', env['COOKIES'],
+            '--data', '@-',
+            '--location',
+            '--output', require('path').basename(env['ORACLE_FILE']),
+            '--user-agent', env['USER_AGENT'],
+            form.action
+          ]];
+
+          console.info("Executing %j", cmd);
+
+          var child_process = require('child_process');
+          var child = child_process.spawn.apply(child_process, cmd.concat({ stdio: ['pipe', 1, 2] }));
+          child.on('exit', process.exit);
+          child.stdin.end(form.data);
+        });
+      });
+    })
+    .catch(function (err) {
+      console.error(err);
+      browser.on('exit', function () { process.exit(1); });
+      browser.exit();
+    });
+  });
+})
+.catch(function (err) {
+  console.error(err);
+  process.exit(1);
+});

data/.travis/oracle/download.sh

@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+[ -n "$ORACLE_COOKIE" ] || { echo "Missing ORACLE_COOKIE environment variable!"; exit 1; }
+[ -n "$ORACLE_FILE" ] || { echo "Missing ORACLE_FILE environment variable!"; exit 1; }
+
+cd "$(dirname "$(readlink -f "$0")")"
+
+npm install bluebird node-phantom-simple
+
+export COOKIES='cookies.txt'
+export USER_AGENT='Mozilla/5.0'
+
+echo > "$COOKIES"
+chmod 600 "$COOKIES"
+
+exec node download.js

data/.travis/oracle/install.sh

@@ -0,0 +1,32 @@
+#!/bin/sh -e
+
+[ -n "$ORACLE_FILE" ] || { echo "Missing ORACLE_FILE environment variable!"; exit 1; }
+[ -n "$ORACLE_HOME" ] || { echo "Missing ORACLE_HOME environment variable!"; exit 1; }
+
+ORACLE_RPM="$(basename $ORACLE_FILE .zip)"
+
+cd "$(dirname "$(readlink -f "$0")")"
+
+dpkg -s bc libaio1 rpm unzip > /dev/null 2>&1 ||
+  ( sudo apt-get -qq update && sudo apt-get --no-install-recommends -qq install bc libaio1 rpm unzip )
+
+df -B1 /dev/shm | awk 'END { if ($1 != "shmfs" && $1 != "tmpfs" || $2 < 2147483648) exit 1 }' ||
+  ( sudo rm -r /dev/shm && sudo mkdir /dev/shm && sudo mount -t tmpfs shmfs -o size=2G /dev/shm )
+
+test -f /sbin/chkconfig ||
+  ( echo '#!/bin/sh' | sudo tee /sbin/chkconfig > /dev/null && sudo chmod u+x /sbin/chkconfig )
+
+test -d /var/lock/subsys || sudo mkdir /var/lock/subsys
+
+unzip -j "$(basename $ORACLE_FILE)" "*/$ORACLE_RPM"
+sudo rpm --install --nodeps --nopre "$ORACLE_RPM"
+
+echo 'OS_AUTHENT_PREFIX=""' | sudo tee -a "$ORACLE_HOME/config/scripts/init.ora" > /dev/null
+sudo usermod -aG dba $USER
+
+( echo ; echo ; echo travis ; echo travis ; echo n ) | sudo AWK='/usr/bin/awk' /etc/init.d/oracle-xe configure
+
+"$ORACLE_HOME/bin/sqlplus" -L -S / AS SYSDBA <<SQL
+CREATE USER $USER IDENTIFIED EXTERNALLY;
+GRANT CONNECT, RESOURCE TO $USER;
+SQL

data/.travis.yml

@@ -1,85 +1,88 @@
 language: ruby
-sudo: false
+sudo: required
 cache: bundler
 before_install:
-  - gem install bundler
-# - sudo apt-get update -qq
-# - sudo apt-get install -qq sqlite3
-#addons:
-#  mariadb: '10.0'
+- gem install bundler
+# - ".travis/oracle/download.sh"
+# - ".travis/oracle/install.sh"
 gemfile:
-  - gemfiles/rails4.gemfile
-#  - gemfiles/rails3.gemfile
-  - gemfiles/rails5.gemfile
+- gemfiles/rails4.gemfile
+- gemfiles/rails5.gemfile
 services:
-  - mysql
-  - postgresql
+- mysql
+- postgresql
 before_script:
-  - mysql -e 'create database arext_test;'
-  - psql -c 'create database arext_test;' -U postgres
+- mysql -e 'create database arext_test;'
+- psql -c 'create database arext_test;' -U postgres
+# - $ORACLE_HOME/bin/sqlplus CREATE DB
 script:
-  - "bundle exec rake test"
-#  - "bundle exec rake test:sqlite3"
-  - "gem build arel_extensions.gemspec"
-  - "bundle exec ruby test/real_db_test.rb"
+- bundle exec rake test
+- gem build arel_extensions.gemspec
+- bundle exec rake test:sqlite
+- bundle exec rake test:mysql
+- bundle exec rake test:postgresql
+# - bundle exec rake test:oracle
 env:
   global:
-    - JRUBY_OPTS='--dev -J-Xmx1024M'
+  - JRUBY_OPTS='--dev -J-Xmx1024M'
+  - ORACLE_COOKIE=sqldev
+  - ORACLE_FILE=oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
+  - ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
+  - ORACLE_SID=XE
+  - secure: 0RUuF4l0e3J8UIIMlgb8x/aYy2pH6Wb+EWylOr2W1EQechivoFw6IEYD1EZWIOZ/uNpkQ2h/urbUqW3/HpKhZn+NYP2sQI41Xyu1TD+6HPWAHpEvLzemhQSJV6eIeLRQoVDLUmqF23nUZDtKQAwOOyJVMeqHMahJi5K7N/cfQmifs2QcBnMxPnANIcrSXxOCBoqCl6BERG9JTeKERG/lWG1I9vRIe9ISNyOPUQVVI6SfTJwhJP5NLkxSJG1q2PLPK7p6zQ684sS4zSnS5oV23yDsQWWIwxk78CVu1jnFBu8Qq3ngWsInlkHrPotjtaxmTxM8JQd4fgE5NMO2Pjnj8w7zg+sbl+3OVtareX+M9+OLdUD5xBQhecPpzflMqib2qZ0fr9tdoT8kAZJTiXtQrptZfaXleZlH74l2dO/PYxkoWMusYQnSbQl0G3AoyYH+l7YpefL4arm0s5IIiOK+ZiCoZ14pl26rYAA1iPUe5AT+hecKi+fwqhyFE7fMX+zC+AvzsQL8jrP0CXL/hmPkoFYxvcDgUoYhvOq+mmQHdOfU7ny4hH5z5d9691qceduHFvF7fNZ4pSofj03eGqfTTk+SDNeZIo6NXNlayayjV2L/DxL6d7vetxkWwipx47PI76gBAqJlxgODJuzoOtyQkPyIVsDlzI1UPoS+UbrU51w=
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2.5
-  - 2.3.1
-  - rbx-2
-  - jruby-9.0.5.0
-  - jruby-head
-  - ruby-head
+- 2.0.0
+- 2.1
+- 2.2.5
+- 2.3.1
+- rbx-2
+- jruby-9.0.5.0
+- jruby-head
+- ruby-head
 jdk:
-  - openjdk7
-  - oraclejdk7
-  - oraclejdk8
-#  - openjdk6
+- openjdk7
+- oraclejdk7
+- oraclejdk8
 matrix:
   fast_finish: true
   exclude:
-    - rvm: rbx-2
-      jdk: openjdk7
-    - rvm: rbx-2
-      jdk: oraclejdk7
-    - rvm: 2.0.0
-      jdk: openjdk7
-    - rvm: 2.0.0
-      jdk: oraclejdk7
-    - rvm: 2.1
-      jdk: openjdk7
-    - rvm: 2.1
-      jdk: oraclejdk7
-    - rvm: 2.2.5
-      jdk: openjdk7
-    - rvm: 2.2.5
-      jdk: oraclejdk7
-    - rvm: 2.3.1
-      jdk: openjdk7
-    - rvm: 2.3.1
-      jdk: oraclejdk7
-    - rvm: ruby-head
-      jdk: openjdk7
-    - rvm: ruby-head
-      jdk: oraclejdk7
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails5.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails5.gemfile
-    - rvm: rbx-2
-      gemfile: gemfiles/rails5.gemfile
+  - rvm: rbx-2
+    jdk: openjdk7
+  - rvm: rbx-2
+    jdk: oraclejdk7
+  - rvm: 2.0.0
+    jdk: openjdk7
+  - rvm: 2.0.0
+    jdk: oraclejdk7
+  - rvm: 2.1
+    jdk: openjdk7
+  - rvm: 2.1
+    jdk: oraclejdk7
+  - rvm: 2.2.5
+    jdk: openjdk7
+  - rvm: 2.2.5
+    jdk: oraclejdk7
+  - rvm: 2.3.1
+    jdk: openjdk7
+  - rvm: 2.3.1
+    jdk: oraclejdk7
+  - rvm: ruby-head
+    jdk: openjdk7
+  - rvm: ruby-head
+    jdk: oraclejdk7
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails5.gemfile
+  - rvm: 2.1
+    gemfile: gemfiles/rails5.gemfile
+  - rvm: rbx-2
+    gemfile: gemfiles/rails5.gemfile
+  - rvm: ruby-head
+    gemfile: gemfiles/rails4.gemfile
   allow_failures:
-#    - rvm: jruby-9.0.5.0
-#    - rvm: jruby-head
-    - rvm: ruby-head
-      gemfile: gemfiles/rails4.gemfile
-#    - rvm: ruby-head
-#      gemfile: gemfiles/rails3.gemfile
-#    - rvm: jruby-head
-bundler_args: --jobs 3 --retry 2
+  - rvm: jruby-9.0.5.0
+    gemfile: gemfiles/rails5.gemfile
+  - rvm: jruby-head
+    gemfile: gemfiles/rails5.gemfile
+bundler_args: "--jobs 3 --retry 2"
 notifications:
-  email: false
+  email: false

data/Rakefile

@@ -7,8 +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.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 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
+
+	  # Make sure the adapter test evaluates the env setting task
+	task "test_#{adapter}" => ["#{adapter}:env", "test:#{adapter}"]
+end

data/arel_extensions.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "arel_extensions"
-  s.version     = '0.8.3'
+  s.version     = '0.8.4'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Yann Azoury", "Mathilde Pechdimaldjian", "Félix Bellanger"]
   s.email       = ["yann.azoury@faveod.com", "mathilde.pechdimaldjian@gmail.com", "felix.bellanger@faveod.com"]

data/functions.html

@@ -94,7 +94,7 @@
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
-    <th class="tg-ffjm" rowspan="11"><br><br><br><br><br><br><br><br><br>String <br>functions</th>
+    <th class="tg-ffjm" rowspan="12"><br><br><br><br><br><br><br><br><br>String <br>functions</th>
     <td class="tg-yw4l">CONCAT<br>column + "string"</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
@@ -153,8 +153,8 @@
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-3oug">require pcre.so</td>
-    <td class="tg-j6lv">REGEXP_LIKE()</td>
-    <td class="tg-j6lv">LIKE()<br></td>
+    <td class="tg-j6lv">REGEXP_LIKE</td>
+    <td class="tg-j6lv">LIKE</td>
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
@@ -162,10 +162,19 @@
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔<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="tg-j6lv">NOT REGEXP_LIKE </td>
+    <td class="tg-j6lv">NOT LIKE</td>
     <td class="tg-baqh">✔</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-baqh">✔</td>
+    <td class="tg-baqh">✔</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>
     <td class="tg-baqh">✔</td>
@@ -194,7 +203,7 @@
     <td class="tg-j6lv">TRIM()</td>
   </tr>
   <tr>
-    <th class="tg-4rp9" rowspan="6"><br><br><br><br><br><br><br>Date <br>functions<br></th>
+    <th class="tg-4rp9" rowspan="6"><br><br><br><br><br><br><br>Date <br>functions</th>
     <td class="tg-yw4l">DATEADD<br>column + 2.year<br></td>
     <td class="tg-j6lv">DATE_ADD()<br></td>
     <td class="tg-baqh">✔</td>
@@ -249,7 +258,7 @@
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
-    <th class="tg-72dn" rowspan="8"><br><br><br><br><br><br>Comparators<br>functions<br></th>
+    <th class="tg-72dn" rowspan="8"><br><br><br><br><br><br>Comparators<br>functions</th>
     <td class="tg-yw4l">COALESCE<br>column.coalesce(var)</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
@@ -259,8 +268,8 @@
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">ISNULL<br>column.isnull(var)</td>
-    <td class="tg-j6lv">IFNULL()<br></td>
+    <td class="tg-yw4l">ISNULL<br>column.isnull()</td>
+    <td class="tg-j6lv">IFNULL()</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-j6lv">NVC()</td>
@@ -268,7 +277,7 @@
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">==<br>column == integer<br></td>
+    <td class="tg-yw4l">==<br>column == integer</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
@@ -277,7 +286,7 @@
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">!=<br>column != integer<br></td>
+    <td class="tg-yw4l">!=<br>column != integer</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
@@ -286,7 +295,7 @@
     <td class="tg-baqh">✔</td>
   </tr>
   <tr>
-    <td class="tg-yw4l">&gt;<br>column &gt; integer<br></td>
+    <td class="tg-yw4l">&gt;<br>column &gt; integer</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>
     <td class="tg-baqh">✔</td>

data/gemfiles/rails4.gemfile

@@ -3,17 +3,25 @@ source "https://rubygems.org"
 gem 'arel', '~> 6.0'
 
 group :development, :test do
+
+	gem 'activesupport', '~> 4.0'
+	gem 'activemodel', '~> 4.0'
+	gem 'activerecord', '~> 4.0'
+
 	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 	gem "mysql2", :platform => [:ruby, :mswin, :mingw]
 	gem "pg", :platform => [:ruby, :mswin, :mingw]
+
+	gem 'ruby-oci8', :platform => [:ruby, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+	gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0'
+
 	# for JRuby
+	gem 'activerecord-jdbc-adapter', platform: :jruby
 	gem "jdbc-sqlite3", :platform => :jruby
 	gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 	gem "activerecord-jdbcmysql-adapter", :platform => :jruby
 	gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
-	gem 'activesupport', '~> 4.0'
-	gem 'activemodel', '~> 4.0'
-	gem 'activerecord', '~> 4.0'
+	gem "activerecord-jdbcmssql-adapter", :platform => :jruby
 end
 
 gemspec :path => "../"

data/gemfiles/rails5.gemfile

@@ -3,19 +3,23 @@ source "https://rubygems.org"
 gem 'arel', '~> 7.0'
 
 group :development, :test do
+	gem 'activesupport', '~> 5'
+	gem 'activemodel', '~> 5'
+	gem 'activerecord', '~> 5'
+
 	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
 	gem "mysql2", :platform => [:ruby, :mswin, :mingw]
 	gem "pg", :platform => [:ruby, :mswin, :mingw]
+	gem 'ruby-oci8', '~> 2.2.0', :platform => [:ruby, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+	gem 'activerecord-oracle_enhanced-adapter', '~> 1.7.0'
 
 	# for JRuby
+	gem 'activerecord-jdbc-adapter', platform: :jruby
 	gem "jdbc-sqlite3", :platform => :jruby
 	gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 	gem "activerecord-jdbcmysql-adapter", :platform => :jruby
 	gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
-
-	gem 'activesupport', '~> 5'
-	gem 'activemodel', '~> 5'
-	gem 'activerecord', '~> 5'
+	gem "activerecord-jdbcmssql-adapter", :platform => :jruby
 end
 
 gemspec :path => "../"

data/lib/arel_extensions/math.rb

@@ -29,12 +29,12 @@ module ArelExtensions
           when Arel::Attributes::Attribute
             arg2 = Arel::Table.engine.connection.schema_cache.columns_hash(other.relation.table_name)[other.name.to_s].type
             if arg2 == :date || arg2 == :datetime
-              ArelExtensions::Nodes::DateDiff.new self, other
+              ArelExtensions::Nodes::DateDiff.new [self, other]
             else
               ArelExtensions::Nodes::DateSub.new self, other
             end
           when Arel::Nodes::Node, DateTime, Time, String, Date
-            ArelExtensions::Nodes::DateDiff.new self, other
+            ArelExtensions::Nodes::DateDiff.new [self, other]
           when Fixnum
             ArelExtensions::Nodes::DateSub.new self, other
           end

data/lib/arel_extensions/math_functions.rb

@@ -25,7 +25,7 @@ module ArelExtensions
     #function is used to round a numeric field to the number of decimals specified
     def round precision = nil
         if precision
-            ArelExtensions::Nodes::Round.new [self, Arel::Nodes.build_quoted(precision)]
+            ArelExtensions::Nodes::Round.new [self, precision]
         else
             ArelExtensions::Nodes::Round.new [self]
         end

data/lib/arel_extensions/nodes/concat.rb

@@ -14,5 +14,21 @@ module ArelExtensions
       end
 
     end
+
+    class GroupConcat < Function
+
+      def initialize expr
+        tab = expr.map { |arg|
+          convert_to_node(arg)
+        }
+        return super(tab)
+      end
+
+      def +(other)
+        return ArelExtensions::Nodes::Concat.new([self, other]) 
+      end
+
+    end
+
   end
 end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -2,35 +2,21 @@ require 'date'
 
 module ArelExtensions
   module Nodes
-    class DateDiff < Arel::Nodes::Node #difference entre colonne date et date string/date
-      include Arel::Predications
-      include Arel::WindowPredications
-      include Arel::OrderPredications
-      include Arel::AliasPredication
-
-      attr_accessor :left, :right
-
-      def initialize(left, right, aliaz = nil)
-        super()
-        @left = convert_date(left)
-        @right = convert_date(right)
-      end
+    class DateDiff < Function #difference entre colonne date et date string/date
+      attr_accessor :date_type
 
-      def convert_date(object)
-        case object
-        when Arel::Attributes::Attribute, Arel::Nodes::Node
-          object
-        when DateTime, Time
-          Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
-        when String
-          Arel::Nodes.build_quoted(Date.parse(object), self)
+      def initialize(expr)
+        col = expr.first
+        case col
+        when Arel::Nodes::Node
+          @date_type = Arel::Table.engine.connection.schema_cache.columns_hash(col.relation.table_name)[col.name.to_s].type
         when Date
-          Arel::Nodes.build_quoted(object, self)
-        else
-          raise(ArgumentError, "#{object.class} can not be converted to Date")
+          @date_type = :date
+        when DateTime, Time
+          @date_type = :datetime
         end
+        super [convert_to_date_node(col), convert_to_date_node(expr[1])]
       end
-
     end
 
     class DateAdd < Function
@@ -58,6 +44,32 @@ module ArelExtensions
         end
       end
 
+      def mysql_value(v = nil)
+        v ||= self.expressions.last
+        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
+          if @date_type == :date
+            Arel.sql((v.value >= 0 ? 'INTERVAL ' : 'INTERVAL -') + v.inspect.sub(/s\Z/, ''))
+          elsif @date_type == :datetime
+            Arel.sql((v.value >= 0 ? 'INTERVAL ' : 'INTERVAL -') + v.inspect.sub(/s\Z/, ''))
+          end
+        else
+          v
+        end
+      end
+
+      def postgresql_value(v = nil)
+        v ||= self.expressions.last
+        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
+          if @date_type == :date
+            Arel.sql("INTERVAL '%s'" % v.inspect.sub(/s\Z/, '').upcase)
+          elsif @date_type == :datetime
+            Arel.sql("INTERVAL '%s'" % v.inspect.sub(/s\Z/, '').upcase)
+          end
+        else
+          return v
+        end
+      end
+
       private
       def convert(object)
         case object