Title: [882] trunk/activerecord-jdbc/lib:
- Fake out Rails by making it think that native adapter files have been loaded already
- Revision
- 882
- Author
- nicksieger
- Date
- 2008-01-17 16:02:31 -0500 (Thu, 17 Jan 2008)
Log Message
- Fake out Rails by making it think that native adapter files have been loaded already
- Support Rails 2 with the old "require 'jdbc_adapter'" approach
Modified Paths
Diff
Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mysql.rb (881 => 882)
--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mysql.rb 2008-01-17 14:46:05 UTC (rev 881)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mysql.rb 2008-01-17 21:02:31 UTC (rev 882)
@@ -1,6 +1,9 @@
require 'active_record/connection_adapters/abstract/schema_definitions'
module ::JdbcSpec
+ # Don't need to load native mysql adapter
+ $LOADED_FEATURES << "active_record/connection_adapters/mysql_adapter.rb"
+
module ActiveRecordExtensions
def mysql_connection(config)
if config[:socket]
Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_postgre.rb (881 => 882)
--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_postgre.rb 2008-01-17 14:46:05 UTC (rev 881)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_postgre.rb 2008-01-17 21:02:31 UTC (rev 882)
@@ -1,6 +1,10 @@
module ::JdbcSpec
+ # Don't need to load native postgres adapter
+ $LOADED_FEATURES << "active_record/connection_adapters/postgresql_adapter.rb"
+
module ActiveRecordExtensions
def postgresql_connection(config)
+ config[:host] ||= "localhost"
config[:port] ||= 5432
config[:url] ||= "jdbc:postgresql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
config[:driver] ||= "org.postgresql.Driver"
Modified: trunk/activerecord-jdbc/lib/jdbc_adapter.rb (881 => 882)
--- trunk/activerecord-jdbc/lib/jdbc_adapter.rb 2008-01-17 14:46:05 UTC (rev 881)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter.rb 2008-01-17 21:02:31 UTC (rev 882)
@@ -18,6 +18,9 @@
if ActiveRecord::VERSION::MAJOR == 1 && ActiveRecord::VERSION::MINOR == 14
require 'active_record/connection_adapters/jdbc_adapter'
end
+ else
+ require 'active_record'
+ require 'active_record/connection_adapters/jdbc_adapter'
end
else
warn "ActiveRecord-JDBC is for use with JRuby only"
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
