Merge pull request #887 from mateuscruz/add-trilogy-and-sqlite-proxy-adapters

Add support for trilogy and sqlite proxy adapters

Author: jkowens

.github/workflows/test.yaml

@@ -161,10 +161,12 @@ jobs:
         run: |
           bundle exec rake test:spatialite
           bundle exec rake test:sqlite3
+          bundle exec rake test:sqlite3_proxy
       - name: Run trilogy tests
         if: ${{ matrix.env.AR_VERSION >= '7.0' && !startsWith(matrix.ruby, 'jruby') }}
         run: |
           bundle exec rake test:trilogy
+          bundle exec rake test:trilogy_proxy
           bundle exec rake test:janus_trilogy
 
   lint:

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Unreleased
+
+* Add Support for trilogy_proxy from [active_record_proxy_adapters](https://rubygems.org/gems/active_record_proxy_adapters) by @mateuscruz
+* Add Support for sqlite3_proxy from [active_record_proxy_adapters](https://rubygems.org/gems/active_record_proxy_adapters) by @mateuscruz
+
 ## Changes in 2.2.0
 
 ### New Features

Rakefile

@@ -30,9 +30,11 @@ ADAPTERS = %w(
   postgis
   makara_postgis
   sqlite3
+  sqlite3_proxy
   spatialite
   seamless_database_pool
   trilogy
+  trilogy_proxy
   janus_trilogy
 ).freeze
 ADAPTERS.each do |adapter|

lib/activerecord-import/active_record/adapters/sqlite3_proxy_adapter.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "active_record/connection_adapters/sqlite3_proxy_adapter"
+require "activerecord-import/adapters/sqlite3_proxy_adapter"
+
+ActiveSupport.on_load(:active_record_sqlite3proxyadapter) do |klass|
+  klass.include(ActiveRecord::Import::SQLite3ProxyAdapter)
+end

lib/activerecord-import/active_record/adapters/trilogy_proxy_adapter.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "active_record/connection_adapters/trilogy_proxy_adapter"
+require "activerecord-import/adapters/trilogy_proxy_adapter"
+
+ActiveSupport.on_load(:active_record_trilogyproxyadapter) do |klass|
+  klass.include(ActiveRecord::Import::TrilogyProxyAdapter)
+end

lib/activerecord-import/adapters/sqlite3_proxy_adapter.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "activerecord-import/adapters/sqlite3_adapter"
+require "activerecord-import/adapters/active_record_proxy_adapter"
+
+module ActiveRecord::Import::SQLite3ProxyAdapter
+  include ActiveRecord::Import::SQLite3Adapter
+  include ActiveRecord::Import::ActiveRecordProxyAdapter
+end

lib/activerecord-import/adapters/trilogy_proxy_adapter.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "activerecord-import/adapters/trilogy_adapter"
+require "activerecord-import/adapters/active_record_proxy_adapter"
+
+module ActiveRecord::Import::TrilogyProxyAdapter
+  include ActiveRecord::Import::TrilogyAdapter
+  include ActiveRecord::Import::ActiveRecordProxyAdapter
+end

lib/activerecord-import/base.rb

@@ -11,11 +11,9 @@ def self.base_adapter(adapter)
     case adapter
     when 'mysql2_makara' then 'mysql2'
     when 'mysql2spatial' then 'mysql2'
-    when 'mysql2_proxy' then 'mysql2_proxy'
     when 'janus_mysql2' then 'mysql2'
     when 'spatialite' then 'sqlite3'
     when 'postgresql_makara' then 'postgresql'
-    when 'postgresql_proxy' then'postgresql_proxy'
     when 'makara_postgis' then 'postgresql'
     when 'postgis' then 'postgresql'
     when 'cockroachdb' then 'postgresql'

test/adapters/sqlite3_proxy.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+ENV["ARE_DB"] = "sqlite3"

test/adapters/trilogy_proxy.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+ENV["ARE_DB"] = "trilogy"
+
+if ENV['AR_VERSION'].to_f <= 7.0
+  require "activerecord-trilogy-adapter"
+  require "trilogy_adapter/connection"
+  ActiveRecord::Base.extend TrilogyAdapter::Connection
+end