From 32abd344a7da12fb79f54d351e5adc1f671d4feb Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 2 Jun 2017 19:55:43 +0900 Subject: [PATCH] Tests can be run on PostgreSQL now --- gemfiles/active_record_41.gemfile | 2 ++ gemfiles/active_record_42.gemfile | 2 ++ gemfiles/active_record_50.gemfile | 2 ++ gemfiles/active_record_51.gemfile | 2 ++ kaminari-core/test/fake_app/config/database.yml | 7 +++++++ 5 files changed, 15 insertions(+) diff --git a/gemfiles/active_record_41.gemfile b/gemfiles/active_record_41.gemfile index 61cb616..9f572bb 100644 --- a/gemfiles/active_record_41.gemfile +++ b/gemfiles/active_record_41.gemfile @@ -10,9 +10,11 @@ platforms :ruby do gem 'sqlite3', '1.3.8' gem 'nokogiri', '~> 1.6.8' end + gem 'pg' end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' + gem 'activerecord-jdbcpostgresql-adapter' end platforms :rbx do gem 'rubysl', '~> 2.0' diff --git a/gemfiles/active_record_42.gemfile b/gemfiles/active_record_42.gemfile index 1129c30..a8d153d 100644 --- a/gemfiles/active_record_42.gemfile +++ b/gemfiles/active_record_42.gemfile @@ -10,9 +10,11 @@ platforms :ruby do gem 'sqlite3', '1.3.8' gem 'nokogiri', '~> 1.6.8' end + gem 'pg' end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' + gem 'activerecord-jdbcpostgresql-adapter' end platforms :rbx do gem 'rubysl', '~> 2.0' diff --git a/gemfiles/active_record_50.gemfile b/gemfiles/active_record_50.gemfile index 300030b..867abbe 100644 --- a/gemfiles/active_record_50.gemfile +++ b/gemfiles/active_record_50.gemfile @@ -6,9 +6,11 @@ gem 'actionview', '~> 5.0.0', require: 'action_view' platforms :ruby do gem 'sqlite3' + gem 'pg' end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' + gem 'activerecord-jdbcpostgresql-adapter' end platforms :rbx do gem 'rubysl', '~> 2.0' diff --git a/gemfiles/active_record_51.gemfile b/gemfiles/active_record_51.gemfile index 57c3618..8cc4b4b 100644 --- a/gemfiles/active_record_51.gemfile +++ b/gemfiles/active_record_51.gemfile @@ -6,9 +6,11 @@ gem 'actionview', '~> 5.1.0', require: 'action_view' platforms :ruby do gem 'sqlite3' + gem 'pg' end platforms :jruby do gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' + gem 'activerecord-jdbcpostgresql-adapter' end platforms :rbx do gem 'rubysl', '~> 2.0' diff --git a/kaminari-core/test/fake_app/config/database.yml b/kaminari-core/test/fake_app/config/database.yml index b8535bb..85d08a5 100644 --- a/kaminari-core/test/fake_app/config/database.yml +++ b/kaminari-core/test/fake_app/config/database.yml @@ -4,5 +4,12 @@ sqlite3: &sqlite3 pool: 5 timeout: 5000 +postgresql: &postgresql + adapter: postgresql + host: localhost + username: postgres + password: + database: kaminari_test + test: <<: *<%= ENV['DB'] %>