adapter_extensions 0.9.5 → 1.0.0.rc1

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+gemfile:
+  - test/config/gemfiles/Gemfile.rails-3.2.x
+  - test/config/gemfiles/Gemfile.rails-3.1.x
+  - test/config/gemfiles/Gemfile.rails-3.0.x
+rvm:
+  - 1.9.3
+  - 1.8.7
+env:
+  - DB=mysql2
+  - DB=mysql
+  - DB=postgresql
+before_script:
+  - rake ci:create_db

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.0.0.rc1 - March 3, 2012
+* complete rewrite: Rails 3+ required
+* "mysql2" adapter support
+* work in progress SQLServer bulk import, requiring freebcp
+
 0.9.5 - November 8, 2011
 * Add in REPLACE to LOAD DATA INFILE command (jayzes/kookster)
 * Remove FasterCSV from dependencies (not used apparently)

data/HOW_TO_RELEASE

@@ -1,12 +1,12 @@
 * update lib/adapter_extensions/version
 * push your changes
-* then use bundler to build + git tag + push to rubygems
+* build the gem:
 
-    rake release
+    gem build adapter_extensions.gemspec
 
-* if you remain stuck at "Pushed git commits and tags", the task may silently wait for your password. Check this if it's the case:
+* create tag and push to rubygem:
 
-    https://github.com/carlhuda/bundler/issues/980
+    rake release
 
 * you can list changes using github:
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Anthony Eden
+Copyright (c) 2011-2012 Anthony Eden, Thibaut Barrère
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
 associated documentation files (the "Software"), to deal in the Software without restriction, including 

data/README.md

@@ -1,23 +1,130 @@
-This library provides extensions to Rails' ActiveRecord adapters.
+AdapterExtensions add extra abilities to Rails ActiveRecord adapters, including:
 
-As of version 0.9.5, adapter_extensions has dependencies on ActiveSupport and ActiveRecord 2.1.x or higher.
+* bulk load
+* truncate table
+* copy table
+* add select into table
+ 
+### Compatibility matrix
 
