Test with Oracle

Nicolas Rodriguez · Nicolas Rodriguez · commit 600c0de52c7f · 2017-05-21T16:05:54.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,15 @@ matrix:
     - rvm: 2.4.1
       gemfile: gemfiles/rails_5.1.1.gemfile
       env: DB_ADAPTER=mysql2
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_4.2.8.gemfile
+      env: DB_ADAPTER=oracle_enhanced
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_5.0.3.gemfile
+      env: DB_ADAPTER=oracle_enhanced
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_5.1.1.gemfile
+      env: DB_ADAPTER=oracle_enhanced
 after_success:
   - bundle exec codeclimate-test-reporter
 services:
@@ -43,10 +52,17 @@ addons:
     - mysql-server-5.6
     - mysql-client-core-5.6
     - mysql-client-5.6
-before_script:
+before_install:
   - sh -c "if [ '$DB_ADAPTER' = 'mysql2' ]; then mysql -e 'create database ajax_datatables_rails;'; fi"
   - sh -c "if [ '$DB_ADAPTER' = 'postgresql' ]; then psql -c 'create database ajax_datatables_rails;' -U postgres; fi"
+  - sh -c "if [ '$DB_ADAPTER' = 'oracle_enhanced' ]; then ./spec/install_oracle.sh; fi"
 env:
+  global:
+    - 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
   matrix:
     - DB_ADAPTER=postgresql
     - DB_ADAPTER=mysql2
+    - DB_ADAPTER=oracle_enhanced
diff --git a/Appraisals b/Appraisals
@@ -1,14 +1,34 @@
-RAILS_VERSIONS = %w(
-  4.0.13
-  4.1.15
-  4.2.8
-  5.0.3
-  5.1.1
-)
+RAILS_VERSIONS = {
+  '4.0.13' => {
+    'mysql2' => '~> 0.3.18',
+    'activerecord-oracle_enhanced-adapter' => '~> 1.5.0'
+  },
+  '4.1.15' => {
+    'mysql2' => '~> 0.3.18',
+    'activerecord-oracle_enhanced-adapter' => '~> 1.5.0'
+  },
+  '4.2.8' => {
+    'activerecord-oracle_enhanced-adapter' => '~> 1.6.0'
+  },
+  '5.0.3' => {
+    'activerecord-oracle_enhanced-adapter' => '~> 1.7.0',
+    'ruby-oci8' => ''
+  },
+  '5.1.1' => {
+    'activerecord-oracle_enhanced-adapter' => '~> 1.8.0',
+    'ruby-oci8' => ''
+  }
+}
 
-RAILS_VERSIONS.each do |version|
+RAILS_VERSIONS.each do |version, gems|
   appraise "rails_#{version}" do
     gem 'rails', version
-    gem 'mysql2', '~> 0.3.18' if version == '4.1.15' || version == '4.0.13'
+    gems.each do |name, version|
+      if version.empty?
+        gem name
+      else
+        gem name, version
+      end
+    end
   end
 end
diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@
 > * Ruby 2.2.7 / 2.3.4 / 2.4.1
 > * Postgresql
 > * MySQL
