activerecord-jdbc-adapter 0.9.2 → 1.1.0

data/History.txt

@@ -1,3 +1,166 @@
+== 1.1.0 (12/09/10)
+
+- Don't narrow platform to '-java' only: revert back to 0.9.2 where
+  ar-jdbc can be installed under any Ruby (for easier Bundler/Warbler
+  usage and less confusion on rubygems.org).
+- Upgrade MySQL execute code to use RETURN_GENERATED_KEYS.
+- Upgrade to MySQL driver version 5.1.13
+- Add multi-statement support, idea from oruen. For databases that
+  support it, you can now do:
+      results = Model.connection.execute("select 1; select 2")
+  and receive back an array of multiple result set arrays. For use with
+  MySQL, you need to add
+      options:
+        allowMultiQueries: true
+  in database.yml.
+- ACTIVERECORD_JDBC-144: Fix limits appearing in schema dump for some
+  datatypes (Uwe Kubosch)
+- Fixes for DB2 limit/offset
+- Fix rake db:create for 'jdbc' adapter (Joeri Samson)
+- add create/drop database methods to h2 adapter (sahglie)
+- Use connection getDatabaseProductName instead of getClass.getName
+  when detecting JNDI dialects (Denis Odorcic)
+- ACTIVERECORD_JDBC-146: Fix create_table to not append encoding (Marc Slemko)
+- All green on SQLite3 Rails master ActiveRecord tests
+- ACTIVERECORD_JDBC-140: Sync postgres add/change column code from Rails master
+- ACTIVERECORD_JDBC-139: TEXT/DATE on PostgreSQL should not have limits
+
+== 1.0.3 (11/29/10)
+
+- ACTIVERECORD_JDBC-143: Implement table_exists? fixing association
+  table names with schema prefixes
+- Cleanup of column code for hsqldb (Denis Odorcic)
+- Rails 3.0.3 support - add Arel 2 visitors for all adapters
+- Fix MySQL date types to not have limits (Chris Lowder)
+- ACTIVERECORD_JDBC-141: Better schema support in H2
+
+== 1.0.2
+
+- ACTIVERECORD_JDBC-134: Fix conflicting adapter/column superclasses
+- ACTIVERECORD_JDBC-135: Fix regression on PG with boolean and :limit
+- Slew of Derby fixes courtesy of Denis Odorcic
+
+== 1.0.1
+
+- Fix db:test:purge issue affecting all adapters in 1.0.0 due to
+  incorrect fix to JRUBY-5081 in 8b4b9c5
+
+== 1.0.0
+
+- Thanks to David Kellum, Dmitry Denisov, Dwayne Litzenberger, Gregor
+  Schmidt, James Walker, John Duff, Joshua Suggs, Nicholas J Kreucher,
+  Peter Donald, Geoff Longman, Uwe Kubosch, Youhei Kondou, Michael
+  Pitman, Alex B, and Ryan Bell for their contributions to this
+  release.
+- BIG set of DB2 updates (Thanks Nick Kreucher)
+- Deprecate jdbc_adapter/rake_tasks
+- (1.0.0.beta1)
+- Make database-specific extensions only load when necessary
+- Allow for discovery of database extensions outside of ar-jdbc
+  proper. This should allow for custom database development to be
+  developed and released without relying on AR-JDBC core.
+- Get AR's own tests running as close to 100% as possible. MySQL is
+  currently 100%, SQLite3 is close.
+- JRUBY-4876: Bump up Derby's max index name length (Uwe Kubosch)
+- (1.0.0.beta2)
+- 98 commits since beta1
+- MSSQL updates from dlitz and realityforge
+- ACTIVERECORD_JDBC-131: Fix string slug issue for DB2 (Youhei Kondou)
+- JRUBY-1642: Don't use H2 INFORMATION_SCHEMA in table or column
+  searches
+- JRUBY-4972: Attempt to deal with type(0)/:limit => 0 by not setting
+  it808e213
+- JRUBY-5040: Fix issue with limits on timestamps in MySQL
+- JRUBY-3555: Allow setting Derby schema with 'schema:' option
+- ACTIVERECORD_JDBC-98: Make sure we actuall raise an error when
+  inappropriately configured
+- ACTIVERECORD_JDBC-112: Add schema dumper tests for already-fixed
+  MySQL type limits
+- ACTIVERECORD_JDBC-113: Fix PG float precision issue
+- ACTIVERECORD_JDBC-103: Fix decimal options for PG add/change column
+  (Michael Pitman)
+- ACTIVERECORD_JDBC-127: Fix quoting of Date vs. Time(stamp) for
+  Oracle (Lenny Marks)
+- Oracle: Sort out the NUMBER vs NUMBER(x) vs NUMBER(x,y) situation.
+- JRUBY-3051: Think we finally got the PG mixed-case patches applied.
+- JRUBY-5081: Consolidate code for dropping DB via postgres
+- ACTIVERECORD_JDBC-101: Add override of LONGVARCHAR => CLOB for
+  informix
+- ACTIVERECORD_JDBC-107: Fix MySQL update_all issue on AR 2.3
+- ACTIVERECORD_JDBC-124: Filter out special _row_num column
+- ACTIVERECORD_JDBC-126: Fix sql 2000 limit/offset per Michael Pitman
+- ACTIVERECORD_JDBC-125: Add tweak to limit/offset code for HABTM
+  queries (alex b)
+- ACTIVERECORD_JDBC-129: Don't have limits for text, binary or bit
+  fields
+- (1.0.0 final)
+- Fix a few more SQLite3 AR tests
+- SQLite3: handle ":memory:" database
+- Release new SQLite3 driver 3.6.14.2 and new Derby driver 10.6.2.1
+
+== 0.9.7
+
+- JRUBY-4781: Fix multiple database connection collision issue w/
+  Oracle
+- ACTIVERECORD_JDBC-115: Support SAVEPOINTS for MySQL and PG so that
+  nested transactions can be faked
+- ACTIVERECORD_JDBC-116: Handle schema.table better for MySQL (thanks
+  Dilshod Mukhtarov)
+- Fix 'Wrong # of arguments (2 for 1)' issue with #create_database for
+  MySQL and AR 3.0
+- SQLServer 2000 support (thanks Jay McGaffigan)
+
+== 0.9.6
+
+- The Oracle release!
+- Oracle should be working much better with this release. Also updated
+  to work with Rails 3.
+- Get all unit tests running cleanly on Oracle, fixing previous
+  datetime/timezone issues.
+- ACTIVERECORD_JDBC-83: Add :sequence_start_value option to
+  create_table, following oracle_enhanced adapter
+- ACTIVERECORD_JDBC-33: Don't double-quote table names in oracle
+- ACTIVERECORD_JDBC-17: Fix Oracle primary keys so that /^NUMBER$/ => :integer
+- Fix remaining blockers ACTIVERECORD_JDBC-82, JRUBY-3675,
+  ACTIVERECORD_JDBC-22, ACTIVERECORD_JDBC-27, JRUBY-4759
+
+== 0.9.5
+
+- The MSSQL release, courtesy of Mike Williams and Lonely
+  Planet.
+- JRuby + AR-JDBC is now seen as the hassle-free way of using Rails
+  with SQLServer!
+- Many fixes for MSSQL, including ACTIVERECORD_JDBC-18,
+  ACTIVERECORD_JDBC-41, ACTIVERECORD_JDBC-56, ACTIVERECORD_JDBC-94,
+  ACTIVERECORD_JDBC-99, JRUBY-3805, JRUBY-3793, JRUBY-4221
+- All tests pass on Rails 3.0.0.beta3!
+
+== 0.9.4
+
+- ACTIVERECORD_JDBC-96: DB2 JdbcSpec cannot dump schema correctly
+  (Youhei Kondou)
+- ACTIVERECORD_JDBC-97: Dont use Rails 3 deprecated constants (David
+  Calavera)
+- Updates for rake db:schema:dump compatibility with Rails 2.3+ and
+  MySQL (Joakim Kolsj�)
+- Rails 3.0.0.beta2 compatibility
+- Return of Derby, H2, Hsqldb support (requires AR >= 3.0.0.beta2)
+
+== 0.9.3
+
+- Rails 3 compatibility
+- PLEASE NOTE: ActiveRecord in Rails 3 has changed in a way that
+  doesn't allow non-standard DBs (such as the Derby and H2 embedded
+  DBs) to work. We're investigating the effort required to support
+  these databases and hope to have something for a future release.
+- ACTIVERECORD_JDBC-91: Fix schema search path for PostgreSQL (Alex
+  Kuebo)
+- ACTIVERECORD_JDBC-87: DB2 ID insert fix (Youhei Kondou)
+- ACTIVERECORD_JDBC-90: MSSQL fix for DATEs (jlangenauer)
+- ACTIVERECORD_JDBC-93: Fix string IDs for sqlite3, hsql/h2 (moser)
+- ACTIVERECORD_JDBC-86: Fix Derby queries starting with VALUES (Dwayne Litzenberger)
+- ACTIVERECORD_JDBC-95: Fix INSERT ... RETURNING for PostgreSQL
+
 == 0.9.2
 
 - The main, highly awaited fix for this release is a solution to the