-### How to test
+See Travis for up-to-date info: [![Build Status](https://secure.travis-ci.org/activewarehouse/adapter_extensions.png?branch=master)](http://travis-ci.org/activewarehouse/adapter_extensions)
 
-Currently tested on MySQL and Postgres.
+<table>
+  <tr>
+    <th></th>
+    <th>v1.0.0.rc1</th>
+    <th>v0.9.5</th>
+  </tr>
+  <tr>
+    <th>ActiveRecord adapters</th>
+    <td></td>
+    <td></td>
+  <tr>
+    <td>mysql</td>
+    <td>OK</td>
+    <td>OK</td>
+  </tr>
+  <tr>
+    <td>mysql2</td>
+    <td>OK</td>
+    <td>Unsupported</td>
+  </tr>
+  <tr>
+    <td>postgresql</td>
+    <td>OK</td>
+    <td>OK</td>
+  </tr>
+  <tr>
+    <td>sqlserver</td>
+    <td>Work in progress</td>
+    <td>Broken</td>
+  </tr>
+  <tr>
+    <th>ActiveRecord/ActiveSupport versions</th>
+    <td>&gt;= 3</td>
+    <td>&lt; 3</td>
+  </tr>
+  <tr>
+    <th>Ruby versions</th>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>MRI 1.9.3</td>
+    <td>OK</td>
+    <td>Untested</td>
+  </tr>
+  <tr>
+    <td>MRI 1.8.7</td>
+    <td>OK</td>
+    <td>Should be OK</td>
+  </tr>   
+</table>
 
-#### Testing on MySQL
+### Important notes on MySQL support
 
-see `test/connection/mysql/connection.rb` and tweek if needed, then:
+#### Security warning
 
-    mysql -u root -p -e "create database adapter_extensions_unittest"
-    rake test
-    
-One test should fail with 'known issue with MySQL' (see commit 75da4b08).
+Be sure to first read and understand the [security implications](http://dev.mysql.com/doc/refman/5.0/en/load-data-local.html) of `LOAD DATA LOCAL INFILE`. In particular, having this enabled on a web app is probably not a good idea.
 
-#### Testing on Postgresql
+#### v0.9.5
 
-see `test/connection/postgresql/connection.rb` and tweek if needed, then:
+v0.9.5 will always use `LOAD DATA LOCAL INFILE` for bulk load - this is not configurable.
 
-    createdb adapter_extensions_unittest
-    rake test DB=postgresql
+#### v1.0.0.rc1
+
+This version should by default use `LOAD DATA INFILE` for safer defaults.
+
+You can override this by passing `:local_infile => true` though.
+
+#### Troubleshooting LOCAL INFILE
+
+If you enable `:local_infile => true` and meet the following error, then you'll have to work it around.
+
+```
+The used command is not allowed with this MySQL version: LOAD DATA LOCAL INFILE
+```
+
+For mysql2 with AR >= 3.1:
+
+- use [this fork](https://github.com/activewarehouse/mysql2) until [this pull-request](https://github.com/brianmario/mysql2/pull/242) is merged 
+- add `local_infile: true` to your database.yml
+
+For mysql2 with AR < 3.1:
+
+- no current easy solution afaik
+
+For mysql:
+
+- try this [untested patch](https://github.com/activewarehouse/adapter_extensions/issues/7)
+
+### Notes on SQLServer support
+
+v0.9.5 had a broken support for SQLServer.
+
+v1.0.0.rc1 has a work-in-progress bulk import using `freebcp`. More tweaking needed.
+
+### Running the tests
+
+You may have to tweak the Rakefile and database.yml a bit, but roughly:
+
+```
+rake ci:create_db
+rake "ci:run_one[mysql2,test/config/gemfiles/Gemfile.rails-3.2.x]"
+```
+
+You can also run a matrix of tests using:
+
+```
+rake ci:run_matrix
+```
+
+### License
+
+MIT
+
+### Contributors
+
+* Thibaut Barrère (current maintainer)
+* original code by Anthony Eden and probably others (let me know if you read this!)
+* thanks to [Zach Dennis](https://github.com/zdennis/activerecord-import) for his work where I borrowed ideas for the rails 3 rewrite

data/Rakefile

@@ -1,8 +1,7 @@
 require 'bundler'
+Bundler::GemHelper.install_tasks
 require 'rake'
 require 'rake/testtask'
-require 'rdoc'
-require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -15,63 +14,49 @@ Rake::TestTask.new(:test) do |t|
   # TODO: reset the database
 end
 
-namespace :rcov do
-  desc 'Measures test coverage'
-  task :test do
-    rm_f 'coverage.data'
-    mkdir 'coverage' unless File.exist?('coverage')
-    rcov = "rcov --aggregate coverage.data --text-summary -Ilib"
-    system("#{rcov} test/*_test.rb test/**/*_test.rb")
-    system("open coverage/index.html") if PLATFORM['darwin']
-  end
-end
-
-desc 'Generate documentation for the AdapterExtensions library.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Extensions for Rails adapters'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+def system!(cmd)
+  puts cmd
+  raise "Command failed!" unless system(cmd)
 end
 
-desc "Generate code statistics"
-task :lines do
-  lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
-
-  for file_name in FileList["lib/**/*.rb"]
-    next if file_name =~ /vendor/
-    f = File.open(file_name)
-
-    while line = f.gets
-      lines += 1
-      next if line =~ /^\s*$/
-      next if line =~ /^\s*#/
-      codelines += 1
+# experimental tasks to reproduce the Travis behaviour locally
+namespace :ci do
+
+  desc "Create required databases for tests (db in [mysql, mysql2, postgresql])"
+  task :create_db, :db do |t, args|
+    db = args[:db] || ENV['DB']
+    case db
+      when /mysql/;
+        # TODO - extract this info from database.yml
+        system! "mysql -e 'create database adapter_extensions_test;'"
+        system! "mysql adapter_extensions_test < test/config/databases/mysql_setup.sql"
+      when /postgres/;
+        system! "psql -c 'create database adapter_extensions_test;' -U postgres"
+        system! "psql -d adapter_extensions_test -U postgres -f test/config/databases/postgresql_setup.sql"
+      else abort("I don't know how to create the database for DB=#{db}!")
     end
-    puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}"
-    
-    total_lines     += lines
-    total_codelines += codelines
-    
-    lines, codelines = 0, 0
   end
 
-  puts "Total: Lines #{total_lines}, LOC #{total_codelines}"
-end
-
-desc "Publish the release files to RubyForge (UNTESTED CURRENTLY)"
-task :release => [ :package ] do
-  `rubyforge login`
+  desc "For current RVM, run the tests for one db and one gemfile"
+  task :run_one, :db, :gemfile do |t, args|
+    ENV['BUNDLE_GEMFILE'] = File.expand_path(args[:gemfile] || (File.dirname(__FILE__) + '/test/config/gemfiles/Gemfile.rails-3.2.x'))
+    ENV['DB'] = args[:db] || 'mysql2'
+    system! "bundle install && bundle exec rake"
+  end
 
-  for ext in %w( gem tgz zip )
-    release_command = "rubyforge add_release activewarehouse #{PKG_NAME} 'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}"
-    puts release_command
-    system(release_command)
+  desc "For current RVM, run the tests for all the combination in travis configuration"
+  task :run_matrix do
+    require 'cartesian'
+    config = YAML.load_file('.travis.yml')
+    config['env'].cartesian(config['gemfile']).each do |*x|
+      env, gemfile = *x.flatten
+      db = env.gsub('DB=', '')
+      print [db, gemfile].inspect.ljust(40) + ": "
+      cmd = "rake \"ci:run_one[#{db},#{gemfile}]\""
+      result = system "#{cmd} > /dev/null 2>&1"
+      result = result ? "OK" : "FAILED! - re-run with: #{cmd}"
+      puts result
+    end
   end
-end
 
-desc "Publish the API documentation (UNTESTED CURRENTLY)"
-task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new("aeden@rubyforge.org", "/var/www/gforge-projects/activewarehouse/adapter_extensions/rdoc", "rdoc").upload
 end

data/adapter_extensions.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
 
   s.add_runtime_dependency('rake',                '>= 0.8.3')
-  s.add_runtime_dependency('activesupport',       '>= 2.1.0')
-  s.add_runtime_dependency('activerecord',        '>= 2.1.0')
+  s.add_runtime_dependency('activesupport',       '>= 3.0.0')
+  s.add_runtime_dependency('activerecord',        '>= 3.0.0')
+  s.add_development_dependency('flexmock')
+  s.add_development_dependency('cartesian')
 
   s.files              = `git ls-files`.split("\n")
   s.test_files         = `git ls-files -- {test}/*`.split("\n")

data/lib/adapter_extensions/active_record/adapters/abstract_adapter.rb

@@ -0,0 +1,9 @@
+require "adapter_extensions/adapters/abstract_adapter"
+
+module ActiveRecord # :nodoc:
+  module ConnectionAdapters # :nodoc:
+    class AbstractAdapter # :nodoc:
+      include AdapterExtensions::AbstractAdapter
+    end
+  end
+end

data/lib/adapter_extensions/active_record/adapters/mysql2_adapter.rb

@@ -0,0 +1,6 @@
+require "active_record/connection_adapters/mysql2_adapter"
+require "adapter_extensions/adapters/mysql_adapter"
+
+class ActiveRecord::ConnectionAdapters::Mysql2Adapter
+  include AdapterExtensions::MysqlAdapter
+end

data/lib/adapter_extensions/active_record/adapters/mysql_adapter.rb

@@ -0,0 +1,6 @@
+require "active_record/connection_adapters/mysql_adapter"
+require "adapter_extensions/adapters/mysql_adapter"
+
+class ActiveRecord::ConnectionAdapters::MysqlAdapter
+  include AdapterExtensions::MysqlAdapter
+end

data/lib/adapter_extensions/active_record/adapters/postgresql_adapter.rb

@@ -0,0 +1,6 @@
+require "active_record/connection_adapters/postgresql_adapter"
+require "adapter_extensions/adapters/postgresql_adapter"
+
+class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+  include AdapterExtensions::PostgreSQLAdapter
+end

data/lib/adapter_extensions/active_record/adapters/sqlserver_adapter.rb

@@ -0,0 +1,6 @@
+require "activerecord-sqlserver-adapter"
+require "adapter_extensions/adapters/sqlserver_adapter"
+
+class ActiveRecord::ConnectionAdapters::SQLServerAdapter
+  include AdapterExtensions::SQLServerAdapter
+end

data/lib/adapter_extensions/adapters/abstract_adapter.rb

@@ -0,0 +1,44 @@
+module AdapterExtensions::AbstractAdapter
+
+  # Truncate the specified table - allow to pass an optional string
+  # to let the called add extra parameters like RESET IDENTITY for pg
+  def truncate(table_name, options=nil)
+    statement = [
+      'TRUNCATE TABLE',
+      table_name,
+      options
+    ].compact.join(' ')
+    execute(statement)
+  end
+
+  # Bulk loading interface. Load the data from the specified file into the
+  # given table. Note that options will be adapter-dependent.
+  def bulk_load(file, table_name, options={})
+    raise ArgumentError, "#{file} does not exist" unless File.exist?(file)
+    raise ArgumentError, "#{table_name} does not exist" unless tables.include?(table_name)
+    do_bulk_load(file, table_name, options)
+  end
+  
+  # SQL select into statement constructs a new table from the results
+  # of a select. It is used to select data from a table and create a new
+  # table with its result set at the same time.  Note that this method
+  # name does not necessarily match the implementation.  E.g. MySQL's
+  # version of this is 'CREATE TABLE ... AS SELECT ...'
+  def support_select_into_table?
+    false
+  end
+  
+  # Add a chunk of SQL to the given query that will create a new table and
+  # execute the select into that table.
+  def add_select_into_table(new_table_name, sql_query)
+    raise NotImplementedError, "add_select_into_table is an abstract method"
+  end
+  
+protected
+  
+  # for subclasses to implement
+  def do_bulk_load(file, table_name, options={})
+    raise NotImplementedError, "do_bulk_load is an abstract method"
+  end
+
+end

data/lib/adapter_extensions/adapters/mysql_adapter.rb

@@ -0,0 +1,73 @@
+module AdapterExtensions::MysqlAdapter
+
+  def support_select_into_table?
+    true
+  end
+  
+  # Inserts an INTO table_name clause to the sql_query.
+  def add_select_into_table(new_table_name, sql_query)
+    "CREATE TABLE #{new_table_name} " + sql_query
+  end
+  
+  # Copy the specified table.
+  def copy_table(old_table_name, new_table_name)
+    transaction do
+      execute "CREATE TABLE #{new_table_name} LIKE #{old_table_name}"
+      execute "INSERT INTO #{new_table_name} SELECT * FROM #{old_table_name}"
+    end
+  end
+
+  def disable_keys(table)
+    execute("ALTER TABLE #{table} DISABLE KEYS")
+  end
+
+  def enable_keys(table)
+    execute("ALTER TABLE #{table} ENABLE KEYS")
+  end
+
+  def with_keys_disabled(table)
+    disable_keys(table)
+    yield
+  ensure
+    enable_keys(table)
+  end      
+
+protected
+  # Call +bulk_load+, as that method wraps this method.
+  # 
+  # Bulk load the data in the specified file.
+  #
+  # Options:
+  # * <tt>:ignore</tt> -- Ignore the specified number of lines from the source file
+  # * <tt>:columns</tt> -- Array of column names defining the source file column order
+  # * <tt>:fields</tt> -- Hash of options for fields:
+  # * <tt>:delimited_by</tt> -- The field delimiter
+  # * <tt>:enclosed_by</tt> -- The field enclosure
+  # * <tt>:replace</tt> -- Add in REPLACE to LOAD DATA INFILE command
+  # * <tt>:disable_keys</tt> -- if set to true, disable keys, loads, then enables again
+  # * <tt>:local_infile</tt>::
+  #   if set to true, use LOAD DATA LOCAL INFILE rather than LOAD DATA INFILE
+  #   see http://dev.mysql.com/doc/refman/5.0/en/load-data-local.html for security issues with this                     
+  def do_bulk_load(file, table_name, options={})
+    return if File.size(file) == 0
+
+    replace = options[:replace] ? 'REPLACE' : ''
+    local = options[:local_infile] ? 'LOCAL' : ''
+    q = "LOAD DATA #{local} INFILE '#{file}' #{replace} INTO TABLE #{table_name}"
+    if options[:fields]
+      q << " FIELDS"
+      q << " TERMINATED BY '#{options[:fields][:delimited_by]}'" if options[:fields][:delimited_by]
+      q << " ENCLOSED BY '#{options[:fields][:enclosed_by]}'" if options[:fields][:enclosed_by]
+    end
+    q << " IGNORE #{options[:ignore]} LINES" if options[:ignore]
+    q << " (#{options[:columns].map { |c| quote_column_name(c.to_s) }.join(',')})" if options[:columns]
+
+    if options[:disable_keys]
+      with_keys_disabled(table_name) { execute(q) }
+    else
+      execute(q)
+    end
+    
+  end
+
+end

data/lib/adapter_extensions/adapters/postgresql_adapter.rb

@@ -0,0 +1,47 @@
+module AdapterExtensions::PostgreSQLAdapter
+  
+  def support_select_into_table?
+    true
+  end
+  
+  # Inserts an INTO table_name clause to the sql_query.
+  def add_select_into_table(new_table_name, sql_query)
+    sql_query.sub(/FROM/i, "INTO #{new_table_name} FROM")
+  end
+  
+  # Copy the specified table.
+  def copy_table(old_table_name, new_table_name)
+    execute add_select_into_table(new_table_name, "SELECT * FROM #{old_table_name}")
+  end
+
+protected
+  # Call +bulk_load+, as that method wraps this method.
+  # 
+  # Bulk load the data in the specified file.
+  #
+  # Options:
+  # * <tt>:ignore</tt> -- Ignore the specified number of lines from the source file. In the case of PostgreSQL
+  #   only the first line will be ignored from the source file regardless of the number of lines specified.
+  # * <tt>:columns</tt> -- Array of column names defining the source file column order
+  # * <tt>:fields</tt> -- Hash of options for fields:
+  # * <tt>:delimited_by</tt> -- The field delimiter
+  # * <tt>:null_string</tt> -- The string that should be interpreted as NULL (in addition to \N)
+  # * <tt>:enclosed_by</tt> -- The field enclosure
+  def do_bulk_load(file, table_name, options={})
+    q = "COPY #{table_name} "
+    q << "(#{options[:columns].join(',')}) " if options[:columns]
+    q << "FROM '#{File.expand_path(file)}' "
+    if options[:fields]
+      q << "WITH "
+      q << "DELIMITER '#{options[:fields][:delimited_by]}' " if options[:fields][:delimited_by]
+      q << "NULL '#{options[:fields][:null_string]}'" if options[:fields][:null_string]
+      if options[:fields][:enclosed_by] || options[:ignore] && options[:ignore] > 0
+        q << "CSV "
+        q << "HEADER " if options[:ignore] && options[:ignore] > 0
+        q << "QUOTE '#{options[:fields][:enclosed_by]}' " if options[:fields][:enclosed_by]
+      end
+    end
+    
+    execute(q)
+  end
+end

data/lib/adapter_extensions/adapters/sqlserver_adapter.rb

@@ -0,0 +1,63 @@
+module AdapterExtensions::SQLServerAdapter
+  
+  def support_select_into_table?
+    true
+  end
+  
+  # Inserts an INTO table_name clause to the sql_query.
+  def add_select_into_table(new_table_name, sql_query)
+    sql_query.sub(/FROM/i, "INTO #{new_table_name} FROM")
+  end
+  
+  # Copy the specified table.
+  def copy_table(old_table_name, new_table_name)
+    execute add_select_into_table(new_table_name, "SELECT * FROM #{old_table_name}")
+  end
+      
+protected
+  # Call +bulk_load+, as that method wraps this method.
+  # 
+  # Bulk load the data in the specified file. This implementation relies
+  # on freebcp being in your PATH.
+  #
+  # Currently supported options:
+  # * <tt>:bin</tt> -- alternate path to freebcp
+  # * <tt>:max_errors</tt> -- maximum number of errors (freebcp -m parameter)
+  # * <tt>:env</tt> -- override ActiveRecord environment to be used
+  # * <tt>:fields</tt> -- Hash of options for fields:
+  # * <tt>:delimited_by</tt> -- The field delimiter
+  # :columns is currently unsupported and will raise an exception
+  def do_bulk_load(filename, table_name, options={})
+    env_name = options[:env] || Rails.env
+    config = ActiveRecord::Base.configurations[env_name]
+
+    raise NotImplementedError.new(":columns option is not currently supported") if options[:columns]
+
+    # work in progress.
+    # - http://linux.die.net/man/1/freebcp
+    # - http://stackoverflow.com/a/924943/20302
+    # - http://msdn.microsoft.com/en-us/library/ms162802.aspx
+    # - http://www.dbforums.com/microsoft-sql-server/1624618-how-bring-out-column-names-bcp.html
+    
+    command = []
+    command << (options[:bin] || 'freebcp')
+    command << "\"#{config['database']}.dbo.#{table_name}\""
+    command << "in \"#{filename}\""
+    command << "-S \"#{config['host']}\""
+    command << "-U \"#{config['username']}\""
+    command << "-P \"#{config['password']}\""
+    command << "-c" # character mode
+    command << "-t \"#{options[:fields][:delimited_by]}\"" if options[:fields] && options[:fields][:delimited_by]
+    command << "-b 10000" # bulk size
+
+    command << "-m #{options[:max_errors]}" if options[:max_errors]
+    command << "-e \"#{filename}.in.errors\""
+    command = command.join(' ')
+
+    # left-overs from legacy bcp call - must see if they must remain or not
+    # -a8192 -q -E 
+
+    # TODO - raise a better exception here
+    raise "bulk load failed!" unless Kernel.system(command)
+  end
+end

data/lib/adapter_extensions/base.rb

@@ -0,0 +1,19 @@
+require "pathname"
+require "active_record"
+require "active_record/version"
+
+module AdapterExtensions
+  AdapterPath = File.join File.expand_path(File.dirname(__FILE__)), "/active_record/adapters"
+
+  # Loads the extensions for a specific database adapter
+  def self.require_adapter(adapter)
+    require File.join(AdapterPath,"/abstract_adapter")
+    specific_adapter = File.join(AdapterPath,"/#{adapter}_adapter")
+    require specific_adapter if File.exists?(specific_adapter + '.rb')
+  end
+
+  def self.load_from_connection_pool(connection_pool)
+    require_adapter connection_pool.spec.config[:adapter]
+  end
+
+end

data/lib/adapter_extensions/version.rb

@@ -1,4 +1,4 @@
 # Source file identifying the version of AdapterExtensions in this package
 module AdapterExtensions#:nodoc:
-  VERSION = "0.9.5"
+  VERSION = "1.0.0.rc1"
 end

data/lib/adapter_extensions.rb

@@ -1,10 +1,19 @@
-# Extensions to the Rails ActiveRecord adapters.
-#
-# Requiring this file will require all of the necessary files to function.
+require 'adapter_extensions/base'
 
-require 'rubygems'
-require 'active_support'
-require 'active_record'
+class ActiveRecord::Base
+  class << self
+    # for 1.8.7, modules loaded more than once that use alias_method_chain will 
+    # cause stack level too deep errors - make sure we avoid this
+    unless self.instance_methods.include?('establish_connection_without_adapter_extensions')
+      def establish_connection_with_adapter_extensions(*args)
+        establish_connection_without_adapter_extensions(*args)
+        ActiveSupport.run_load_hooks(:active_record_connection_established, connection_pool)
+      end
+      alias_method_chain :establish_connection, :adapter_extensions
+    end
+  end
+end
 
-$:.unshift(File.dirname(__FILE__))
-Dir[File.dirname(__FILE__) + "/adapter_extensions/**/*.rb"].each { |file| require(file) }
+ActiveSupport.on_load(:active_record_connection_established) do |connection_pool|
+  AdapterExtensions.load_from_connection_pool connection_pool
+end