+> * Oracle XE 11.2 (thanks to [travis-oracle](https://github.com/cbandy/travis-oracle))
 
 ## Description
 
diff --git a/ajax-datatables-rails.gemspec b/ajax-datatables-rails.gemspec
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pg'
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'activerecord-oracle_enhanced-adapter'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'generator_spec'
   s.add_development_dependency 'pry'
diff --git a/gemfiles/rails_4.0.13.gemfile b/gemfiles/rails_4.0.13.gemfile
@@ -4,6 +4,8 @@ source "https://rubygems.org"
 
 gem "rails", "4.0.13"
 gem "mysql2", "~> 0.3.18"
+gem "activerecord-oracle_enhanced-adapter", "~> 1.5.0"
+gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
 group :test do
   gem "codeclimate-test-reporter", "~> 1.0.0"
diff --git a/gemfiles/rails_4.1.15.gemfile b/gemfiles/rails_4.1.15.gemfile
@@ -4,6 +4,8 @@ source "https://rubygems.org"
 
 gem "rails", "4.1.15"
 gem "mysql2", "~> 0.3.18"
+gem "activerecord-oracle_enhanced-adapter", "~> 1.5.0"
+gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
 group :test do
   gem "codeclimate-test-reporter", "~> 1.0.0"
diff --git a/gemfiles/rails_4.2.8.gemfile b/gemfiles/rails_4.2.8.gemfile
@@ -3,6 +3,8 @@
 source "https://rubygems.org"
 
 gem "rails", "4.2.8"
+gem "activerecord-oracle_enhanced-adapter", "~> 1.6.0"
+gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
 group :test do
   gem "codeclimate-test-reporter", "~> 1.0.0"
diff --git a/gemfiles/rails_5.0.3.gemfile b/gemfiles/rails_5.0.3.gemfile
@@ -3,6 +3,8 @@
 source "https://rubygems.org"
 
 gem "rails", "5.0.3"
+gem "activerecord-oracle_enhanced-adapter", "~> 1.7.0"
+gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
 group :test do
   gem "codeclimate-test-reporter", "~> 1.0.0"
diff --git a/gemfiles/rails_5.1.1.gemfile b/gemfiles/rails_5.1.1.gemfile
@@ -3,6 +3,8 @@
 source "https://rubygems.org"
 
 gem "rails", "5.1.1"
+gem "activerecord-oracle_enhanced-adapter", "~> 1.8.0"
+gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
 
 group :test do
   gem "codeclimate-test-reporter", "~> 1.0.0"
diff --git a/lib/ajax-datatables-rails/base.rb b/lib/ajax-datatables-rails/base.rb
@@ -95,7 +95,7 @@ def records_total_count
     end
 
     def records_filtered_count
-      get_raw_records.model.from("(#{filter_records(get_raw_records).except(:limit, :offset, :order).to_sql}) AS foo").count
+      filter_records(get_raw_records).count(:all)
     end
 
     # Private helper methods
diff --git a/lib/ajax-datatables-rails/datatable/column.rb b/lib/ajax-datatables-rails/datatable/column.rb
@@ -136,6 +136,7 @@ def non_regex_search
 
       def typecast
         case config.db_adapter
+        when :oracle, :oracleenhanced then 'VARCHAR2(4000)'
         when :mysql, :mysql2   then 'CHAR'
         when :sqlite, :sqlite3 then 'TEXT'
         else
diff --git a/spec/ajax-datatables-rails/extended_spec.rb b/spec/ajax-datatables-rails/extended_spec.rb
@@ -6,15 +6,15 @@
 
   describe 'it can transform search value before asking the database' do
     before(:each) do
-      create(:user, username: 'johndoe', email: 'johndoe@example.com', last_name: 'Doe')
-      create(:user, username: 'msmith', email: 'mary.smith@example.com', last_name: 'Smith')
-      datatable.params[:columns]['3'][:search][:value] = 'DOE'
+      create(:user, username: 'johndoe', email: 'johndoe@example.com', last_name: 'DOE')
+      create(:user, username: 'msmith', email: 'mary.smith@example.com', last_name: 'SMITH')
+      datatable.params[:columns]['3'][:search][:value] = 'doe'
     end
 
     it 'should filter records' do
       expect(datatable.data.size).to eq 1
       item = datatable.data.first
-      expect(item[:last_name]).to eq 'Doe'
+      expect(item[:last_name]).to eq 'DOE'
     end
   end
 end
diff --git a/spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb b/spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb
@@ -56,7 +56,7 @@
 
     context 'with search query' do
       before(:each) do
-        datatable.params[:search] = { value: "John", regex: "false" }
+        datatable.params[:search] = { value: "john", regex: "false" }
       end
 
       it 'returns a filtering query' do
@@ -97,6 +97,18 @@
         end
       end
 
+      if AjaxDatatablesRails.config.db_adapter.in? %i[oracle oracleenhanced]
+        context 'when db_adapter is oracle' do
+          it 'can call #to_sql on returned object' do
+            result = datatable.send(:build_conditions_for_selected_columns)
+            expect(result).to respond_to(:to_sql)
+            expect(result.to_sql).to eq(
+              "CAST(\"USERS\".\"USERNAME\" AS VARCHAR2(4000)) LIKE '%doe%' AND CAST(\"USERS\".\"EMAIL\" AS VARCHAR2(4000)) LIKE '%example%'"
+            )
+          end
+        end
+      end
+
       if AjaxDatatablesRails.config.db_adapter.in? %i[mysql2 sqlite3]
         context 'when db_adapter is mysql2' do
           it 'can call #to_sql on returned object' do
@@ -143,11 +155,21 @@
       expect(column.send(:typecast)).to eq('VARCHAR')
     end
 
-    it 'returns VARCHAR if :db_adapter is :postgre' do
+    it 'returns VARCHAR if :db_adapter is :postgresql' do
       allow_any_instance_of(AjaxDatatablesRails::Configuration).to receive(:db_adapter) { :postgresql }
       expect(column.send(:typecast)).to eq('VARCHAR')
     end
 
+    it 'returns VARCHAR if :db_adapter is :oracle' do
+      allow_any_instance_of(AjaxDatatablesRails::Configuration).to receive(:db_adapter) { :oracle }
+      expect(column.send(:typecast)).to eq('VARCHAR2(4000)')
+    end
+
+    it 'returns VARCHAR if :db_adapter is :oracleenhanced' do
+      allow_any_instance_of(AjaxDatatablesRails::Configuration).to receive(:db_adapter) { :oracleenhanced }
+      expect(column.send(:typecast)).to eq('VARCHAR2(4000)')
+    end
+
     it 'returns CHAR if :db_adapter is :mysql2' do
       allow_any_instance_of(AjaxDatatablesRails::Configuration).to receive(:db_adapter) { :mysql2 }
       expect(column.send(:typecast)).to eq('CHAR')
@@ -260,7 +282,7 @@
       end
 
       it 'should filter records matching' do
-        datatable.params[:columns]['2'][:search][:value] = 'jo'
+        datatable.params[:columns]['2'][:search][:value] = 'Jo'
         expect(datatable.data.size).to eq 1
         item = datatable.data.first
         expect(item[:first_name]).to eq 'John'
@@ -269,15 +291,15 @@
 
     describe 'it can filter records with condition :end_with' do
       before(:each) do
-        create(:user, last_name: 'John')
-        create(:user, last_name: 'Mary')
+        create(:user, last_name: 'JOHN')
+        create(:user, last_name: 'MARY')
       end
 
       it 'should filter records matching' do
         datatable.params[:columns]['3'][:search][:value] = 'ry'
         expect(datatable.data.size).to eq 1
         item = datatable.data.first
-        expect(item[:last_name]).to eq 'Mary'
+        expect(item[:last_name]).to eq 'MARY'
       end
     end
 
diff --git a/spec/ajax-datatables-rails/orm/active_record_paginate_records_spec.rb b/spec/ajax-datatables-rails/orm/active_record_paginate_records_spec.rb
@@ -17,15 +17,39 @@
     end
 
     it 'paginates records properly' do
-      expect(datatable.paginate_records(records).to_sql).to include(
-        'LIMIT 10 OFFSET 0'
-      )
+      if AjaxDatatablesRails.config.db_adapter.in? %i[oracle oracleenhanced]
+        if Rails.version.in? %w[4.0.13 4.1.15 4.2.8]
+          expect(datatable.paginate_records(records).to_sql).to include(
+            'rownum <= 10'
+          )
+        else
+          expect(datatable.paginate_records(records).to_sql).to include(
+            'rownum <= (0 + 10)'
+          )
+        end
+      else
+        expect(datatable.paginate_records(records).to_sql).to include(
+          'LIMIT 10 OFFSET 0'
+        )
+      end
 
       datatable.params[:start] = '26'
       datatable.params[:length] = '25'
-      expect(datatable.paginate_records(records).to_sql).to include(
-        'LIMIT 25 OFFSET 25'
-      )
+      if AjaxDatatablesRails.config.db_adapter.in? %i[oracle oracleenhanced]
+        if Rails.version.in? %w[4.0.13 4.1.15 4.2.8]
+          expect(datatable.paginate_records(records).to_sql).to include(
+            'rownum <= 50'
+          )
+        else
+          expect(datatable.paginate_records(records).to_sql).to include(
+            'rownum <= (25 + 25)'
+          )
+        end
+      else
+        expect(datatable.paginate_records(records).to_sql).to include(
+          'LIMIT 25 OFFSET 25'
+        )
+      end
     end
 
     it 'depends on the value of #offset' do
diff --git a/spec/install_oracle.sh b/spec/install_oracle.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+wget 'https://github.com/cbandy/travis-oracle/archive/v2.0.2.tar.gz'
+mkdir -p ~/.travis/oracle
+tar xz --strip-components 1 -C ~/.travis/oracle -f v2.0.2.tar.gz
+
+~/.travis/oracle/download.sh
+~/.travis/oracle/install.sh
+
+"$ORACLE_HOME/bin/sqlplus" -L -S / AS SYSDBA <<SQL
+ALTER USER $USER IDENTIFIED BY $USER;
+SQL
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -66,6 +66,7 @@
 }
 
 options = options.merge(username: 'root') if adapter == 'mysql2'
+options = options.merge(username: ENV['USER'], password: ENV['USER'], database: 'xe', host: '127.0.0.1/xe') if adapter == 'oracle_enhanced'
 options = options.merge(database: ':memory:') if adapter == 'sqlite3'
 
 ActiveRecord::Base.establish_connection(options)
diff --git a/spec/support/test_helpers.rb b/spec/support/test_helpers.rb
@@ -76,9 +76,7 @@ def view_columns
       last_name:  { source: 'User.last_name', formater: -> (o) { o.upcase } },
     }
   end
-end
 
-class ComplexDatatableHash < ComplexDatatable
   def data
     records.map do |record|
       {
@@ -91,6 +89,9 @@ def data
   end
 end
 
+class ComplexDatatableHash < ComplexDatatable
+end
+
 class ComplexDatatableArray < ComplexDatatable
   def data
     records.map do |record|
@@ -110,7 +111,7 @@ def view_columns
       username:   { source: 'User.username' },
       email:      { source: 'User.email',      cond: :null_value },
       first_name: { source: 'User.first_name', cond: :start_with },
-      last_name:  { source: 'User.last_name',  cond: :end_with, formater: -> (o) { o.downcase } },
+      last_name:  { source: 'User.last_name',  cond: :end_with, formater: -> (o) { o.upcase } },
       post_id:    { source: 'User.post_id' },
       created_at: { source: 'User.created_at', cond: :date_range },
     }
