activerecord-bogacs 0.6.0 → 0.7.0

data/test/test_helper.rb

@@ -24,6 +24,8 @@ require 'arjdbc' if defined? JRUBY_VERSION
 require 'logger'
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 
+puts "testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+
 #shared_pool = ENV['AR_POOL_SHARED'] ? # with AR_POOL_SHARED=true use default
 #  ( ENV['AR_POOL_SHARED'] == 'true' ? shared_pool : ENV['AR_POOL_SHARED'] ) :
 #    shared_pool
@@ -112,13 +114,8 @@ end
 module ActiveRecord
   module Bogacs
 
-    begin
-      require 'concurrent/atomic/atomic_reference'
-      Atomic = Concurrent::AtomicReference
-    rescue LoadError
-      require 'atomic'
-      Atomic = ::Atomic
-    end
+    require 'concurrent/atomic/atomic_reference'
+    Atomic = Concurrent::AtomicReference
 
     module TestHelper
 
@@ -161,7 +158,12 @@ module ActiveRecord
       module_function
 
       def current_connection_config
-        if ActiveRecord::Base.respond_to?(:connection_config)
+        connected = ActiveRecord::Base.connection_pool.connected?
+        if ActiveRecord::Base.connection.respond_to?(:config)
+          ActiveRecord::Base.connection.config.tap do # always an updated config, e.g. after mysql2_connection(config)
+            ActiveRecord::Base.connection_pool.disconnect! unless connected # restore pool state to avoid test surprises
+          end
+        elsif ActiveRecord::Base.respond_to?(:connection_config)
           ActiveRecord::Base.connection_config
         else
           ActiveRecord::Base.connection_pool.spec.config
@@ -226,8 +228,8 @@ module ActiveRecord
       @@setup_jdbc_context = nil
 
       def setup_jdbc_context!
