activerecord-jdbc-adapter 1.2.5 → 1.2.8

data/.gitignore

@@ -19,3 +19,4 @@ patches*
 /jndi_test/jdbc/.bindings
 target
 test/jars
+coverage

data/.travis.yml

@@ -6,10 +6,13 @@ rvm:
 env:
   - DB=mysql
   - DB=postgresql
+  - DB=sqlite3
+  # derby - tested with test_jndi
+  #- DB=derby
   - DB=h2
   - DB=hsqldb
-  - DB=sqlite3
   - DB=jndi
+  - DB=jdbc
 gemfile:
   - gemfiles/rails23.gemfile
   - gemfiles/rails30.gemfile
@@ -18,6 +21,7 @@ gemfile:
 branches:
   only:
     - master
+    - 1-2-stable
 matrix:
   allow_failures:
     - gemfile: gemfiles/rails23.gemfile

data/Appraisals

@@ -1,16 +1,16 @@
 appraise "rails23" do
-  gem "activerecord", "~> 2.3.14"
-  gem "rails", "~> 2.3.14"
+  gem "activerecord", "~> 2.3.16"
+  gem "rails", "~> 2.3.16"
 end
 
 appraise "rails30" do
-  gem "activerecord", "~> 3.0.17"
+  gem "activerecord", "~> 3.0.20"
 end
 
 appraise "rails31" do
-  gem "activerecord", "~> 3.1.8"
+  gem "activerecord", "~> 3.1.10"
 end
 
 appraise "rails32" do
-  gem "activerecord", "~> 3.2.9"
+  gem "activerecord", "~> 3.2.11"
 end

data/Gemfile

@@ -11,4 +11,12 @@ gem 'appraisal'
 gem 'rake', :require => nil
 # appraisal ignores group block declarations :
 gem 'test-unit', :group => :test
-gem 'mocha', :group => :test
+gem 'mocha', :require => nil, :group => :test # '>= 0.13.0'
+gem 'simplecov', :require => nil, :group => :test
+gem 'bcrypt-ruby', '~> 3.0.0', :require => nil, :group => :test
+
+group :rails do
+  gem 'erubis', :require => nil
+  # NOTE: due rails/activerecord/test/cases/session_store/session_test.rb
+  gem 'actionpack', :require => nil
+end

data/Gemfile.lock

@@ -1,32 +1,52 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.9)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     appraisal (0.5.1)
       bundler
       rake
     arel (3.0.2)
+    bcrypt-ruby (3.0.1)
+    bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.4)
     columnize (0.3.6)
+    erubis (2.7.0)
+    hike (1.2.1)
     i18n (0.6.1)
-    jruby-openssl (0.7.7)
+    journey (1.0.4)
+    jruby-openssl (0.8.2)
       bouncy-castle-java (>= 1.5.0146.1)
     linecache (0.46-java)
     metaclass (0.0.1)
-    mocha (0.11.4)
+    mocha (0.13.2)
       metaclass (~> 0.0.1)
-    multi_json (1.3.7)
+    multi_json (1.5.0)
+    rack (1.4.4)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.2)
+      rack (>= 1.0)
     rake (10.0.3)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