data/Manifest.txt

@@ -3,56 +3,94 @@ Manifest.txt
 README.txt
 Rakefile
 LICENSE.txt
-lib/active_record/connection_adapters/cachedb_adapter.rb
+lib/activerecord-jdbc-adapter.rb
+lib/arjdbc.rb
+lib/jdbc_adapter.rb
+lib/pg.rb
 lib/active_record/connection_adapters/derby_adapter.rb
 lib/active_record/connection_adapters/h2_adapter.rb
 lib/active_record/connection_adapters/hsqldb_adapter.rb
 lib/active_record/connection_adapters/informix_adapter.rb
 lib/active_record/connection_adapters/jdbc_adapter.rb
-lib/active_record/connection_adapters/jdbc_adapter_spec.rb
 lib/active_record/connection_adapters/jndi_adapter.rb
+lib/active_record/connection_adapters/mssql_adapter.rb
+lib/active_record/connection_adapters/mysql2_adapter.rb
 lib/active_record/connection_adapters/mysql_adapter.rb
 lib/active_record/connection_adapters/oracle_adapter.rb
 lib/active_record/connection_adapters/postgresql_adapter.rb
 lib/active_record/connection_adapters/sqlite3_adapter.rb
-lib/jdbc_adapter/jdbc_cachedb.rb
-lib/jdbc_adapter/jdbc_db2.rb
-lib/jdbc_adapter/jdbc_derby.rb
-lib/jdbc_adapter/jdbc_firebird.rb
-lib/jdbc_adapter/jdbc_hsqldb.rb
-lib/jdbc_adapter/jdbc_informix.rb
-lib/jdbc_adapter/jdbc_mimer.rb
-lib/jdbc_adapter/jdbc_mssql.rb
-lib/jdbc_adapter/jdbc_mysql.rb
-lib/jdbc_adapter/jdbc_oracle.rb
-lib/jdbc_adapter/jdbc_postgre.rb
-lib/jdbc_adapter/jdbc_sqlite3.rb
-lib/jdbc_adapter/jdbc_sybase.rb
-lib/jdbc_adapter/missing_functionality_helper.rb
+lib/arel/engines/sql/compilers/db2_compiler.rb
+lib/arel/engines/sql/compilers/derby_compiler.rb
+lib/arel/engines/sql/compilers/h2_compiler.rb
+lib/arel/engines/sql/compilers/hsqldb_compiler.rb
+lib/arel/engines/sql/compilers/jdbc_compiler.rb
+lib/arel/engines/sql/compilers/mssql_compiler.rb
+lib/arel/visitors/db2.rb
+lib/arel/visitors/derby.rb
+lib/arel/visitors/hsqldb.rb
+lib/arel/visitors/mssql.rb
+lib/arjdbc/db2.rb
+lib/arjdbc/derby.rb
+lib/arjdbc/discover.rb
+lib/arjdbc/firebird.rb
+lib/arjdbc/h2.rb
+lib/arjdbc/hsqldb.rb
+lib/arjdbc/informix.rb
+lib/arjdbc/jdbc.rb
+lib/arjdbc/mimer.rb
+lib/arjdbc/mssql.rb
+lib/arjdbc/mysql.rb
+lib/arjdbc/oracle.rb
+lib/arjdbc/postgresql.rb
+lib/arjdbc/sqlite3.rb
+lib/arjdbc/sybase.rb
+lib/arjdbc/version.rb
+lib/arjdbc/db2/adapter.rb
+lib/arjdbc/derby/adapter.rb
+lib/arjdbc/derby/connection_methods.rb
+lib/arjdbc/firebird/adapter.rb
+lib/arjdbc/h2/adapter.rb
+lib/arjdbc/h2/connection_methods.rb
+lib/arjdbc/hsqldb/adapter.rb
+lib/arjdbc/hsqldb/connection_methods.rb
+lib/arjdbc/informix/adapter.rb
+lib/arjdbc/informix/connection_methods.rb
+lib/arjdbc/jdbc/adapter.rb
+lib/arjdbc/jdbc/callbacks.rb
+lib/arjdbc/jdbc/column.rb
+lib/arjdbc/jdbc/compatibility.rb
+lib/arjdbc/jdbc/connection.rb
+lib/arjdbc/jdbc/connection_methods.rb
+lib/arjdbc/jdbc/core_ext.rb
+lib/arjdbc/jdbc/discover.rb
+lib/arjdbc/jdbc/driver.rb
+lib/arjdbc/jdbc/extension.rb
+lib/arjdbc/jdbc/java.rb
+lib/arjdbc/jdbc/missing_functionality_helper.rb
+lib/arjdbc/jdbc/quoted_primary_key.rb
+lib/arjdbc/jdbc/railtie.rb
+lib/arjdbc/jdbc/rake_tasks.rb
+lib/arjdbc/jdbc/require_driver.rb
+lib/arjdbc/jdbc/type_converter.rb
+lib/arjdbc/mimer/adapter.rb
+lib/arjdbc/mssql/adapter.rb
+lib/arjdbc/mssql/connection_methods.rb
+lib/arjdbc/mssql/limit_helpers.rb
+lib/arjdbc/mssql/tsql_helper.rb
+lib/arjdbc/mysql/adapter.rb
+lib/arjdbc/mysql/connection_methods.rb
+lib/arjdbc/oracle/adapter.rb
+lib/arjdbc/oracle/connection_methods.rb
+lib/arjdbc/postgresql/adapter.rb
+lib/arjdbc/postgresql/connection_methods.rb
+lib/arjdbc/sqlite3/adapter.rb
+lib/arjdbc/sqlite3/connection_methods.rb
+lib/arjdbc/sybase/adapter.rb
+lib/generators/jdbc/jdbc_generator.rb
 lib/jdbc_adapter/rake_tasks.rb
