activerecord-bogacs 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a11630875cf14ee4c1ea37721a04a1966eeb488874d23c833075e42c2e435852
-  data.tar.gz: 77016cc2628013c4a1791403fcbf65ad488f8db4f6a091a9659e1e0b523c7e38
+  metadata.gz: 5010de8016e3c5896dc032a0fa6afc6ab5cbb1808f60e7c6f42b22b280910aeb
+  data.tar.gz: 3290de6d8265973c7efa237e18de7f96253580363b743785b069f34c5c92504a
 SHA512:
-  metadata.gz: 89a482ca85813ef8b769355a0a42ffe0317024022c0da7ad337084029ad455976865199806b6f79fbd0b79c1288ec7f6a1654ec9aea66ec07b544b28329f5dcc
-  data.tar.gz: 624c0fe63b5ff31ef51abeb2dd537fe3ef2bddad81f03cd94df38fb7aafea3b93635a844554bb7597ec08fc551215c016e1c1ebcb3817230220455919db1ade3
+  metadata.gz: 559b6831696d5e7ca408c735bc1f61bcb5c3fcfad19b0806aff943a47c623ac322462e79c3cefc1aca745df5cdda19986651c405e2024eebb8fa3c4cf02d7296
+  data.tar.gz: 588ccb8e705390652de5162a26cee060ce8fe51887693069602a55cfecfb19175b23268a821a7c956d7494d6be542f486c6bda89a4814932e8ee4249965a97de

data/.github/workflows/test.yml

@@ -0,0 +1,82 @@
+name: Test
+
+on: [push, pull_request]
+
+env:
+  JAVA_OPTS: '-XX:+TieredCompilation -XX:TieredStopAtLevel=1'
+
+jobs:
+
+  rake-test:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+            MYSQL_ALLOW_EMPTY_PASSWORD: yes
+            MYSQL_ROOT_PASSWORD: root
+            MYSQL_DATABASE: ar_bogacs
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    env:
+      AR_ADAPTER: mysql2
+      AR_USERNAME: root
+      AR_PASSWORD: root
+      AR_HOST: 127.0.0.1
+      AR_VERSION: "~> 4.2"
+      HIKARI_VERSION: 2.3.12
+
+    strategy:
+      matrix:
+        java-version: [ 11 ]
+        ruby-version: [ jruby-9.3.6.0 ]
+        include:
+          - java-version: 11
+            ruby-version: jruby-9.2.20.1
+          - java-version: 11
+            ruby-version: jruby-9.2.10.0
+          - java-version: 17
+            ruby-version: jruby-9.2.20.1
+          - java-version: 8
+            ruby-version: jruby-9.2.9.0
+          - java-version: 8
+            ruby-version: jruby-9.1.17.0
+            env:
+              AR_VERSION: "~> 4.1.14"
+
+      fail-fast: false
+
+    steps:
+      - name: check mysql from host
+        run: |
+          sudo apt install -y mysql-client
+          mysql --host 127.0.0.1 --port 3306 -uroot -proot -e "SHOW DATABASES"
+
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: set up java ${{ matrix.java-version }}
+        uses: actions/setup-java@v1.4.3
+        with:
+          java-version: ${{ matrix.java-version }}
+
+      - name: set up ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+
+      - name: install bundler
+        run: jruby -S gem install bundler -v "~>2.2.28"
+
+      - name: bundle install
+        run: jruby -S bundle install
+
+      - name: download jars
+        run: jruby -rbundler/setup -S rake tomcat:jndi:download tomcat:jdbc:download tomcat:dbcp:download hikari:download
+        shell: bash
+
+      - name: rake test
+        run: jruby -rbundler/setup -S rake test
+        shell: bash

data/Gemfile

@@ -16,14 +16,6 @@ else
   gem 'activerecord', :require => nil
 end
 
-if RUBY_VERSION.index('1.8') == 0
-  gem 'i18n', '< 0.7.0' # Gem::InstallError: i18n requires Ruby version >= 1.9.3
-  gem 'atomic', '1.1.16' # concurrent-ruby gem only for Ruby version >= 1.9.3
-  gem 'thread_safe', '~> 0.3'
-else
-  gem 'concurrent-ruby', '~> 1.0.0', :require => nil
-end
-
 platform :jruby do
   if version = ENV['AR_JDBC_VERSION']
     if version.index('/') && ::File.exist?(version)
