@@ -128,10 +128,15 @@ The source for activerecord-jdbc-adapter is available using git. == Running AR-JDBC's Tests -Drivers for 4 open-source databases are included. Provided you have MySQL +Drivers for 6 open-source databases are included. Provided you have MySQL installed, you can simply type <tt>jruby -S rake</tt> to run the tests. A database named <tt>weblog_development</tt> is needed beforehand with a -connection user of "blog" and password empty. +connection user of "blog" and an empty password. + +If you also have PostgreSQL available, those tests will be run if the +`psql' executable can be found. Also ensure you have a database named +<tt>weblog_development</tt> and a user named "blog" and an empty +password. If you want rails logging enabled during these test runs you can edit test/jdbc_common.rb and add the following line: @@ -140,11 +145,11 @@ require 'db/logger' == Running AR Tests - # If you want to run MRI against Rails remember to re-export RUBYLIB to be - # empty (or whatever you normally have it set to when you are done). - export RUBYLIB=$(find $PWD -name lib -type d | grep -v pkg | ruby -e 'puts $stdin.readlines.map{|l| l.chomp}.join(":")') - cd active_record_source_dir - jruby -S rake test_jdbcmysql (or specific adapter you want to test) +To run the current AR-JDBC sources with ActiveRecord, just use the +included "rails:test" task. Be sure to specify a driver and a path to +the ActiveRecord sources. + + jruby -S rake rails:test DRIVER=mysql RAILS=/path/activerecord_source_dir == Authors README.txt @@ -32,11 +32,13 @@ namespace :db do db = ActiveRecord::Base.connection.database_name ActiveRecord::Base.connection.drop_database(db) rescue + drop_database(config.merge('adapter' => config['adapter'].sub(/^jdbc/, ''))) drop_database(config) end end class << self; alias_method :previous_create_database, :create_database; end + def create_database(config) begin ActiveRecord::Base.establish_connection(config) lib/jdbc_adapter/jdbc.rake @@ -4,7 +4,7 @@ <groupId>org.jruby.activerecord-jdbc</groupId> <artifactId>activerecord-jdbc</artifactId> <packaging>jar</packaging> - <version>0.9.1</version> + <version>0.9.2</version> <name>activerecord-jdbc</name> <description> This POM for activerecord-jdbc is just for bootstrapping IDEs. You @@ -35,7 +35,7 @@ <dependency> <groupId>org.jruby</groupId> <artifactId>jruby-complete</artifactId> - <version>1.1.6</version> + <version>1.3.1</version> </dependency> </dependencies> pom.xml 5b303134ca46f5f21842241a72cdaafe7bc0e503 Nick Sieger nick@nicksieger.com http://github.com/nicksieger/activerecord-jdbc-adapter/commit/47fe03e42e3c8a94c41f258aa3806ae8fb22bb5f 47fe03e42e3c8a94c41f258aa3806ae8fb22bb5f 2009-09-26T12:43:39-07:00 2009-09-26T12:43:39-07:00 Tweak drop database task to strip 'jdbc' from adapter name; update readme and pom version 5addc1b2e95f0d409f9c0390b78964ef64492395 Nick Sieger nick@nicksieger.com