-lib/jdbc_adapter/tsql_helper.rb
 lib/jdbc_adapter/version.rb
-lib/jdbc_adapter.rb
-lib/pg.rb
-lib/jdbc_adapter/jdbc_adapter_internal.jar
+lib/arjdbc/jdbc/adapter_java.jar
 test/abstract_db_create.rb
-test/activerecord/connection_adapters/type_conversion_test.rb
-test/activerecord/connections/native_jdbc_mysql/connection.rb
-test/cachedb_simple_test.rb
-test/db/cachedb.rb
-test/db/db2.rb
-test/db/derby.rb
-test/db/h2.rb
-test/db/hsqldb.rb
-test/db/informix.rb
-test/db/jdbc.rb
-test/db/jndi_config.rb
-test/db/logger.rb
-test/db/mssql.rb
-test/db/mysql.rb
-test/db/oracle.rb
-test/db/postgres.rb
-test/db/sqlite3.rb
 test/db2_simple_test.rb
 test/derby_migration_test.rb
 test/derby_multibyte_test.rb
@@ -63,55 +101,82 @@ test/has_many_through.rb
 test/helper.rb
 test/hsqldb_simple_test.rb
 test/informix_simple_test.rb
-test/jdbc_adapter/jdbc_db2_test.rb
-test/jdbc_adapter/jdbc_sybase_test.rb
 test/jdbc_common.rb
 test/jndi_callbacks_test.rb
 test/jndi_test.rb
 test/manualTestDatabase.rb
