Oof. Yet more CPK conflicts...

swiftype · Oct 10, 2014 · cca151b · cca151b
1 parent 246ce4c
commit cca151b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/objectid_columns.gemspec b/objectid_columns.gemspec
@@ -55,15 +55,17 @@ Gem::Specification.new do |spec|
   # * Under Ruby 1.9+ with Postgres, it causes binary strings sent to or from the database to get truncated
   #   at the first null byte (!), which completely breaks binary-column support;
   # * Under JRuby with ActiveRecord 3.0, it's completely broken;
-  # * Under JRuby with ActiveRecord 3.1 and PostgreSQL, it's also broken.
+  # * Under JRuby with ActiveRecord 3.1 and PostgreSQL, it's also broken;
+  # * Under JRuby with ActiveRecord 4.1 and SQLite, it's also broken.
   #
   # In these cases, we simply don't load or test against composite_primary_keys; our code is good, but the interactions
   # between CPK and the rest of the system make it impossible to run those tests. There is corresponding code in our
   # +basic_system_spec+ to exclude those combinations.
   cpk_allowed = true
   cpk_allowed = false if database_gem_name =~ /(pg|postgres)/i && RUBY_VERSION =~ /^(1\.9)|(2\.)/ && ar_version && ar_version =~ /^4\.(0|1)\./
   cpk_allowed = false if defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'jruby') && ar_version && ar_version =~ /^3\.0\./
-  cpk_allowed = false if defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'jruby') && ar_version && ar_version =~ /^3\.1\./ && database_gem_name =~ /(pg|postgres)/i
+  cpk_allowed = false if defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'jruby') && ar_version && ar_version =~ /^3\.1\./ && database_gem_name =~ /(pg|postgres)/
+  cpk_allowed = false if defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'jruby') && ar_version && ar_version =~ /^4\.1\./ && database_gem_name =~ /(sqlite)/
 
   if cpk_allowed
     spec.add_development_dependency "composite_primary_keys"