arel_extensions 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2ade749fb291100715cf14fb1429423d253532
-  data.tar.gz: 111e9e06da61b1949ea7c6e8a9d59c8332dfbbec
+  metadata.gz: a8e5c240fc0fe59c0b14a9709b6c065276475334
+  data.tar.gz: f5caf5d24a636b49f39132e3817ed867dd803374
 SHA512:
-  metadata.gz: f805809f0cf68defc693d50f82cc300118f990233c29f81eccc2accef50093f3b447f1ba1b4740072e9d675f646a82f75f9e9eeaaf813e323d1db7230a3cac9e
-  data.tar.gz: e4bd7faa243ae45fcc604294e662765e25055e13111a1889810327893dc545020c4bd1b465d2eaa4c16262fcdc282fbfd89cd4ceff95be986a9f9694538ecd5a
+  metadata.gz: 2c1ffca0a92fb3d704b2f2ed2649cf6a8df2fb90e46602680aa5c894c9ffef0d6af726736da6de97b12d7ce09f88d4d087e4bf0f1e3d64ab4dec89c8a0c03f93
+  data.tar.gz: 617784403ff3999277c8c60430294feaacba648366635d768f14347f2373fab2209c7dd097c72b1bb7ad0a9dcc9e7d9aad1c21976495943a20d317a2cee70467

data/.travis.yml

@@ -2,9 +2,15 @@ language: ruby
 sudo: required
 cache: bundler
 before_install:
+- chmod +x .travis/oracle/download.sh
+- chmod +x .travis/oracle/install.sh
+- chmod +x .travis/setup_accounts.sh
+install:
+- .travis/oracle/download.sh
+- .travis/oracle/install.sh
+- .travis/setup_accounts.sh
 - gem install bundler
-# - ".travis/oracle/download.sh"
-# - ".travis/oracle/install.sh"
+- bundle install
 gemfile:
 - gemfiles/rails4.gemfile
 - gemfiles/rails5.gemfile
@@ -16,19 +22,24 @@ before_script:
 - psql -c 'create database arext_test;' -U postgres
 # - $ORACLE_HOME/bin/sqlplus CREATE DB
 script:
-- bundle exec rake test
 - gem build arel_extensions.gemspec
+- bundle exec rake test
 - bundle exec rake test:sqlite
 - bundle exec rake test:mysql
 - bundle exec rake test:postgresql
-# - bundle exec rake test:oracle
+- bundle exec rake test:oracle
 env:
   global:
   - JRUBY_OPTS='--dev -J-Xmx1024M'
   - ORACLE_COOKIE=sqldev
   - ORACLE_FILE=oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
+  - ORACLE_OJDBC_URL=http://download.oracle.com/otn/utilities_drivers/jdbc/11204/ojdbc6.jar
+  - TNS_ADMIN=$ORACLE_HOME/network/admin
+  - ORACLE_BASE=/u01/app/oracle
   - ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
   - ORACLE_SID=XE
+  - DATABASE_NAME=XE
+  - NLS_LANG=AMERICAN_AMERICA.AL32UTF8
   - 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

data/.travis/oracle/download_ojdbc.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('ojdbc6.jar'),
+            '--user-agent', env['USER_AGENT'],
+            env['ORACLE_OJDBC_URL']
+          ]];
+
+          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/setup_accounts.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -ev
+
+"$ORACLE_HOME/bin/sqlplus" -L -S / AS SYSDBA <<SQL
+@@test/support/alter_system_user_password.sql
+@@test/support/create_oracle_enhanced_users.sql
+exit
+SQL

data/README.md

@@ -4,7 +4,14 @@ 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.
 It allows to use more advanced SQL functions for any supported RDBMS.
 
-Examples: 
+
+## Requirements
+
+Arel 6 (Rails 4) or Arel 7+ (Rails 5).
+
+
+## Examples
+
 t is an Arel::Table for table my_table
 
 ## Comparators
