8000 Test with Oracle · GUI/ajax-datatables-rails@600c0de · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 600c0de

Browse files
author
Nicolas Rodriguez
committed
Test with Oracle
1 parent 827dce6 commit 600c0de

17 files changed

+139
-30
lines changed

‎.travis.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ matrix:
3131
- rvm: 2.4.1
3232
gemfile: gemfiles/rails_5.1.1.gemfile
3333
env: DB_ADAPTER=mysql2
34+
- rvm: 2.4.1
35+
gemfile: gemfiles/rails_4.2.8.gemfile
36+
env: DB_ADAPTER=oracle_enhanced
37+
- rvm: 2.4.1
38+
gemfile: gemfiles/rails_5.0.3.gemfile
39+
env: DB_ADAPTER=oracle_enhanced
40+
- rvm: 2.4.1
41+
gemfile: gemfiles/rails_5.1.1.gemfile
42+
env: DB_ADAPTER=oracle_enhanced
3443
after_success:
3544
- bundle exec codeclimate-test-reporter
3645
services:
@@ -43,10 +52,17 @@ addons:
4352
- mysql-server-5.6
4453
- mysql-client-core-5.6
4554
- mysql-client-5.6
46-
before_script:
55+
before_install:
4756
- sh -c "if [ '$DB_ADAPTER' = 'mysql2' ]; then mysql -e 'create database ajax_datatables_rails;'; fi"
4857
- sh -c "if [ '$DB_ADAPTER' = 'postgresql' ]; then psql -c 'create database ajax_datatables_rails;' -U postgres; fi"
58+
- sh -c "if [ '$DB_ADAPTER' = 'oracle_enhanced' ]; then ./spec/install_oracle.sh; fi"
4959
env:
60+
global:
61+
- ORACLE_COOKIE=sqldev
62+
- ORACLE_FILE=oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
63+
- ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
64+
- ORACLE_SID=XE
5065
matrix:
5166
- DB_ADAPTER=postgresql
5267
- DB_ADAPTER=mysql2
68+
- DB_ADAPTER=oracle_enhanced

‎Appraisals

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,34 @@
1-
RAILS_VERSIONS = %w(
2-
4.0.13
3-
4.1.15
4-
4.2.8
5-
5.0.3
6-
5.1.1
7-
)
1+
RAILS_VERSIONS = {
2+
'4.0.13' => {
3+
'mysql2' => '~> 0.3.18',
4+
'activerecord-oracle_enhanced-adapter' => '~> 1.5.0'
5+
},
6+
'4.1.15' => {
7+
'mysql2' => '~> 0.3.18',
8+
'activerecord-oracle_enhanced-adapter' => '~> 1.5.0'
9+
},
10+
'4.2.8' => {
11+
'activerecord-oracle_enhanced-adapter' => '~> 1.6.0'
12+
},
13+
'5.0.3' => {
14+
'activerecord-oracle_enhanced-adapter' => '~> 1.7.0',
15+
'ruby-oci8' => ''
16+
},
17+
'5.1.1' => {
18+
'activerecord-oracle_enhanced-adapter' => '~> 1.8.0',
19+
'ruby-oci8' => ''
20+
}
21+
}
822

9-
RAILS_VERSIONS.each do |version|
23+
RAILS_VERSIONS.each do |version, gems|
1024
appraise "rails_#{version}" do
1125
gem 'rails', version
12-
gem 'mysql2', '~> 0.3.18' if version == '4.1.15' || version == '4.0.13'
26+
gems.each do |name, version|
27+
if version.empty?
28+
gem name
29+
else
30+
gem name, version
31+
end
32+
end
1333
end
1434
end

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
> * Ruby 2.2.7 / 2.3.4 / 2.4.1
1818
> * Postgresql
1919
> * MySQL
20+
> * Oracle XE 11.2 (thanks to [travis-oracle](https://github.com/cbandy/travis-oracle))
2021
2122
## Description
2223

‎ajax-datatables-rails.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
2020
s.add_development_dependency 'pg'
2121
s.add_development_dependency 'mysql2'
2222
s.add_development_dependency 'sqlite3'
23+
s.add_development_dependency 'activerecord-oracle_enhanced-adapter'
2324
s.add_development_dependency 'rspec'
2425
s.add_development_dependency 'generator_spec'
2526
s.add_development_dependency 'pry'

‎gemfiles/rails_4.0.13.gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ source "https://rubygems.org"
44

55
gem "rails", "4.0.13"
66
gem "mysql2", "~> 0.3.18"
7+
gem "activerecord-oracle_enhanced-adapter", "~> 1.5.0"
8+
gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
79

810
group :test do
911
gem "codeclimate-test-reporter", "~> 1.0.0"

‎gemfiles/rails_4.1.15.gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ source "https://rubygems.org"
44

55
gem "rails", "4.1.15"
66
gem "mysql2", "~> 0.3.18"
7+
gem "activerecord-oracle_enhanced-adapter", "~> 1.5.0"
8+
gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
79

810
group :test do
911
gem "codeclimate-test-reporter", "~> 1.0.0"

‎gemfiles/rails_4.2.8.gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
source "https://rubygems.org"
44

55
gem "rails", "4.2.8"
6+
gem "activerecord-oracle_enhanced-adapter", "~> 1.6.0"
7+
gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
68

79
group :test do
810
gem "codeclimate-test-reporter", "~> 1.0.0"

‎gemfiles/rails_5.0.3.gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
source "https://rubygems.org"
44

55
gem "rails", "5.0.3"
6+
gem "activerecord-oracle_enhanced-adapter", "~> 1.7.0"
7+
gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
68

79
group :test do
810
gem "codeclimate-test-reporter", "~> 1.0.0"

‎gemfiles/rails_5.1.1.gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
source "https://rubygems.org"
44

55
gem "rails", "5.1.1"
6+
gem "activerecord-oracle_enhanced-adapter", "~> 1.8.0"
7+
gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
68

79
group :test do
810
gem "codeclimate-test-reporter", "~> 1.0.0"

‎lib/ajax-datatables-rails/base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def records_total_count
9595
end
9696

9797
def records_filtered_count
98-
get_raw_records.model.from("(#{filter_records(get_raw_records).except(:limit, :offset, :order).to_sql}) AS foo").count
98+
filter_records(get_raw_records).count(:all)
9999
end
100100

101101
# Private helper methods

0 commit comments

Comments
 (0)
0