From b8f0b8f82381736b5dfe0cefb20d7b0d1b7c8c3d Mon Sep 17 00:00:00 2001 From: Huned Botee Date: Thu, 6 Mar 2014 10:38:05 -0800 Subject: [PATCH] Add jdbcpostgresql support. --- Gemfile | 2 ++ Rakefile | 2 +- .../active_record/adapters/jdbcpostgresql_adapter.rb | 6 ++++++ test/adapters/jdbcpostgresql.rb | 1 + test/jdbcpostgresql/import_test.rb | 6 ++++++ 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 lib/activerecord-import/active_record/adapters/jdbcpostgresql_adapter.rb create mode 100644 test/adapters/jdbcpostgresql.rb create mode 100644 test/jdbcpostgresql/import_test.rb diff --git a/Gemfile b/Gemfile index a917b6fe..cd29b3cb 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,9 @@ end platforms :jruby do gem "jdbc-mysql" + gem "jdbc-postgres" gem "activerecord-jdbcmysql-adapter" + gem "activerecord-jdbcpostgresql-adapter" end # Support libs diff --git a/Rakefile b/Rakefile index 84d105ba..38309020 100644 --- a/Rakefile +++ b/Rakefile @@ -13,7 +13,7 @@ namespace :display do end task :default => ["display:notice"] -ADAPTERS = %w(mysql mysql2 em_mysql2 jdbcmysql postgresql sqlite3 seamless_database_pool mysqlspatial mysql2spatial spatialite postgis) +ADAPTERS = %w(mysql mysql2 em_mysql2 jdbcmysql jdbcpostgresql postgresql sqlite3 seamless_database_pool mysqlspatial mysql2spatial spatialite postgis) ADAPTERS.each do |adapter| namespace :test do desc "Runs #{adapter} database tests." diff --git a/lib/activerecord-import/active_record/adapters/jdbcpostgresql_adapter.rb b/lib/activerecord-import/active_record/adapters/jdbcpostgresql_adapter.rb new file mode 100644 index 00000000..65287b52 --- /dev/null +++ b/lib/activerecord-import/active_record/adapters/jdbcpostgresql_adapter.rb @@ -0,0 +1,6 @@ +require "active_record/connection_adapters/postgresql_adapter" +require "activerecord-import/adapters/postgresql_adapter" + +class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter + include ActiveRecord::Import::PostgreSQLAdapter +end diff --git a/test/adapters/jdbcpostgresql.rb b/test/adapters/jdbcpostgresql.rb new file mode 100644 index 00000000..b62be368 --- /dev/null +++ b/test/adapters/jdbcpostgresql.rb @@ -0,0 +1 @@ +ENV["ARE_DB"] = "jdbcpostgresql" diff --git a/test/jdbcpostgresql/import_test.rb b/test/jdbcpostgresql/import_test.rb new file mode 100644 index 00000000..8b1ffd9a --- /dev/null +++ b/test/jdbcpostgresql/import_test.rb @@ -0,0 +1,6 @@ +require File.expand_path(File.dirname(__FILE__) + '/../test_helper') + +#require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/assertions') +require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/import_examples') + +should_support_postgresql_import_functionality