@@ -1,3 +1,15 @@ +module JdbcSpec + module ActiveRecordExtensions + def self.add_method_to_remove_from_ar_base(meth) + @methods ||= [] + @methods << meth + end + + def self.extended(klass) + (@methods || []).each {|m| (class << klass; self; end).instance_eval { remove_method(m) rescue nil } } + end + end +end require 'jdbc_adapter/jdbc_mimer' require 'jdbc_adapter/jdbc_hsqldb' lib/active_record/connection_adapters/jdbc_adapter_spec.rb @@ -1,4 +1,4 @@ -if RUBY_PLATFORM =~ /java/ +if defined?(JRUBY_VERSION) begin tried_gem ||= false require 'active_record/version' lib/jdbc_adapter.rb @@ -5,6 +5,8 @@ module ::JdbcSpec $LOADED_FEATURES << "active_record/connection_adapters/mysql_adapter.rb" module ActiveRecordExtensions + add_method_to_remove_from_ar_base(:mysql_connection) + def mysql_connection(config) require File.dirname(__FILE__) + "/../active_record/connection_adapters/mysql_adapter" config[:port] ||= 3306 lib/jdbc_adapter/jdbc_mysql.rb @@ -4,6 +4,8 @@ module ::JdbcSpec $LOADED_FEATURES << "active_record/connection_adapters/postgresql_adapter.rb" module ActiveRecordExtensions + add_method_to_remove_from_ar_base(:postgresql_connection) + def postgresql_connection(config) require File.dirname(__FILE__) + "/../active_record/connection_adapters/postgresql_adapter" config[:host] ||= "localhost" lib/jdbc_adapter/jdbc_postgre.rb @@ -1,5 +1,7 @@ module ::JdbcSpec module ActiveRecordExtensions + add_method_to_remove_from_ar_base(:sqlite3_connection) + def sqlite3_connection(config) require File.dirname(__FILE__) + "/../active_record/connection_adapters/sqlite3_adapter" lib/jdbc_adapter/jdbc_sqlite3.rb @@ -1,3 +1,7 @@ +# This file was generated by the "jdbc" generator, which is provided +# by the activerecord-jdbc-adapter gem. +# +# This file allows you to use Rails' various db:* tasks with JDBC. if defined?(JRUBY_VERSION) require 'jdbc_adapter' require 'jdbc_adapter/rake_tasks' rails_generators/templates/jdbc.rake @@ -1 +1,7 @@ +# This file was generated by the "jdbc" generator, which is provided +# by the activerecord-jdbc-adapter gem. +# +# This file allows the JDBC drivers to be hooked into ActiveRecord +# such that you don't have to change anything else in your Rails +# application. require 'jdbc_adapter' if defined?(JRUBY_VERSION) rails_generators/templates/jdbc.rb 3242046b082301a702bf433a08d96b52cd44b4aa Nick Sieger nick@nicksieger.com http://github.com/nicksieger/activerecord-jdbc-adapter/commit/d83729b44463b7dad0bb764294d5a55528e20e05 d83729b44463b7dad0bb764294d5a55528e20e05 2009-09-30T19:32:49-07:00 2009-09-30T19:32:49-07:00 Fix loading/overriding of *_connection methods in ActiveRecord f96f1569b6862712e6b5f6d68528fb10b5ce90f1 Nick Sieger nick@nicksieger.com