@@ -40,16 +32,11 @@ platform :jruby do
   end
 end
 
-#gem 'thread_safe', :require => nil # "optional" - we can roll without it
-
-if defined?(JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
-gem 'jruby-openssl', :platform => :jruby
-end
-
 group :test do
   gem 'jdbc-mysql', :require => nil, :platform => :jruby
   gem 'jdbc-postgres', :require => nil, :platform => :jruby
+  gem 'jdbc-sqlite3', :require => nil, :platform => :jruby
 
   gem 'mysql2', :require => nil, :platform => :mri
   gem 'pg', :require => nil, :platform => :mri
-end
+end

data/Rakefile

@@ -105,9 +105,11 @@ def _download(uri, download_dir, as_file_name)
   FileUtils.rm_r temp_dir
 end
 
+MAVEN_BASE_URL = 'https://repo.maven.apache.org/maven2'
+
 namespace :tomcat do
 
-  tomcat_maven_repo = 'http://repo2.maven.org/maven2/org/apache/tomcat'
+  tomcat_maven_repo = "#{MAVEN_BASE_URL}/org/apache/tomcat"
   download_dir = File.expand_path('test/jars', File.dirname(__FILE__))
   version_default = '7.0.64'
 
@@ -191,7 +193,7 @@ end
 
 namespace :dbcp do # a.k.a DBCP2
 
-  commons_repo = 'http://repo2.maven.org/maven2/org/apache/commons'
+  commons_repo = "#{MAVEN_BASE_URL}/org/apache/commons"
   download_dir = File.expand_path('test/jars', File.dirname(__FILE__))
   version_default = '2.0.1'
 
@@ -213,7 +215,7 @@ end
 
 namespace :c3p0 do
 
-  mchange_base_repo = 'http://repo2.maven.org/maven2/com/mchange'
+  mchange_base_repo = "#{MAVEN_BASE_URL}/com/mchange"
   download_dir = File.expand_path('test/jars', File.dirname(__FILE__))
   c3p0_version = '0.9.5'
   mchange_commons_version = '0.2.9'
@@ -242,9 +244,9 @@ end
 
 namespace :hikari do
 
-  hikari_base_repo = 'http://repo2.maven.org/maven2/com/zaxxer'
-  slf4j_base_repo = 'http://repo2.maven.org/maven2/org/slf4j'
-  javassist_base_repo = 'http://repo2.maven.org/maven2/org/javassist'
+  hikari_base_repo = "#{MAVEN_BASE_URL}/com/zaxxer"
+  slf4j_base_repo = "#{MAVEN_BASE_URL}/org/slf4j"
+  javassist_base_repo = "#{MAVEN_BASE_URL}/org/javassist"
   download_dir = File.expand_path('test/jars', File.dirname(__FILE__))
   hikari_version = '1.4.0'
   slf4j_version = '1.7.10'

data/activerecord-bogacs.gemspec

@@ -9,10 +9,9 @@ Gem::Specification.new do |gem|
   gem.authors = ['Karol Bucek']
   gem.email = ['self@kares.org']
   gem.description = %q{Improved ActiveRecord::ConnectionAdapters::ConnectionPool alternatives}
-  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.' <<
-  "\n\nNOTE: you'll need concurrent-ruby or thread_safe gem."
+  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.'
   gem.homepage = "http://github.com/kares/activerecord-bogacs"
   gem.licenses = ['MIT']
 
@@ -21,8 +20,9 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^test/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'concurrent-ruby', '>= 0.9' if RUBY_VERSION.index('1.8') != 0
+  gem.add_dependency 'activerecord', '< 6' # '>= 4.0' # depends on: concurrent-ruby ~> 1.0, >= 1.0.2
+  gem.add_dependency 'concurrent-ruby', '~> 1.0'
 
-  gem.add_development_dependency 'rake', '~> 10.3'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'test-unit', '~> 2.5'
 end

data/lib/active_record/bogacs/connection_handler.rb

@@ -23,7 +23,7 @@ module ActiveRecord
           pool = super
           spec = pool.spec
           if spec.config[:pool].eql? false
-            owner_to_pool[owner.name] = ActiveRecord::Bogacs::FalsePool.new(spec)
+            owner_to_pool[spec.name] = ActiveRecord::Bogacs::FalsePool.new(spec)
           else
             pool
           end