Title: [994] trunk/activerecord-jdbc:
Fix missing quote_table_name function under Rails 1.2.6 and earlier
- Revision
- 994
- Author
- nicksieger
- Date
- 2008-05-16 18:09:40 -0400 (Fri, 16 May 2008)
Log Message
Fix missing quote_table_name function under Rails 1.2.6 and earlier
- Also, small tweaks to jdbc.rake to select proper config
Modified Paths
Diff
Modified: trunk/activerecord-jdbc/History.txt (993 => 994)
--- trunk/activerecord-jdbc/History.txt 2008-05-14 03:25:10 UTC (rev 993)
+++ trunk/activerecord-jdbc/History.txt 2008-05-16 22:09:40 UTC (rev 994)
@@ -5,6 +5,8 @@
- Fix for JRUBY-2256
- JRUBY-1638, JRUBY-2404, JRUBY-2463: schema.table handling and Oracle NUMBER fixes (Thanks Darcy Schultz & Jesse Hu)
- Add structure dump and other DDL-ish for DB2 (courtesy abedra and stuarthalloway)
+- Fix missing quote_table_name function under Rails 1.2.6 and earlier
+- Small tweaks to jdbc.rake to select proper config
== 0.8
Modified: trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb (993 => 994)
--- trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb 2008-05-14 03:25:10 UTC (rev 993)
+++ trunk/activerecord-jdbc/lib/active_record/connection_adapters/jdbc_adapter.rb 2008-05-16 22:09:40 UTC (rev 994)
@@ -420,8 +420,19 @@
end
end
+ module CompatibilityMethods
+ def self.needed?(base)
+ !base.instance_methods.include?("quote_table_name")
+ end
+
+ def quote_table_name(name)
+ quote_column_name(name)
+ end
+ end
+
class JdbcAdapter < AbstractAdapter
extend ShadowCoreMethods
+ include CompatibilityMethods if CompatibilityMethods.needed?(self)
attr_reader :config
Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc.rake (993 => 994)
--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc.rake 2008-05-14 03:25:10 UTC (rev 993)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc.rake 2008-05-16 22:09:40 UTC (rev 994)
@@ -60,10 +60,11 @@
end
end
end
+
namespace :test do
redefine_task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
abcs = ActiveRecord::Base.configurations
- ActiveRecord::Base.establish_connection(:test)
+ ActiveRecord::Base.establish_connection(abcs[:test])
ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0') if abcs["test"]["adapter"] =~ /mysql/i
IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
ActiveRecord::Base.connection.execute(ddl)
@@ -72,7 +73,7 @@
redefine_task :purge => :environment do
abcs = ActiveRecord::Base.configurations
- ActiveRecord::Base.establish_connection(:test)
+ ActiveRecord::Base.establish_connection(abcs[:test])
db = ActiveRecord::Base.connection.database_name
ActiveRecord::Base.connection.recreate_database(db)
end
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