-        load 'test/jars/tomcat-juli.jar'
-        load 'test/jars/tomcat-catalina.jar'
+        load_jar 'test/jars/tomcat-juli.jar'
+        load_jar 'test/jars/tomcat-catalina.jar'
 
         java.lang.System.set_property(
             javax.naming.Context::INITIAL_CONTEXT_FACTORY,
@@ -251,7 +253,7 @@ module ActiveRecord
       end
 
       def build_tomcat_jdbc_data_source(ar_jdbc_config = AR_CONFIG)
-        load 'test/jars/tomcat-jdbc.jar'
+        load_jar 'test/jars/tomcat-jdbc.jar'
 
         data_source = org.apache.tomcat.jdbc.pool.DataSource.new
         configure_dbcp_data_source(data_source, ar_jdbc_config)
@@ -262,7 +264,7 @@ module ActiveRecord
       end
 
       def build_tomcat_dbcp_data_source(ar_jdbc_config = AR_CONFIG)
-        load 'test/jars/tomcat-dbcp.jar'
+        load_jar 'test/jars/tomcat-dbcp.jar'
 
         data_source = org.apache.tomcat.dbcp.dbcp.BasicDataSource.new
         configure_dbcp_data_source(data_source, ar_jdbc_config)
@@ -273,7 +275,7 @@ module ActiveRecord
       end
 
       def build_commons_dbcp_data_source(ar_jdbc_config = AR_CONFIG)
-        load Dir.glob('test/jars/{commons-dbcp}*.jar').first
+        load_jar Dir.glob('test/jars/{commons-dbcp}*.jar').first
 
         data_source = org.apache.tomcat.dbcp.dbcp.BasicDataSource.new
         configure_dbcp_data_source(data_source, ar_jdbc_config)
@@ -299,11 +301,9 @@ module ActiveRecord
             properties.each { |name, value| db_properties.put(name, value.to_s) }
             data_source.setDbProperties db_properties
           else # Tomcat-DBCP / Commons DBCP2
-            # format of the string must be: [propertyName=property;]
-            connection_properties = properties.inject('') do
-              |str, name, val| str << "[#{name}=#{val};]"; str
+            properties.each do |name, val|
+              data_source.addConnectionProperty name, val.to_s
             end
-            data_source.setConnectionProperties connection_properties
           end
         end
         # JDBC pool tunings (some mapped from AR configuration) :
@@ -327,7 +327,7 @@ module ActiveRecord
       private :configure_dbcp_data_source
 
       def build_c3p0_data_source(ar_jdbc_config = AR_CONFIG)
-        Dir.glob('test/jars/{c3p0,mchange-commons}*.jar').each { |jar| load jar }
+        Dir.glob('test/jars/{c3p0,mchange-commons}*.jar').each { |jar| load_jar jar }
 
         data_source = com.mchange.v2.c3p0.ComboPooledDataSource.new
         configure_c3p0_data_source(data_source, ar_jdbc_config)
@@ -373,15 +373,15 @@ module ActiveRecord
 
 
       def build_hikari_data_source(ar_jdbc_config = AR_CONFIG)
-        unless hikari_jar = Dir.glob('test/jars/HikariCP*.jar').last
+        unless hikari_jar = Dir.glob('test/jars/HikariCP*.jar').sort.last
           raise 'HikariCP jar not found in test/jars directory'
         end
         if ( version = File.basename(hikari_jar, '.jar').match(/\-([\w\.\-]$)/) ) && version[1] < '2.3.9'
-          Dir.glob('test/jars/{javassist,slf4j}*.jar').each { |jar| require jar }
+          Dir.glob('test/jars/{javassist,slf4j}*.jar').each { |jar| load_jar jar }
         else
-          Dir.glob('test/jars/{slf4j}*.jar').each { |jar| require jar }
+          Dir.glob('test/jars/{slf4j}*.jar').each { |jar| load_jar jar }
         end
-        require hikari_jar
+        load_jar hikari_jar
 
         configure_hikari_data_source(ar_jdbc_config)
       end
@@ -396,7 +396,12 @@ module ActiveRecord
 
         case driver
         when /mysql/i
-          hikari_config.setDataSourceClassName 'com.mysql.jdbc.jdbc2.optional.MysqlDataSource'
+          data_source_class_name = if driver == 'com.mysql.cj.jdbc.Driver'
+            'com.mysql.cj.jdbc.MysqlDataSource' # driver 8.0
+          else
+            'com.mysql.jdbc.jdbc2.optional.MysqlDataSource' # old 5.x
+          end
+          hikari_config.setDataSourceClassName data_source_class_name
           hikari_config.addDataSourceProperty 'serverName', ar_jdbc_config[:host] || 'localhost'
           hikari_config.addDataSourceProperty 'databaseName', ar_jdbc_config[:database]
           hikari_config.addDataSourceProperty 'port', ar_jdbc_config[:port] if ar_jdbc_config[:port]
@@ -407,7 +412,7 @@ module ActiveRecord
             hikari_config.addDataSourceProperty 'password', ar_jdbc_config[:password]
           end
           ( ar_jdbc_config[:properties] || {} ).each do |name, val|
-            hikari_config.addDataSourceProperty name.to_s, val.to_s
+            hikari_config.addDataSourceProperty name.to_s, val.to_s unless name.eql?('useLegacyDatetimeCode')
           end
         when /postgres/i
           hikari_config.setDataSourceClassName 'org.postgresql.ds.PGSimpleDataSource'
@@ -478,6 +483,16 @@ module ActiveRecord
 
       def jndi_name; 'jdbc/TestDB' end
 
+      private
+
+      def load_jar(jar)
+        abs_jar = File.expand_path(jar)
+        unless File.file?(abs_jar)
+          raise "path does not exist or is not a file: #{jar}"
+        end
+        load abs_jar
+      end
+
     end
   end
-end
+end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bogacs
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Karol Bucek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  name: concurrent-ruby
+        version: '6'
+  name: activerecord
   prerelease: false
-  type: :development
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '6'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '1.0'
+  name: concurrent-ruby
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: rake
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -59,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -112,14 +127,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: 'Bogacs contains several pool implementations that can be used as a replacement
-  for ActiveRecord''s built-in pool, e.g. DefaultPool is an upstream tuned version
-  with an API that is compatible with older AR versions.  NOTE: you''ll need concurrent-ruby
-  or thread_safe gem.'
+summary: Bogacs contains several pool implementations that can be used as a replacement
+  for ActiveRecord's built-in pool, e.g. DefaultPool is an upstream tuned version
+  with an API that is compatible with older AR versions.
 test_files:
 - test/active_record/bogacs/default_pool_test.rb
 - test/active_record/bogacs/false_pool_test.rb