From cc0185abb31bae72a91dbe2f9f5219237664e963 Mon Sep 17 00:00:00 2001 From: Evan Petrie Date: Tue, 24 Jul 2012 17:02:12 -0700 Subject: [PATCH 1/8] make work with seamless database pool --- .../active_record/adapters/seamless_database_pool.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 lib/activerecord-import/active_record/adapters/seamless_database_pool.rb diff --git a/lib/activerecord-import/active_record/adapters/seamless_database_pool.rb b/lib/activerecord-import/active_record/adapters/seamless_database_pool.rb new file mode 100644 index 0000000..39391cb --- /dev/null +++ b/lib/activerecord-import/active_record/adapters/seamless_database_pool.rb @@ -0,0 +1,6 @@ +require "active_record/connection_adapters/seamless_database_pool_adapter" +require "activerecord-import/adapters/mysql_adapter" + +class ActiveRecord::ConnectionAdapters::SeamlessDatabasePoolAdapter + include ActiveRecord::Import::MysqlAdapter +end From 9ee02d87ff48d57547a04e2089f1dd367d2c270a Mon Sep 17 00:00:00 2001 From: Evan Petrie Date: Tue, 24 Jul 2012 17:33:58 -0700 Subject: [PATCH 2/8] fix file name --- ...eamless_database_pool.rb => seamless_database_pool_adapter.rb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lib/activerecord-import/active_record/adapters/{seamless_database_pool.rb => seamless_database_pool_adapter.rb} (100%) diff --git a/lib/activerecord-import/active_record/adapters/seamless_database_pool.rb b/lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb similarity index 100% rename from lib/activerecord-import/active_record/adapters/seamless_database_pool.rb rename to lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb From de048bb61e4f4dc2e876562c177520a572081757 Mon Sep 17 00:00:00 2001 From: Yury Velikanau Date: Wed, 22 Aug 2012 18:57:15 -0700 Subject: [PATCH 3/8] Remove whitespace. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 77900d1..780b393 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ group :test do # Support libs gem "factory_girl", "~> 1.3.3" gem "delorean", "~> 0.2.0" - + # Debugging platforms :mri_18 do gem "ruby-debug", "= 0.10.4" From 7628e0a9d8faf181a1b92590cfa02450ace44c7d Mon Sep 17 00:00:00 2001 From: Yury Velikanau Date: Wed, 22 Aug 2012 18:57:41 -0700 Subject: [PATCH 4/8] debugger gem supports ruby 1.9.3 just fine --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 780b393..ba8bc55 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,6 @@ group :test do end platforms :mri_19 do - # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3 - gem "ruby-debug19" if RUBY_VERSION < "1.9.3" + gem "debugger" end end From 151c2f271f982d94f56f9c2aa5631de831ec499c Mon Sep 17 00:00:00 2001 From: Yury Velikanau Date: Wed, 22 Aug 2012 19:49:27 -0700 Subject: [PATCH 5/8] Gemfile.lock changes for debugger gem --- Gemfile.lock | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index c1139c6..84d14f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,6 +21,13 @@ GEM builder (3.0.0) chronic (0.7.0) columnize (0.3.6) + debugger (1.2.0) + columnize (>= 0.3.1) + debugger-linecache (~> 1.1.1) + debugger-ruby_core_source (~> 1.1.3) + debugger-linecache (1.1.2) + debugger-ruby_core_source (>= 1.1.1) + debugger-ruby_core_source (1.1.3) delorean (0.2.1) chronic factory_girl (1.3.3) @@ -74,6 +81,7 @@ PLATFORMS DEPENDENCIES activerecord (~> 3.0) activerecord-jdbcmysql-adapter + debugger delorean (~> 0.2.0) factory_girl (~> 1.3.3) jdbc-mysql From 23a07371dd905012904d251ca2664c5dcb84f5b3 Mon Sep 17 00:00:00 2001 From: Yury Velikanau Date: Wed, 22 Aug 2012 19:49:48 -0700 Subject: [PATCH 6/8] Add seamless_database_pool gem --- Gemfile | 1 + Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index ba8bc55..cc46482 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ group :test do gem "mysql2", "~> 0.3.0" gem "pg", "~> 0.9" gem "sqlite3-ruby", "~> 1.3.1" + gem "seamless_database_pool", "~> 1.0.11" end platforms :jruby do diff --git a/Gemfile.lock b/Gemfile.lock index 84d14f4..1c44b0f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,6 +69,8 @@ GEM ruby-debug-base19 (>= 0.11.19) ruby_core_source (0.1.5) archive-tar-minitar (>= 0.5.2) + seamless_database_pool (1.0.11) + activerecord (>= 2.2.2) sqlite3 (1.3.6) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) @@ -93,4 +95,5 @@ DEPENDENCIES ruby-debug (= 0.10.4) ruby-debug-base (= 0.10.4) ruby-debug19 + seamless_database_pool (~> 1.0.11) sqlite3-ruby (~> 1.3.1) From 1d9b30cf83efee2424d1acddd9d002f5156aebe5 Mon Sep 17 00:00:00 2001 From: Yury Velikanau Date: Wed, 22 Aug 2012 19:50:37 -0700 Subject: [PATCH 7/8] Put together tests for seamless_database_pool adapter --- Rakefile | 2 +- .../adapters/seamless_database_pool_adapter.rb | 1 + test/adapters/mysql2.rb | 2 +- test/adapters/seamless_database_pool.rb | 1 + test/database.yml.sample | 7 +++++++ 5 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 test/adapters/seamless_database_pool.rb diff --git a/Rakefile b/Rakefile index 38f7d17..ff42901 100644 --- a/Rakefile +++ b/Rakefile @@ -36,7 +36,7 @@ namespace :display do end task :default => ["display:notice"] -ADAPTERS = %w(mysql mysql2 jdbcmysql postgresql sqlite3) +ADAPTERS = %w(mysql mysql2 jdbcmysql postgresql sqlite3 seamless_database_pool) ADAPTERS.each do |adapter| namespace :test do desc "Runs #{adapter} database tests." diff --git a/lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb b/lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb index 39391cb..388c618 100644 --- a/lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb +++ b/lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb @@ -1,3 +1,4 @@ +require "seamless_database_pool" require "active_record/connection_adapters/seamless_database_pool_adapter" require "activerecord-import/adapters/mysql_adapter" diff --git a/test/adapters/mysql2.rb b/test/adapters/mysql2.rb index 0ddab79..e67530f 100644 --- a/test/adapters/mysql2.rb +++ b/test/adapters/mysql2.rb @@ -1 +1 @@ -ENV["ARE_DB"] = "mysql2" \ No newline at end of file +ENV["ARE_DB"] = "mysql2" diff --git a/test/adapters/seamless_database_pool.rb b/test/adapters/seamless_database_pool.rb new file mode 100644 index 0000000..1f4a8b3 --- /dev/null +++ b/test/adapters/seamless_database_pool.rb @@ -0,0 +1 @@ +ENV["ARE_DB"] = "seamless_database_pool" diff --git a/test/database.yml.sample b/test/database.yml.sample index 6e0c4ee..6a9a364 100644 --- a/test/database.yml.sample +++ b/test/database.yml.sample @@ -13,6 +13,13 @@ mysql2: <<: *common adapter: mysql2 +seamless_database_pool: + <<: *common + adapter: seamless_database_pool + pool_adapter: mysql2 + master: + host: localhost + postgresql: <<: *common username: postgres From 190fcd32ff0c4ccadf983594d5649b8e607281ae Mon Sep 17 00:00:00 2001 From: Yury Velikanau Date: Wed, 22 Aug 2012 19:51:47 -0700 Subject: [PATCH 8/8] Remove remain of ruby-debug-19 from Gemfile.lock --- Gemfile.lock | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1c44b0f..b3cf6b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,7 +16,6 @@ GEM activesupport (3.2.7) i18n (~> 0.6) multi_json (~> 1.0) - archive-tar-minitar (0.5.2) arel (3.0.2) builder (3.0.0) chronic (0.7.0) @@ -43,8 +42,6 @@ GEM json (1.7.4-java) linecache (0.46) rbx-require-relative (> 0.0.4) - linecache19 (0.5.12) - ruby_core_source (>= 0.1.4) multi_json (1.3.6) mysql (2.8.1) mysql2 (0.3.11) @@ -59,16 +56,6 @@ GEM ruby-debug-base (0.10.4) linecache (>= 0.3) ruby-debug-base (0.10.4-java) - ruby-debug-base19 (0.11.25) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby_core_source (>= 0.1.4) - ruby-debug19 (0.11.6) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby-debug-base19 (>= 0.11.19) - ruby_core_source (0.1.5) - archive-tar-minitar (>= 0.5.2) seamless_database_pool (1.0.11) activerecord (>= 2.2.2) sqlite3 (1.3.6) @@ -94,6 +81,5 @@ DEPENDENCIES rake ruby-debug (= 0.10.4) ruby-debug-base (= 0.10.4) - ruby-debug19 seamless_database_pool (~> 1.0.11) sqlite3-ruby (~> 1.3.1)