@@ -14,6 +21,11 @@ t is an Arel::Table for table my_table
 # => my_table.nb > 42
 ```
 
+```ruby
+(t[:date1] > t[:date2]).to_sql # (same as (t[:date1].gt(t[:date2])).to_sql)
+# => my_table.date1 > my_table.date2
+```
+
 ## Maths
 
 Currently in Arel:
@@ -34,7 +46,7 @@ With Arel Extensions:
 # => SUM(my_table.nb) + 42
 ```
 
-Other functions : ABS, RAND, ROUND, FLOOR, CEIL, MD5, FORMAT
+Other functions : ABS, RAND, ROUND, FLOOR, CEIL, FORMAT
 
 ## String operations
 
@@ -73,7 +85,7 @@ Other functions : SOUNDEX, LENGTH, REPLACE, LOCATE, TRIM
 ((t[:birthdate] - Date.today) * -1).to_sql
 # => DATEDIFF(my_table.birthdate, '2017-01-01') * -1
 
-(t[:birthdate].week).to_sql
+t[:birthdate].week.to_sql
 # => WEEK(my_table.birthdate)
 
 t[:birthdate].month.to_sql

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.4'
+  s.version     = '0.8.5'
   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/gemfiles/rails4.gemfile

@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gem 'arel', '~> 6.0'
 
 group :development, :test do
-
 	gem 'activesupport', '~> 4.0'
 	gem 'activemodel', '~> 4.0'
 	gem 'activerecord', '~> 4.0'
@@ -13,7 +12,7 @@ group :development, :test do
 	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'
+	gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'
 
 	# for JRuby
 	gem 'activerecord-jdbc-adapter', platform: :jruby

data/gemfiles/rails5.gemfile

@@ -10,8 +10,9 @@ group :development, :test do
 	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'
