update gemfiles for JRuby, and version check for method

1Centre · Jun 15, 2016 · 6bd8c3d · 6bd8c3d
1 parent 30b0441
commit 6bd8c3d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/gemfiles/Gemfile.rails-3-1 b/gemfiles/Gemfile.rails-3-1
@@ -3,4 +3,6 @@ source "http://rubygems.org"
 gemspec path: '../'
 
 gem 'activerecord', '~> 3.1.0'
-gem 'mysql2', '~> 0.3.18'
+unless RUBY_ENGINE == 'jruby'
+  gem 'mysql2', '~> 0.3.18'
+end
diff --git a/gemfiles/Gemfile.rails-3-2 b/gemfiles/Gemfile.rails-3-2
@@ -3,4 +3,6 @@ source "http://rubygems.org"
 gemspec path: '../'
 
 gem 'activerecord', '~> 3.2.0'
-gem 'mysql2', '~> 0.3.18'
+unless RUBY_ENGINE == 'jruby'
+  gem 'mysql2', '~> 0.3.18'
+end
diff --git a/gemfiles/Gemfile.rails-4-0 b/gemfiles/Gemfile.rails-4-0
@@ -3,4 +3,6 @@ source "http://rubygems.org"
 gemspec path: '../'
 
 gem 'activerecord', '~> 4.0.0'
-gem 'mysql2', '~> 0.3.18'
+unless RUBY_ENGINE == 'jruby'
+  gem 'mysql2', '~> 0.3.18'
+end
diff --git a/gemfiles/Gemfile.rails-4-1 b/gemfiles/Gemfile.rails-4-1
@@ -3,4 +3,6 @@ source "http://rubygems.org"
 gemspec path: '../'
 
 gem 'activerecord', '~> 4.1.0'
-gem 'mysql2', '~> 0.3.18'
+unless RUBY_ENGINE == 'jruby'
+  gem 'mysql2', '~> 0.3.18'
+end
diff --git a/spec/lib/activerecord_spec.rb b/spec/lib/activerecord_spec.rb
@@ -6,15 +6,15 @@
     let(:table_name) { :test_uuid_field_creation }
 
     before do
-      connection.drop_table(table_name) if connection.data_source_exists?(table_name)
+      connection.drop_table(table_name) if (ActiveRecord::VERSION::MAJOR.eql?(5) ? connection.data_source_exists?(table_name) : connection.table_exists?(table_name) )
       connection.create_table(table_name)
     end
 
     after do
       connection.drop_table table_name
     end
 
-    specify { connection.data_source_exists?(table_name).should be_truthy }
+    specify { (ActiveRecord::VERSION::MAJOR.eql?(5) ? connection.data_source_exists?(table_name) : connection.table_exists?(table_name) ).should be_truthy }
 
     context '#add_column' do
       let(:column_name) { :uuid_column }