-test/minirunit/testConnect.rb
-test/minirunit/testH2.rb
-test/minirunit/testHsqldb.rb
-test/minirunit/testLoadActiveRecord.rb
-test/minirunit/testMysql.rb
-test/minirunit/testRawSelect.rb
-test/minirunit.rb
-test/models/add_not_null_column_to_table.rb
-test/models/auto_id.rb
-test/models/data_types.rb
-test/models/entry.rb
-test/models/mixed_case.rb
-test/models/reserved_word.rb
-test/models/validates_uniqueness_of_string.rb
+test/mssql_db_create_test.rb
+test/mssql_identity_insert_test.rb
+test/mssql_legacy_types_test.rb
+test/mssql_limit_offset_test.rb
+test/mssql_multibyte_test.rb
 test/mssql_simple_test.rb
 test/mysql_db_create_test.rb
+test/mysql_info_test.rb
 test/mysql_multibyte_test.rb
 test/mysql_nonstandard_primary_key_test.rb
 test/mysql_simple_test.rb
 test/oracle_simple_test.rb
+test/oracle_specific_test.rb
+test/pick_rails_version.rb
 test/postgres_db_create_test.rb
+test/postgres_drop_db_test.rb
 test/postgres_mixed_case_test.rb
 test/postgres_nonseq_pkey_test.rb
 test/postgres_reserved_test.rb