@@ -34,17 +54,31 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     ruby-debug-base (0.10.4-java)
-    test-unit (2.5.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    test-unit (2.5.4)
+    tilt (1.3.3)
     tzinfo (0.3.35)
 
 PLATFORMS
   java
 
 DEPENDENCIES
+  actionpack
   activerecord
   appraisal
+  bcrypt-ruby (~> 3.0.0)
+  erubis
   jruby-openssl
   mocha
   rake
   ruby-debug
+  simplecov
   test-unit

data/History.txt

@@ -1,3 +1,127 @@
+== 1.2.8 (03/13/13)
+
+- [derby] (native) types review & cleanup, externalize AR patch-ing
+- [h2] correct schema dump (jdbc detected sql types)
+- [hsqldb] correct schema dump (jdbc detected sql types)
+- cleanup H2 / HSQLDB adapter - HSQLDB should not know about H2
+- [mssql] [oracle] [db2] [derby] remove_column 3.x compatibility
+- [sqlite3] setup native types + make sure tables accepts table_name as well
+- [mysql] version + support_"feature" (as Rails)
+- jdbc_connection unwrap parameter for unwrapping (pooled) connections
+- (native) connection #columns #columns_internal expects string table_name
+- [postgres] no need to clear_query_cache after insert on AR-2.3's #insert_sql
+- there's still a double bind when "raw" crud methods used (re-closing #322)
+
+== 1.2.7 (02/12/13)
+
+- add some (probably redundant) synchronization + "arjdbc.disconnect.debug" flag
+  as an attempt to detect when connection is set to null (#197 and #198)
+  avoid (deprecated) Java.java_to_ruby when wrapping java.sql.Connection
+- follow Column-naming convention in MySQL adapter ArJdbc module
+- make sure update_sql is public in mysql adapter (Rails compatibility)
+- fix 1.2.6 regression - incorrectly setup to_sql method based on Rails version 
+  this caused double '?' bind substitution issues (#322)
+
+== 1.2.6 (01/31/13)
+
+- [postgres] only set --schema (to search path) for pg_dump if configured (#315)
+- [oracle] id limits + quoting; current user/db/schema + savepoint support
+- execute "log" (sql) name correctly based on AR version 
+- deprecate substitute_binds and extract_sql 
+- [derby] make sure we never modify the passed sql param
+- [sqlite3] execute on insert_sql + savepoint support
+- [mssql] [firebird] [informix] (shared) serialized attribute support
+- [oracle] (shared) serialized attribute support
+- [sqlite3] fix binary column handling failure (#51)
+- renamed Sqlite3RubyJdbcConnection to SQLite3RubyJdbcConnection
+- [mysql] re-define remove_index! for "better" AR-2.3 compatibility
+- [derby] avoid failures with #quote when second arg nil + keep string encoding
+- [db2] binary support & improved quoting + 
+  use lob callback for all since it was failing on BLOB/CLOB inserts otherwise
+- [db2] better (simplified) type handling for DB2
+- JRuby 1.6.8 compatibility when rescue-ing Java exception
+- [mysql] avoid encoding issues with MySQL's quoting methods (#185)
+- [postgres] ignore binary precision / limit for bytea
+- [oracle] explain (query) support
+- [oracle] since Oracle supports TIMESTAMP for quite a while we should not 
+  create DATE columns for a :timestamp column type
+- [oracle] avoid CREATE DDL failure when BLOB has length specified
+- [jdbc-] review autoloading backwards-incompatible change in jdbc- gems 
+  auto-load (backwards-compat) can be enabled back using jdbc.driver.autoload
+  system property or using the driver specific autoload option as well
+- [jdbc-] Update version handling introduce DRIVER_VERSION constant
+- [oracle] should support WITH statements (as SELECTs)
+- expose select? and insert? helpers on JdbcAdapter class
+- [postgres] bug in create_database without options (#306)
+- [db2] correct DB2 schema selection (when as400 url has parameters)
+- [db2] DB2 becomes a first-class citizen (adapter) `adapter: db2`
+- [h2] [hsqldb] explain support for H2 and HSQLDB
+- [db2] column should be checked if ain't nil when quoting on DB2
+- [mssql] raise exception when offset is specified but limit is not
+- [sqlite3] SQLite3 explain support (Rails style)
+- [postgres] (re-usable) explain support for PostgreSQL (based on Rails)
+- [h2] update handling of time fields on H2/HSQLDB (#252)
+- rescue (and wrap) only SQLExceptions from driver.connect this caused 
+  swallowing of runtime exceptions from JDBC drivers
+- support for setting (custom) jdbc driver properties in config
+- when a new adapter (constant) gets loaded column types should pick it up
+- [jdbc-derby] updated to 10.8.3.0
+- raise LoadError with explanation on with jTDS 1.3.0 on non Java 1.7
+- setup the connection methods when adapter is loaded (broken in 1.2.5)
+
+== 1.2.5 (01/02/13)
+
+- backwards compat with older jdbc- (driver) gems (#279)
+- no need to set the :driver for jndi config (did not work anyways) when jdbc is being 
+  configured + do not raise if there's a :driver_instance setup instead of the :driver
+- support extra options with recreate_database (for postgres)
+- [jdbc-derby] update Derby to 10.8.2.2
+- [jdbc-h2] update H2 to 1.3.170
+- no need for poluting Kernel (#jdbc_require_driver) anymore
+- [sqlite3] updated sqlite3 binary handling
+- [jdbc-jtds] upgrade to jtds (driver) 1.3.0
+- JDBC driver names should be on one (re-usable) place
+- make sure that (jdbc-xxx gem) .jars are only loaded (required) when first connection 
+  is attempted (this avoids e.g. sqlite-jdbc.jar being always among loaded features)
+- jdbc-* gems should expose the driver_jar instead of (auto) loading it
+- [oracle] adding in_clause_limit override to properly handle Oracle's 1000 entry limit
+- [jdbc-mysql] upgrade to mysql connector 5.1.22
+- [jdbc-postgres] upgade to postgresql-9.2 jar version 9.2-1002
+- [postgres] fix standard_conforming_strings's default not being set and 
+  backslash escaping to account for standard_conforming_strings
+- [jdbc-postgres] upgrade to postgres.jar 9.1.903 driver
+- [jdbc-h2] update h2.jar to 1.3.168
+- [postgres] use newer hex-encoding for postgresql >= 9.0
+- [postgres] use updated postgres string escaping for byte arrays
+- [hsqldb] fix binary data quoting
+- [jdbc-hsqldb] update hsqldb.jar to 2.2.9
+- [db2] if guessing the date or time fails return the value
+- [db2] fix crasher regression on dump of primary keys
+- [db2] fix change_column always executing as as400
+- [db2] add support for primary keys to structure_dump
+- [db2] detect identity columns in db2 structure_dump
+- [mysql] added support for Rails 3.2 explain feature (#159)
+- add support for DB_STRUCTURE in db:structure:dump 
+  (and db:structure:load task) (#203)
+- [postgres] rename sequence during table rename
+- [db2] iseries returns date with two digit year - leave it as string
+- [mssql] fix pessimistic locking
+- [mssql] fix row_number errors on SQL Server 2000
+- [db2] support WITH statements in select
+- [db2] use DECIMAL(1) for boolean fields
+- [db2] fetch a sequence value manually for tables with no identity columns
+- [postgres] add support for template in PostgreSQLAdapter
+- [db2] add recognition of MQTs and ALIASes as table types for DB2
+- [postgres] remove count distinct restriction to match native ruby adapter
+- [mssql] pull back primary key using table name via AR
+- [db2] return nil if using jndi and schema/user is not set
+- fixed support for AR 3.2.1
+- [postgres] implemented dynamic search path management
+
+== 1.2.2.1 (10/18/12)
+
+- [postgresql] fix regression on insert for Rails 2.3 (#173)
+
 == 1.2.2 (01/27/12)
 
 - Thanks George Murphy and Dwayne Litzenberger for their significant
@@ -234,7 +358,7 @@
 - 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�)
+  MySQL (Joakim Kolsj�)
 - Rails 3.0.0.beta2 compatibility
 - Return of Derby, H2, Hsqldb support (requires AR >= 3.0.0.beta2)
 
@@ -325,7 +449,7 @@
   actual maximum size of the JNDI connection pool. (We'll look at how
   to eliminate the need to configure AR's pool in the future.)
 - NEW! Informix support courtesy of Javier Fernandez-Ivern.
-- Backport another Oracle CLOB issue, thanks Edson C�sar.
+- Backport another Oracle CLOB issue, thanks Edson C�sar.
 - Rubyforge #22018: chomp final trailing semicolon for oracle
 - JRUBY-2848: Fix NPE error in set_native_database_types
 - Rework oracle lob saving callback to be Rails 2.1 friendly (assist

data/README.md

@@ -0,0 +1,246 @@
+# ActiveRecord JDBC Adapter
+
+ActiveRecord-JDBC-Adapter (AR-JDBC) is a database adapter for Rails' 
+*ActiveRecord* component that can be used with [JRuby][0]. It allows use of 
+virtually any JDBC-compliant database with your JRuby on Rails application.
+
+AR-JDBC **1.2.x** officially supports ActiveRecord 3.x as well as 2.3, it's 
+latest version is compatible with JRuby 1.6.8+ (but as always we recommend to 
+use the latest and greatest of JRubies) thus requires Java 1.6 at minimum.
+
+## Databases
+
+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 JRuby [mailing list][1] to help us discover support for more 
+databases.
+
+## Using ActiveRecord JDBC
+
+### Inside Rails
+
+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 :
+
+  - Base JDBC (`activerecord-jdbc-adapter`) - supports all available databases via
+    JDBC, but requires you to download and manually setup the database vendor's
+    JDBC driver .jar file.
+  - MySQL (`activerecord-jdbcmysql-adapter`)
+  - PostgreSQL (`activerecord-jdbcpostgresql-adapter`)
+  - SQLite3 (`activerecord-jdbcsqlite3-adapter`)
+  - Derby (`activerecord-jdbcderby-adapter`)
+  - HSQLDB (`activerecord-jdbchsqldb-adapter`)
+  - H2 (`activerecord-jdbch2-adapter`)
+  - MSSQL (`activerecord-jdbcmssql-adapter`) - does not support SQL Azure by default,
+    see the [README][2] for more information.
+
+2a. For Rails 3, if you're generating a new application, use the
+following command to generate your application:
+
+    jruby -S rails new sweetapp
+
+2b. Otherwise, you might 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) :
+
+```ruby
+gem 'sqlite3', :platform => :ruby
+
+platforms :jruby do
+  gem 'jruby-openssl'
+  gem 'activerecord-jdbcsqlite3-adapter'
+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 database adapter name e.g. :
+
+```yml
+development:
+  adapter: jdbcmysql
+  username: blog
+  password:
+  host: localhost
+  database: weblog_development
+```
+
+For plain JDBC database configurations, you'll need to know the database driver 
+class and URL (do not forget to put the driver jar on the class-path) e.g. :
+
+```yml
+development:
+  adapter: jdbc
+  username: blog
+  password:
+  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 
+correct adapter type will be automatically detected) :
+
+```yml
+production:
+  adapter: jdbc
+  jndi: jdbc/mysqldb
+```
+
+JDBC driver specific properties might be set if you use an URL to specify the DB
+or using the *properties:* syntax (since AR-JDBC **1.2.6**) :
+
+```yml
+production:
+  adapter: mysql
+  username: blog
+  password: blog
+  url: "jdbc:mysql://localhost:3306/weblog?profileSQL=true"
+  properties: # specific to com.mysql.jdbc.Driver
+    socketTimeout:  60000
+    connectTimeout: 60000
+```
+
+If you're really old school you might want to use AR-JDBC with a DB2 on z/OS :
+
+```yml
+development:
+  adapter: jdbc
+  encoding: unicode
+  url: jdbc:db2j:net://mightyzoshost:446/RAILS_DBT1
+  driver: com.ibm.db2.jcc.DB2Driver
+  schema: DB2XB12
+  database: RAILS_DB1
+  tablespace: TSDE911
+  lob_tablespaces:
+    first_table: TSDE912
+  username: scott
+  password: lion
+```
+
+### 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 the driver gem (dependency) will be installed as well :
+
+    jruby -S gem install activerecord-jdbcderby-adapter
+
+2. After this you can establish a JDBC connection like this :
+
+```ruby
+ActiveRecord::Base.establish_connection(
+  :adapter => 'derby', # or 'jdbcderby'
+  :database => "db/my-database"
+)
+```
+
+or like (but requires that you manually put the driver jar on the classpath) :
+
+```ruby
+ActiveRecord::Base.establish_connection(
+  :adapter => 'jdbc',
+  :driver => 'org.apache.derby.jdbc.EmbeddedDriver',
+  :url => 'jdbc:derby:sample_db;create=true'
+)
+```
+
+## Source
+
+The source for activerecord-jdbc-adapter is available using git :
+
+    git clone git://github.com/jruby/activerecord-jdbc-adapter.git
+
+Please note that the project manages multiple gems from a single repository,
+if you're using *Bundler* 1.2 it should be able to locate all gemspecs from
+the git repository. Sample *Gemfile* for running with (MySQL) master :
+
+```ruby
+gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter'
+gem 'activerecord-jdbcmysql-adapter', :github => 'jruby/activerecord-jdbc-adapter'
+gem 'jdbc-mysql', :github => 'jruby/activerecord-jdbc-adapter'
+```
+
+## Running AR-JDBC Tests
+
+[![Build Status][9]](http://travis-ci.org/#!/jruby/activerecord-jdbc-adapter)
+
+Drivers for 6 open-source databases are included. Provided you have
+MySQL installed, you can simply type `jruby -S rake` to run the tests.
+A database named *weblog_development* 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
+*weblog_development* and a user named "blog" with an empty password.
+You can control the host and port the tests will attempt to by setting
+the environment variables `PGHOST` and `PGPORT`.
+
+To execute a single test case, you can run:
+
+    rake appraisal:{version} test_{db} TEST=test/{tests_file}
+
+Substitute the *version* of ActiveRecord for version, which can be one of :
+  *rails23*, *rails30*, *rails31*, or *rails32*.
+
+The db can be one of these : *sqlite3*, *mysql*, *postgres*, 
+  *mssql*, *sybase*, *oracle*, *db2*, *derby*, *h2* or *hssql*.
+
+Finally, the *tests_file* will be whichever (.rb) test case you want to run.
+
+### Running AR Tests
+
+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 AR's sources :
+
+    jruby -S rake rails:test DRIVER=mysql RAILS=/path/rails_source_dir
+
+## 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 [cachedb-adapter project][4] for more information.
+
+## Feedback
+
+Please report bugs at our [issue tracker][3]. If you're not sure if 
+something's a bug, feel free to pre-report it on the [mailing lists][1] or
+ask on the #JRuby IRC channel on http://freenode.net/.
+
+## Authors
+
+This project was written by Nick Sieger <nick@nicksieger.com> and Ola Bini
+<olabini@gmail.com> with lots of help from the JRuby community.
+
+## License
+
+ActiveRecord-JDBC-Adapter is released under the BSD/MIT license. 
+See the LICENSE.txt file included with the distribution for details.
+
+Open-source driver gems within AR-JDBC's sources are licensed under the same 
+license the database's drivers are licensed. See each driver gem's LICENSE.txt.
+
+[0]: http://www.jruby.org/
+[1]: http://jruby.org/community
+[2]: http://github.com/jruby/activerecord-jdbc-adapter/blob/master/activerecord-jdbcmssql-adapter
+[3]: https://github.com/jruby/activerecord-jdbc-adapter/issues
+[4]: http://github.com/nicksieger/activerecord-cachedb-adapter
+[9]: https://secure.travis-ci.org/jruby/activerecord-jdbc-adapter.png