Add Support for Mysql2 Proxy

zdennis · Jan 18, 2025 · 64110a6 · 64110a6
1 parent 99cdf23
commit 64110a6
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 0 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -125,6 +125,7 @@ jobs:
           bundle exec rake test:mysql2
           bundle exec rake test:mysql2_makara
           bundle exec rake test:mysql2spatial
+          bundle exec rake test:mysql2_proxy
       - name: Run tests with postgresql
         run: |
           bundle exec rake test:postgis

diff --git a/Rakefile b/Rakefile
@@ -19,6 +19,7 @@ ADAPTERS = %w(
   mysql2
   mysql2_makara
   mysql2spatial
+  mysql2_proxy
   jdbcmysql
   jdbcsqlite3
   jdbcpostgresql

diff --git a/lib/activerecord-import/base.rb b/lib/activerecord-import/base.rb
@@ -11,6 +11,7 @@ def self.base_adapter(adapter)
     case adapter
     when 'mysql2_makara' then 'mysql2'
     when 'mysql2spatial' then 'mysql2'
+    when 'mysql2_proxy' then 'mysql2'
     when 'spatialite' then 'sqlite3'
     when 'postgresql_makara' then 'postgresql'
     when 'postgresql_proxy' then 'postgresql'

diff --git a/test/adapters/mysql2_proxy.rb b/test/adapters/mysql2_proxy.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+ENV["ARE_DB"] = "mysql2"
diff --git a/test/database.yml.sample b/test/database.yml.sample
@@ -16,6 +16,9 @@ mysql2spatial:
 mysql2_makara:
   <<: *mysql2
 
+mysql2_proxy:
+  <<: *mysql2
+
 postgresql: &postgresql
   <<: *common
   username: postgres

diff --git a/test/github/database.yml b/test/github/database.yml
@@ -30,6 +30,9 @@ mysql2spatial:
 mysql2_makara:
   <<: *mysql2
 
+mysql2_proxy:
+  <<: *mysql2
+
 oracle:
   <<: *common
   adapter: oracle

diff --git a/test/mysql2_proxy/import_test.rb b/test/mysql2_proxy/import_test.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/../support/mysql/import_examples")
+
+should_support_mysql_import_functionality
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# frozen_string_literal: true

		ENV["ARE_DB"] = "mysql2"