+test/postgres_schema_search_path_test.rb
 test/postgres_simple_test.rb
+test/postgres_table_alias_length_test.rb
 test/simple.rb
 test/sqlite3_simple_test.rb
 test/sybase_jtds_simple_test.rb
-lib/jdbc_adapter/jdbc.rake
-src/java/jdbc_adapter/JdbcAdapterInternalService.java
-src/java/jdbc_adapter/JdbcConnectionFactory.java
-src/java/jdbc_adapter/JdbcDerbySpec.java
-src/java/jdbc_adapter/JdbcMySQLSpec.java
-src/java/jdbc_adapter/MssqlRubyJdbcConnection.java
-src/java/jdbc_adapter/PostgresRubyJdbcConnection.java
-src/java/jdbc_adapter/RubyJdbcConnection.java
-src/java/jdbc_adapter/SQLBlock.java
-src/java/jdbc_adapter/Sqlite3RubyJdbcConnection.java
+test/activerecord/connection_adapters/type_conversion_test.rb
+test/activerecord/connections/native_jdbc_mysql/connection.rb
+test/db/db2.rb
+test/db/derby.rb
+test/db/h2.rb
+test/db/hsqldb.rb
+test/db/informix.rb
+test/db/jdbc.rb
+test/db/jndi_config.rb
+test/db/logger.rb
+test/db/mssql.rb
+test/db/mysql.rb
+test/db/oracle.rb
+test/db/postgres.rb
+test/db/sqlite3.rb
+test/models/add_not_null_column_to_table.rb
+test/models/auto_id.rb
+test/models/data_types.rb
+test/models/entry.rb
+test/models/mixed_case.rb
+test/models/reserved_word.rb
+test/models/string_id.rb
+test/models/validates_uniqueness_of_string.rb
+lib/arjdbc/jdbc/jdbc.rake
+src/java/arjdbc/derby/DerbyModule.java
+src/java/arjdbc/h2/H2RubyJdbcConnection.java
+src/java/arjdbc/informix/InformixRubyJdbcConnection.java
+src/java/arjdbc/jdbc/AdapterJavaService.java
+src/java/arjdbc/jdbc/JdbcConnectionFactory.java
+src/java/arjdbc/jdbc/RubyJdbcConnection.java
+src/java/arjdbc/jdbc/SQLBlock.java
+src/java/arjdbc/mssql/MssqlRubyJdbcConnection.java
+src/java/arjdbc/mysql/MySQLModule.java
+src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java
+src/java/arjdbc/oracle/OracleRubyJdbcConnection.java
+src/java/arjdbc/postgresql/PostgresqlRubyJdbcConnection.java
+src/java/arjdbc/sqlite3/Sqlite3RubyJdbcConnection.java
 rakelib/compile.rake
+rakelib/db.rake
 rakelib/package.rake
 rakelib/rails.rake
 rakelib/test.rake
 rails_generators/jdbc_generator.rb
 rails_generators/templates