+
+	gem 'ruby-oci8', :platform => [:ruby, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+	gem 'activerecord-oracle_enhanced-adapter', '~> 1.7.0' if ENV.has_key? 'ORACLE_HOME'
 
 	# for JRuby
 	gem 'activerecord-jdbc-adapter', platform: :jruby

data/init/postgresql.sql

@@ -1,12 +1,14 @@
 CREATE OR REPLACE FUNCTION public.find_in_set(n INTEGER, s TEXT)
- RETURNS BOOLEAN
+ RETURNS INT4
  LANGUAGE sql
 AS $function$
-    select bool(int4(z.row_number))
-    from
-    (
-        select row_number() over(), y.x
+    SELECT * FROM (
+      select int4(z.row_number) from (
+        select row_number() over(), y.x 
         from (select unnest(('{' || $2 || '}')::int[]) as x) as y
-    ) as z
-where z.x = $1
-$function$
+      ) as z
+      where z.x = $1
+    UNION ALL 
+      SELECT 0) z
+    LIMIT 1
+$function$

data/lib/arel_extensions/date_duration.rb

@@ -2,26 +2,30 @@ module ArelExtensions
     module DateDuration
       #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.
       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.
       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.
       def day
-        ArelExtensions::Nodes::Duration.new "d",self
+        ArelExtensions::Nodes::Duration.new "d", self
       end
 
       def wday
-        ArelExtensions::Nodes::Wday.new self
+        ArelExtensions::Nodes::Duration.new 'wd', self
+      end
+
+      def format(tpl)
+        ArelExtensions::Nodes::Format.new [self, tpl]
       end
 
     end

data/lib/arel_extensions/math.rb

@@ -15,7 +15,7 @@ module ArelExtensions
           Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
         elsif arg == :datetime || arg == :date
           ArelExtensions::Nodes::DateAdd.new [self, other]
-        elsif arg == :string
+        elsif arg == :string || arg == :text
           ArelExtensions::Nodes::Concat.new [self, other]
         end        
       end

data/lib/arel_extensions/nodes.rb

@@ -18,6 +18,7 @@ require 'arel_extensions/nodes/soundex'
 require 'arel_extensions/nodes/trim'
 require 'arel_extensions/nodes/ltrim'
 require 'arel_extensions/nodes/rtrim'
+require 'arel_extensions/nodes/format'
 
 # Date functions 
 require 'arel_extensions/nodes/date_diff'

data/lib/arel_extensions/nodes/abs.rb

@@ -1,6 +1,8 @@
 module ArelExtensions
   module Nodes
     class Abs < Function
+      @@return_type = :number
+
     end
   end
 end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -5,6 +5,8 @@ module ArelExtensions
     class DateDiff < Function #difference entre colonne date et date string/date
       attr_accessor :date_type
 
+      @@return_type = :integer # by default...
+
       def initialize(expr)
         col = expr.first
         case col
@@ -70,6 +72,21 @@ module ArelExtensions
         end
       end
 
+      def oracle_value(v = nil)
+        v ||= self.expressions.last
+        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
+          if @date_type == :date
+            Arel.sql("INTERVAL '%s' DAY" % v.inspect.to_i)
+          elsif @date_type == :datetime
+            Arel.sql("INTERVAL '%s' SECOND" % v.to_i)
+          end
+#        elsif Arel::Attributes::Attribute === v
+#          v
+        else
+          v
+        end
+      end
+
       private
       def convert(object)
         case object

data/lib/arel_extensions/nodes/find_in_set.rb

@@ -1,15 +1,7 @@
 module ArelExtensions
   module Nodes
     class FindInSet < Function
-
-      def left
-        @expressions.first
-      end
-
-
-      def right
-        @expressions[1]
-      end
+      @@return_type = :integer
 
     end
   end

data/lib/arel_extensions/nodes/format.rb

@@ -0,0 +1,12 @@
+module ArelExtensions
+  module Nodes
+    class Format < Function
+    	attr_accessor :col_type
+    	def initialize expr
+	        col = expr.first
+	        @col_type = Arel::Table.engine.connection.schema_cache.columns_hash(col.relation.table_name)[col.name.to_s].type
+        	super [expr.first, convert_to_string_node(expr[1])]
+    	end
+    end
+  end
+end

data/lib/arel_extensions/nodes/function.rb

@@ -4,6 +4,10 @@ module ArelExtensions
       include Arel::Math
       include Arel::Expressions
 
+      cattr_accessor :return_type
+
+      @@return_type = :string # by default...
+
     	# overrides as to make new Node like AliasPredication
       def as other
         Arel::Nodes::As.new(self, Arel.sql(other))
@@ -21,7 +25,6 @@ module ArelExtensions
         @expressions[1]
       end
 
-      protected
       def convert_to_node(object)
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node, Fixnum, Integer
@@ -31,7 +34,7 @@ module ArelExtensions
         when String
           Arel::Nodes.build_quoted(object)
         when Date
-          Arel::Nodes.build_quoted(object, self)
+          Arel::Nodes.build_quoted(object.to_s, self)
         when NilClass
           Arel.sql('NULL')
         when ActiveSupport::Duration
@@ -41,6 +44,34 @@ module ArelExtensions
         end
       end
 
+      def convert_to_string_node(object)
+        case object
+        when Arel::Nodes::Node
+          object
+        when Fixnum, Integer
+          Arel::Nodes.build_quoted(object.to_s)
+        when Arel::Attributes::Attribute
+          case Arel::Table.engine.connection.schema_cache.columns_hash(object.relation.table_name)[object.name.to_s].type
+          when :date
+            ArelExtensions::Nodes::Format.new [object, 'yyyy-mm-dd']
+          else
+            object
+          end
+        when DateTime, Time
+          Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
+        when String
+          Arel::Nodes.build_quoted(object)
+        when Date
+          Arel::Nodes.build_quoted(object, self)
+        when NilClass
+          Arel.sql('NULL')
+        when ActiveSupport::Duration
+          Arel::Nodes.build_quoted(object.to_i.to_s)
+        else
+          raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+        end
+      end
+
       def convert_to_date_node(object)
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node