[Jruby-extras-devel] [790] trunk/activerecord-jdbc: Merge fixes made on 0.6 during release prep

[nobody]

Title: [790] trunk/activerecord-jdbc: Merge fixes made on 0.6 during release prep

Revision

790

Author

nicksieger

Date

2007-11-05 17:00:18 -0500 (Mon, 05 Nov 2007)

Log Message

Merge fixes made on 0.6 during release prep

Modified Paths

• trunk/activerecord-jdbc/Rakefile
• trunk/activerecord-jdbc/drivers/derby/lib/jdbc/derby.rb
• trunk/activerecord-jdbc/drivers/hsqldb/lib/jdbc/hsqldb.rb
• trunk/activerecord-jdbc/drivers/mysql/lib/jdbc/mysql.rb
• trunk/activerecord-jdbc/drivers/postgres/lib/jdbc/postgres.rb

Diff

Modified: trunk/activerecord-jdbc/Rakefile (789 => 790)

--- trunk/activerecord-jdbc/Rakefile	2007-11-05 21:59:44 UTC (rev 789)
+++ trunk/activerecord-jdbc/Rakefile	2007-11-05 22:00:18 UTC (rev 790)
@@ -127,10 +127,11 @@
   desc "Run rake release on #{dir}"
   task "#{prefix}:release" do
     Dir.chdir(dir) do
+      version = nil
       if dir =~ /adapters/
         version = ENV['VERSION']
       else
-        Dir["dir/lib/**/*.rb"].each do |file|
+        Dir["lib/**/*.rb"].each do |file|
           version ||= File.open(file) {|f| f.read =~ /VERSION = "([^"]+)"/ && $1}
         end
       end

Modified: trunk/activerecord-jdbc/drivers/derby/lib/jdbc/derby.rb (789 => 790)

--- trunk/activerecord-jdbc/drivers/derby/lib/jdbc/derby.rb	2007-11-05 21:59:44 UTC (rev 789)
+++ trunk/activerecord-jdbc/drivers/derby/lib/jdbc/derby.rb	2007-11-05 22:00:18 UTC (rev 790)
@@ -4,4 +4,8 @@
   end
 end
 
-require "derby-#{Jdbc::Derby::VERSION}.jar"
\ No newline at end of file
+if RUBY_PLATFORM =~ /java/
+  require "derby-#{Jdbc::Derby::VERSION}.jar"
+else
+  warn "jdbc-derby is only for use with JRuby"
+end
\ No newline at end of file

Modified: trunk/activerecord-jdbc/drivers/hsqldb/lib/jdbc/hsqldb.rb (789 => 790)

--- trunk/activerecord-jdbc/drivers/hsqldb/lib/jdbc/hsqldb.rb	2007-11-05 21:59:44 UTC (rev 789)
+++ trunk/activerecord-jdbc/drivers/hsqldb/lib/jdbc/hsqldb.rb	2007-11-05 22:00:18 UTC (rev 790)
@@ -3,4 +3,8 @@
     VERSION = "1.8.0.7"
   end
 end
-require "hsqldb-#{Jdbc::HSQLDB::VERSION}.jar"
\ No newline at end of file
+if RUBY_PLATFORM =~ /java/
+  require "hsqldb-#{Jdbc::HSQLDB::VERSION}.jar"
+else
+  warn "jdbc-hsqldb is only for use with JRuby"
+end
\ No newline at end of file

Modified: trunk/activerecord-jdbc/drivers/mysql/lib/jdbc/mysql.rb (789 => 790)

--- trunk/activerecord-jdbc/drivers/mysql/lib/jdbc/mysql.rb	2007-11-05 21:59:44 UTC (rev 789)
+++ trunk/activerecord-jdbc/drivers/mysql/lib/jdbc/mysql.rb	2007-11-05 22:00:18 UTC (rev 790)
@@ -3,4 +3,8 @@
     VERSION = "5.0.4"
   end
 end
-require "mysql-connector-java-#{Jdbc::MySQL::VERSION}-bin.jar"
\ No newline at end of file
+if RUBY_PLATFORM =~ /java/
+  require "mysql-connector-java-#{Jdbc::MySQL::VERSION}-bin.jar"
+else
+  warn "jdbc-mysql is only for use with JRuby"
+end
\ No newline at end of file

Modified: trunk/activerecord-jdbc/drivers/postgres/lib/jdbc/postgres.rb (789 => 790)

--- trunk/activerecord-jdbc/drivers/postgres/lib/jdbc/postgres.rb	2007-11-05 21:59:44 UTC (rev 789)
+++ trunk/activerecord-jdbc/drivers/postgres/lib/jdbc/postgres.rb	2007-11-05 22:00:18 UTC (rev 790)
@@ -3,4 +3,8 @@
     VERSION = "8.2" 
   end
 end
-require "postgresql-#{Jdbc::Postgres::VERSION}-504.jdbc3.jar"
\ No newline at end of file
+if RUBY_PLATFORM =~ /java/
+  require "postgresql-#{Jdbc::Postgres::VERSION}-504.jdbc3.jar"
+else
+  warn "jdbc-postgres is only for use with JRuby"
+end
\ No newline at end of file

_______________________________________________
Jruby-extras-devel mailing list
Jruby-extras-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/jruby-extras-devel