-rails_generators/templates/jdbc.rake
-rails_generators/templates/jdbc.rb
+rails_generators/templates/config
+rails_generators/templates/lib
+rails_generators/templates/config/initializers
+rails_generators/templates/config/initializers/jdbc.rb
+rails_generators/templates/lib/tasks
+rails_generators/templates/lib/tasks/jdbc.rake

data/README.txt

@@ -2,39 +2,11 @@ activerecord-jdbc-adapter is a database adapter for Rails' ActiveRecord
 component that can be used with JRuby[http://www.jruby.org/]. It allows use of
 virtually any JDBC-compliant database with your JRuby on Rails application.
 
-== Project Info
-
-* Mailing Lists: http://kenai.com/projects/activerecord-jdbc/lists
-* Issues: http://kenai.com/jira/browse/ACTIVERECORD_JDBC
-* Source: git://kenai.com/activerecord-jdbc~main 
-  	  git://github.com/nicksieger/activerecord-jdbc-adapter.git
-
 == Databases
 
-What's there, and what is not there:
-
-* MySQL - Complete support
-* PostgreSQL - Complete support
-* Oracle - Complete support
-* Microsoft SQL Server - Complete support except for change_column_default
-* DB2 - Complete, except for the migrations:
-  * change_column 
-  * change_column_default
-  * remove_column
-  * rename_column
-  * add_index
-  * remove_index
-  * rename_table
-* FireBird - Complete, except for change_column_default and rename_column
-* Derby - Complete, except for:
-  * change_column
-  * change_column_default
-  * remove_column
-  * rename_column
-* HSQLDB - Complete
-* H2 - Complete
-* SQLite3 - work in progress
-* Informix - Fairly complete support, all tests pass and migrations appear to work.  Comments welcome.
+Activerecord-jdbc-adapter provides full or nearly full support for:
+MySQL, PostgreSQL, SQLite3, Oracle, Microsoft SQL Server, DB2,
+FireBird, Derby, HSQLDB, H2, and Informix.
 
 Other databases will require testing and likely a custom configuration module.
 Please join the activerecord-jdbc
@@ -48,43 +20,45 @@ support for more databases.
 To use activerecord-jdbc-adapter with JRuby on Rails:
 
 1. Choose the adapter you wish to gem install. The following pre-packaged
-   adapters are available:
+adapters are available:
 
   * base jdbc (<tt>activerecord-jdbc-adapter</tt>). Supports all available databases via JDBC, but requires you to download and manually install the database vendor's JDBC driver .jar file.
   * mysql (<tt>activerecord-jdbcmysql-adapter</tt>)
   * postgresql (<tt>activerecord-jdbcpostgresql-adapter</tt>)
+  * sqlite3 (<tt>activerecord-jdbcsqlite3-adapter</tt>)
   * derby (<tt>activerecord-jdbcderby-adapter</tt>)
   * hsqldb (<tt>activerecord-jdbchsqldb-adapter</tt>)
   * h2 (<tt>activerecord-jdbch2-adapter</tt>)
-  * sqlite3 (<tt>activerecord-jdbcsqlite3-adapter</tt>)
+  * mssql (<tt>activerecord-jdbcmssql-adapter</tt>)
 
-2. Run the "jdbc" generator to prepare your Rails application for
-   JDBC.
+2a. For Rails 3, if you're generating a new application, use the
+following command to generate your application:
 
-    jruby script/generate jdbc
-    
-   The initializer and rake task files generated are guarded such that
-   they won't be loaded if you still run your application un C Ruby.
-
-   Legacy: If you're using Rails prior to version 2.0, you'll need to
-   add one-time setup to your config/environment.rb file in your Rails
-   application. Add the following lines just before the
-   <code>Rails::Initializer</code>. (If you're using
-   activerecord-jdbc-adapter under the old gem name used in versions
-   0.5 and earlier (ActiveRecord-JDBC), replace
-   'activerecord-jdbc-adapter' with 'ActiveRecord-JDBC' below.)
-
-    if RUBY_PLATFORM =~ /java/
-      require 'rubygems'
+   jruby -S rails new sweetapp -m http://jruby.org/rails3.rb
+
+2b. Otherwise, you'll need to perform some extra configuration steps
+to prepare your Rails application for JDBC.
+
+If you're using Rails 3, you'll need to modify your Gemfile to use the
+activerecord-jdbc-adapter gem under JRuby. Change your Gemfile to look
+like the following (using sqlite3 as an example):
+
+    if defined?(JRUBY_VERSION)
       gem 'activerecord-jdbc-adapter'
-      require 'jdbc_adapter'
+      gem 'jdbc-sqlite3'
+    else
+      gem 'sqlite3-ruby', :require => 'sqlite3'
     end
 
+If you're using Rails 2:
+
+    jruby script/generate jdbc
+
 3. Configure your database.yml in the normal Rails style. 
 
-   Legacy configuration: If you use one of the convenience
-   'activerecord-jdbcXXX-adapter' adapters, you can still put a 'jdbc'
-   prefix in front of the databas adapter name as below.
+Legacy configuration: If you use one of the convenience
+'activerecord-jdbcXXX-adapter' adapters, you can still put a 'jdbc'
+prefix in front of the database adapter name as below.
 
     development:
       adapter: jdbcmysql
@@ -93,8 +67,8 @@ To use activerecord-jdbc-adapter with JRuby on Rails:
       hostname: localhost
       database: weblog_development
 
-   For other databases, you'll need to know the database driver class
-   and URL. Example:
+For other databases, you'll need to know the database driver class and
+URL. Example:
 
     development:
       adapter: jdbc
@@ -103,33 +77,32 @@ To use activerecord-jdbc-adapter with JRuby on Rails:
       driver: com.mysql.jdbc.Driver
       url: jdbc:mysql://localhost:3306/weblog_development
 
+   For JNDI data sources, you may simply specify the JNDI location as follows
+   (the adapter will be automatically detected):
+
+    production:
+      adapter: jdbc
+      jndi: jdbc/mysqldb
+
 === Standalone, with ActiveRecord
 
 1. Install the gem with JRuby:
 
     jruby -S gem install activerecord-jdbc-adapter
 
-   If you wish to use the adapter for a specific database, you can install it
-   directly and a driver gem will be installed as well:
+If you wish to use the adapter for a specific database, you can
+install it directly and a driver gem will be installed as well:
 
     jruby -S gem install activerecord-jdbcderby-adapter
 
-2. If using ActiveRecord 2.0 (Rails 2.0) or greater, you can skip to the next
-   step. Otherwise, ensure the following code gets executed in your script:
-
-    require 'rubygems'
-    gem 'activerecord-jdbc-adapter'
-    require 'jdbc_adapter'
-    require 'active_record'
-
-3. After this you can establish a JDBC connection like this:
+2. After this you can establish a JDBC connection like this:
 
     ActiveRecord::Base.establish_connection(
       :adapter => 'jdbcderby',
       :database => "db/my-database"
     )
 
-   or like this (but requires that you manually put the driver jar on the classpath):
+or like this (but requires that you manually put the driver jar on the classpath):
 
     ActiveRecord::Base.establish_connection(
       :adapter => 'jdbc',
@@ -137,6 +110,15 @@ To use activerecord-jdbc-adapter with JRuby on Rails:
       :url => 'jdbc:derby:test_ar;create=true'
     )
 
+== Extending AR-JDBC
+
+You can create your own extension to AR-JDBC for a JDBC-based database
+that core AR-JDBC does not support. We've created an example project
+for the Intersystems Cache database that you can examine as a
+template. See the project for more information at the following URL:
+
+  http://github.com/nicksieger/activerecord-cachedb-adapter
+
 == Getting the source
 
 The source for activerecord-jdbc-adapter is available using git.
@@ -149,12 +131,22 @@ Please file bug reports at
 http://kenai.com/jira/browse/ACTIVERECORD_JDBC. If you're not sure if
 something's a bug, feel free to pre-report it on the mailing lists.
 
+== Project Info
+
+* Mailing Lists: http://kenai.com/projects/activerecord-jdbc/lists
+* Issues: http://kenai.com/jira/browse/ACTIVERECORD_JDBC
+* Source:
+ git://github.com/nicksieger/activerecord-jdbc-adapter.git
+ git://kenai.com/activerecord-jdbc~main 
+
 == Running AR-JDBC's Tests
 
-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 an empty password.
+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 an empty password. You
+alse need to grant "blog" create privileges on
+'test_rake_db_create.*'.
 
 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