RubyGems - activerecord-jdbc-adapter - Versions diffs - 1.3.0.beta2 → 1.3.0.rc1 - Mend

activerecord-jdbc-adapter 1.3.0.beta2 → 1.3.0.rc1

Files changed (282) hide show

data/.gitignore +14 -8
data/.travis.yml +40 -31
data/.yardopts +4 -0
data/Appraisals +2 -5
data/CONTRIBUTING.md +46 -0
data/Gemfile +21 -4
data/Gemfile.lock +42 -17
data/{History.txt → History.md} +142 -75
data/README.md +102 -104
data/RUNNING_TESTS.md +76 -0
data/Rakefile.jdbc +20 -0
data/activerecord-jdbc-adapter.gemspec +35 -18
data/gemfiles/rails23.gemfile +4 -3
data/gemfiles/rails23.gemfile.lock +9 -6
data/gemfiles/rails30.gemfile +4 -3
data/gemfiles/rails30.gemfile.lock +9 -6
data/gemfiles/rails31.gemfile +4 -3
data/gemfiles/rails31.gemfile.lock +9 -6
data/gemfiles/rails32.gemfile +4 -3
data/gemfiles/rails32.gemfile.lock +17 -14
data/gemfiles/rails40.gemfile +5 -5
data/gemfiles/rails40.gemfile.lock +17 -69
data/lib/active_record/connection_adapters/firebird_adapter.rb +1 -0
data/lib/active_record/connection_adapters/sqlserver_adapter.rb +1 -0
data/lib/arel/visitors/compat.rb +22 -3
data/lib/arel/visitors/db2.rb +8 -4
data/lib/arel/visitors/derby.rb +14 -13
data/lib/arel/visitors/firebird.rb +5 -4
data/lib/arel/visitors/hsqldb.rb +11 -9
data/lib/arel/visitors/sql_server.rb +89 -61
data/lib/arjdbc.rb +1 -1
data/lib/arjdbc/db2/adapter.rb +181 -212
data/lib/arjdbc/db2/as400.rb +31 -18
data/lib/arjdbc/db2/column.rb +167 -0
data/lib/arjdbc/db2/connection_methods.rb +2 -0
data/lib/arjdbc/derby/adapter.rb +206 -107
data/lib/arjdbc/derby/connection_methods.rb +4 -9
data/lib/arjdbc/firebird.rb +1 -0
data/lib/arjdbc/firebird/adapter.rb +202 -64
data/lib/arjdbc/firebird/connection_methods.rb +20 -0
data/lib/arjdbc/h2/adapter.rb +56 -36
data/lib/arjdbc/hsqldb/adapter.rb +99 -68
data/lib/arjdbc/jdbc/adapter.rb +474 -265
data/lib/arjdbc/jdbc/adapter_java.jar +0 -0
data/lib/arjdbc/jdbc/adapter_require.rb +8 -7
data/lib/arjdbc/jdbc/arel_support.rb +132 -0
data/lib/arjdbc/jdbc/base_ext.rb +8 -7
data/lib/arjdbc/jdbc/callbacks.rb +16 -10
data/lib/arjdbc/jdbc/column.rb +25 -3
data/lib/arjdbc/jdbc/connection.rb +28 -55
data/lib/arjdbc/jdbc/extension.rb +14 -14
data/lib/arjdbc/jdbc/java.rb +6 -3
data/lib/arjdbc/jdbc/jdbc.rake +1 -1
data/lib/arjdbc/jdbc/quoted_primary_key.rb +2 -2
data/lib/arjdbc/jdbc/rake_tasks.rb +1 -1
data/lib/arjdbc/jdbc/type_converter.rb +5 -2
data/lib/arjdbc/mssql/adapter.rb +160 -280
data/lib/arjdbc/mssql/column.rb +182 -0
data/lib/arjdbc/mssql/connection_methods.rb +37 -4
data/lib/arjdbc/mssql/explain_support.rb +13 -21
data/lib/arjdbc/mssql/limit_helpers.rb +79 -42
data/lib/arjdbc/mssql/lock_methods.rb +77 -0
data/lib/arjdbc/mssql/utils.rb +11 -11
data/lib/arjdbc/mysql/adapter.rb +165 -247
data/lib/arjdbc/mysql/column.rb +123 -0
data/lib/arjdbc/mysql/connection_methods.rb +3 -6
data/lib/arjdbc/oracle/adapter.rb +282 -288
data/lib/arjdbc/oracle/column.rb +122 -0
data/lib/arjdbc/oracle/connection_methods.rb +3 -0
data/lib/arjdbc/postgresql/adapter.rb +336 -574
data/lib/arjdbc/postgresql/column.rb +458 -0
data/lib/arjdbc/postgresql/connection_methods.rb +1 -2
data/lib/arjdbc/postgresql/schema_creation.rb +38 -0
data/lib/arjdbc/sqlite3/adapter.rb +189 -145
data/lib/arjdbc/sqlite3/explain_support.rb +1 -1
data/lib/arjdbc/tasks/oracle/enhanced_structure_dump.rb +8 -8
data/lib/arjdbc/util/quoted_cache.rb +60 -0
data/lib/arjdbc/util/table_copier.rb +110 -0
data/lib/arjdbc/version.rb +6 -7
data/pom.xml +56 -2
data/rakelib/02-test.rake +72 -83
data/rakelib/db.rake +29 -17
data/src/java/arjdbc/ArJdbcModule.java +21 -18
data/src/java/arjdbc/db2/DB2RubyJdbcConnection.java +84 -12
data/src/java/arjdbc/derby/DerbyModule.java +140 -143
data/src/java/arjdbc/derby/DerbyRubyJdbcConnection.java +58 -7
data/src/java/arjdbc/h2/H2Module.java +43 -0
data/src/java/arjdbc/informix/InformixRubyJdbcConnection.java +7 -6
data/src/java/arjdbc/jdbc/RubyJdbcConnection.java +1223 -648
data/src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java +24 -23
data/src/java/arjdbc/mysql/MySQLModule.java +33 -32
data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java +147 -30
data/src/java/arjdbc/oracle/OracleModule.java +13 -13
data/src/java/arjdbc/oracle/OracleRubyJdbcConnection.java +114 -6
data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java +166 -36
data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java +101 -19
data/src/java/arjdbc/util/QuotingUtils.java +19 -19
metadata +240 -394
data/bench/bench_attributes.rb +0 -13
data/bench/bench_attributes_new.rb +0 -14
data/bench/bench_create.rb +0 -12
data/bench/bench_find_all.rb +0 -12
data/bench/bench_find_all_mt.rb +0 -25
data/bench/bench_model.rb +0 -85
data/bench/bench_new.rb +0 -12
data/bench/bench_new_valid.rb +0 -12
data/bench/bench_valid.rb +0 -13
data/lib/arel/engines/sql/compilers/db2_compiler.rb +0 -9
data/lib/arel/engines/sql/compilers/derby_compiler.rb +0 -6
data/lib/arel/engines/sql/compilers/h2_compiler.rb +0 -6
data/lib/arel/engines/sql/compilers/hsqldb_compiler.rb +0 -15
data/lib/arel/engines/sql/compilers/jdbc_compiler.rb +0 -6
data/lib/arel/engines/sql/compilers/mssql_compiler.rb +0 -46
data/lib/arjdbc/jdbc/missing_functionality_helper.rb +0 -98
data/lib/arjdbc/mssql/lock_helpers.rb +0 -76
data/lib/arjdbc/mssql/tsql_methods.rb +0 -58
data/lib/arjdbc/postgresql/column_cast.rb +0 -134
data/test/activerecord/connections/native_jdbc_mysql/connection.rb +0 -25
data/test/activerecord/jall.sh +0 -7
data/test/activerecord/jtest.sh +0 -3
data/test/assets/flowers.jpg +0 -0
data/test/binary.rb +0 -67
data/test/db/db2.rb +0 -43
data/test/db/db2/binary_test.rb +0 -6
data/test/db/db2/has_many_through_test.rb +0 -6
data/test/db/db2/rake_test.rb +0 -82
data/test/db/db2/rake_test_data.sql +0 -35
data/test/db/db2/reset_column_information_test.rb +0 -5
data/test/db/db2/serialize_test.rb +0 -6
data/test/db/db2/simple_test.rb +0 -81
data/test/db/db2/test_helper.rb +0 -6
data/test/db/db2/unit_test.rb +0 -73
data/test/db/derby.rb +0 -12
data/test/db/derby/binary_test.rb +0 -6
data/test/db/derby/migration_test.rb +0 -74
data/test/db/derby/rake_test.rb +0 -96
data/test/db/derby/reset_column_information_test.rb +0 -6
data/test/db/derby/row_locking_test.rb +0 -20
data/test/db/derby/schema_dump_test.rb +0 -5
data/test/db/derby/serialize_test.rb +0 -6
data/test/db/derby/simple_test.rb +0 -173
data/test/db/derby/test_helper.rb +0 -6
data/test/db/derby/unit_test.rb +0 -32
data/test/db/derby/xml_column_test.rb +0 -17
data/test/db/h2.rb +0 -11
data/test/db/h2/binary_test.rb +0 -6
data/test/db/h2/change_column_test.rb +0 -68
data/test/db/h2/identity_column_test.rb +0 -35
data/test/db/h2/offset_test.rb +0 -49
data/test/db/h2/rake_test.rb +0 -98
data/test/db/h2/schema_dump_test.rb +0 -29
data/test/db/h2/serialize_test.rb +0 -6
data/test/db/h2/simple_test.rb +0 -56
data/test/db/hsqldb.rb +0 -11
data/test/db/hsqldb/binary_test.rb +0 -6
data/test/db/hsqldb/rake_test.rb +0 -101
data/test/db/hsqldb/schema_dump_test.rb +0 -19
data/test/db/hsqldb/serialize_test.rb +0 -6
data/test/db/hsqldb/simple_test.rb +0 -17
data/test/db/informix.rb +0 -13
data/test/db/jdbc.rb +0 -16
data/test/db/jdbc_derby.rb +0 -14
data/test/db/jdbc_h2.rb +0 -17
data/test/db/jdbc_mysql.rb +0 -13
data/test/db/jdbc_postgres.rb +0 -23
data/test/db/jndi_config.rb +0 -32
data/test/db/jndi_pooled_config.rb +0 -32
data/test/db/mssql.rb +0 -11
data/test/db/mssql/binary_test.rb +0 -6
data/test/db/mssql/exec_proc_test.rb +0 -46
data/test/db/mssql/identity_insert_test.rb +0 -18
data/test/db/mssql/ignore_system_views_test.rb +0 -40
data/test/db/mssql/limit_offset_test.rb +0 -190
data/test/db/mssql/multibyte_test.rb +0 -16
data/test/db/mssql/multiple_connections_test.rb +0 -71
data/test/db/mssql/rake_test.rb +0 -143
data/test/db/mssql/reset_column_information_test.rb +0 -6
data/test/db/mssql/row_locking_test.rb +0 -7
data/test/db/mssql/serialize_test.rb +0 -6
data/test/db/mssql/simple_test.rb +0 -140
data/test/db/mssql/transaction_test.rb +0 -6
data/test/db/mssql/types_test.rb +0 -205
data/test/db/mssql/unit_test.rb +0 -249
data/test/db/mysql.rb +0 -4
data/test/db/mysql/_rails_test_mysql.32.out +0 -6585
data/test/db/mysql/binary_test.rb +0 -6
data/test/db/mysql/connection_test.rb +0 -51
data/test/db/mysql/index_length_test.rb +0 -58
data/test/db/mysql/multibyte_test.rb +0 -10
data/test/db/mysql/nonstandard_primary_key_test.rb +0 -39
data/test/db/mysql/rake_test.rb +0 -97
data/test/db/mysql/reset_column_information_test.rb +0 -6
data/test/db/mysql/schema_dump_test.rb +0 -228
data/test/db/mysql/serialize_test.rb +0 -6
data/test/db/mysql/simple_test.rb +0 -187
data/test/db/mysql/statement_escaping_test.rb +0 -46
data/test/db/mysql/transaction_test.rb +0 -6
data/test/db/mysql/types_test.rb +0 -30
data/test/db/mysql/unit_test.rb +0 -93
data/test/db/mysql_config.rb +0 -7
data/test/db/oracle.rb +0 -27
data/test/db/oracle/binary_test.rb +0 -6
data/test/db/oracle/limit_test.rb +0 -24
data/test/db/oracle/multibyte_test.rb +0 -22
data/test/db/oracle/rake_test.rb +0 -100
data/test/db/oracle/reset_column_information_test.rb +0 -6
data/test/db/oracle/serialize_test.rb +0 -6
data/test/db/oracle/simple_test.rb +0 -140
data/test/db/oracle/specific_test.rb +0 -180
data/test/db/oracle/transaction_test.rb +0 -31
data/test/db/oracle/unit_test.rb +0 -31
data/test/db/postgres.rb +0 -11
data/test/db/postgres/_rails_test_postgres.32.out +0 -6405
data/test/db/postgres/a_custom_primary_key_test.rb +0 -50
data/test/db/postgres/active_schema_unit_test.rb +0 -68
data/test/db/postgres/array_type_test.rb +0 -101
data/test/db/postgres/binary_test.rb +0 -6
data/test/db/postgres/connection_test.rb +0 -63
data/test/db/postgres/data_types_test.rb +0 -703
data/test/db/postgres/hstore_test.rb +0 -200
data/test/db/postgres/information_schema_leak_test.rb +0 -30
data/test/db/postgres/json_test.rb +0 -86
data/test/db/postgres/ltree_test.rb +0 -51
data/test/db/postgres/mixed_case_test.rb +0 -29
data/test/db/postgres/native_types_test.rb +0 -124
data/test/db/postgres/rake_test.rb +0 -117
data/test/db/postgres/reserved_test.rb +0 -22
data/test/db/postgres/reset_column_information_test.rb +0 -6
data/test/db/postgres/row_locking_test.rb +0 -21
data/test/db/postgres/schema_dump_test.rb +0 -95
data/test/db/postgres/schema_test.rb +0 -115
data/test/db/postgres/simple_test.rb +0 -260
data/test/db/postgres/table_alias_length_test.rb +0 -16
data/test/db/postgres/transaction_test.rb +0 -6
data/test/db/postgres/unit_test.rb +0 -31
data/test/db/postgres_config.rb +0 -10
data/test/db/sqlite3.rb +0 -6
data/test/db/sqlite3/_rails_test_sqlite3.32.out +0 -6274
data/test/db/sqlite3/has_many_though_test.rb +0 -6
data/test/db/sqlite3/rake_test.rb +0 -71
data/test/db/sqlite3/reset_column_information_test.rb +0 -6
data/test/db/sqlite3/schema_dump_test.rb +0 -6
data/test/db/sqlite3/serialize_test.rb +0 -6
data/test/db/sqlite3/simple_test.rb +0 -268
data/test/db/sqlite3/transaction_test.rb +0 -32
data/test/db/sqlite3/type_conversion_test.rb +0 -104
data/test/has_many_through.rb +0 -61
data/test/informix_simple_test.rb +0 -48
data/test/jdbc/db2.rb +0 -36
data/test/jdbc/oracle.rb +0 -34
data/test/jdbc_column_test.rb +0 -23
data/test/jdbc_common.rb +0 -16
data/test/jdbc_connection_test.rb +0 -196
data/test/jndi_callbacks_test.rb +0 -33
data/test/jndi_test.rb +0 -55
data/test/manualTestDatabase.rb +0 -191
data/test/models/add_not_null_column_to_table.rb +0 -9
data/test/models/auto_id.rb +0 -15
data/test/models/binary.rb +0 -18
data/test/models/custom_pk_name.rb +0 -15
data/test/models/data_types.rb +0 -40
data/test/models/entry.rb +0 -41
data/test/models/mixed_case.rb +0 -22
data/test/models/reserved_word.rb +0 -15
data/test/models/rights_and_roles.rb +0 -57
data/test/models/string_id.rb +0 -17
data/test/models/thing.rb +0 -17
data/test/models/topic.rb +0 -32
data/test/models/validates_uniqueness_of_string.rb +0 -19
data/test/rails/mysql.rb +0 -13
data/test/rails/sqlite3/version.rb +0 -6
data/test/rails_stub.rb +0 -31
data/test/rake_test_support.rb +0 -298
data/test/row_locking.rb +0 -102
data/test/schema_dump.rb +0 -182
data/test/serialize.rb +0 -275
data/test/shared_helper.rb +0 -35
data/test/simple.rb +0 -1317
data/test/sybase_jtds_simple_test.rb +0 -28
data/test/sybase_reset_column_information_test.rb +0 -6
data/test/test_helper.rb +0 -304
data/test/transaction.rb +0 -109

data/README.md CHANGED Viewed

@@ -1,56 +1,49 @@
 # 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
+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.
+AR-JDBC **1.2.x** officially supports `ActiveRecord` **3.x** as well as **2.3**,
+it's latest version is compatible and requires JRuby **1.6.8+** (but as always we
+recommend to use the latest and greatest of JRubies) thus Java **1.6** is needed.
-**NOTE:** version **1.3.0** of AR-JDBC adapter is currently in the making which
-strives to provide ActiveRecord 2.3, 3.x as well as 4.0 (master) compatibility.
-Our master already contains a lot of fixes but since we diverged significantly
-from the 1.2 line (we no longer back-port fixes) and still require to perform a
-few refactorings we advise users to point their *Gemfiles* to our master or use
-pre-release versions of our gem(s) e.g. **1.3.0.beta2**.
+**NOTE:** version **1.3.x** of AR-JDBC adapter strives to provide `ActiveRecord`
+**4.x** compatibility (as well as still supporting **2.3** and **3.x**) from a
+single code base. It's a recommended update for all AR-JDBC 1.2.x users.
-**NOTE:** activerecord-jdbc-adapter gem **1.2.6** contains a SQL injection
-[security vulnerability](http://cl.ly/code/0n381E353414) and has been yanked,
-please update ASAP (to version >= 1.2.8) if you happen to still be using it !
-Caused by a [regression](http://git.io/MDmiGQ) introduced in the 1.2.6 release,
-which was still not completely been fixed in 1.2.7 and has been yanked as well.
+[![Gem Version](https://badge.fury.io/rb/activerecord-jdbc-adapter.png)](http://badge.fury.io/rb/activerecord-jdbc-adapter)
 ## Databases
 ActiveRecord-JDBC-Adapter provides full or nearly full support for:
-**MySQL**, **PostgreSQL**, **SQLite3**, **Oracle**, **Microsoft SQL Server**,
+**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
+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 :
+To use AR-JDBC 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 (`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.
+  - Base JDBC (`activerecord-jdbc-adapter`) - supports all available databases
+    via JDBC, but requires you to download and manually setup a JDBC driver for
+    the database you're using
   - 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.
+  - MSSQL (`activerecord-jdbcmssql-adapter`) - uses the OSS jTDS driver by default
+    which might have issues with the latest SQLServer (does not support SQL Azure)
 2a. For Rails 3, if you're generating a new application, use the
 following command to generate your application:
@@ -59,41 +52,41 @@ following command to generate your application:
 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) :
+like the following (using MySQL as an example):
 ```ruby
-gem 'sqlite3', :platform => :ruby
+gem 'mysql', platform: :ruby
 platforms :jruby do
   gem 'jruby-openssl'
-  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
 end
 ```
-If you're using Rails 2:
+If you're using Rails 2.3:
     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. :
+3. Configure your *database.yml* in the normal Rails style:
 ```yml
 development:
-  adapter: jdbcmysql
+  adapter: mysql
   username: blog
-  password:
+  password: 1234
   host: localhost
-  database: weblog_development
+  database: blog_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. :
+**Legacy Configuration:** If you use one of the *activerecord-jdbcxxx-adapter*
+gems, you can still put a 'jdbc' prefix in front of the database adapter name,
+e.g. `adapter: jdbcmysql`.
+For plain JDBC database configurations, you'll need to know the database driver
+class and URL (do not forget to put the driver .jar(s) on the class-path) e.g.:
 ```yml
 development:
@@ -101,33 +94,33 @@ development:
   username: blog
   password:
   driver: com.mysql.jdbc.Driver
-  url: jdbc:mysql://localhost:3306/weblog_development
+  url: jdbc:mysql://localhost:3306/blog_development
 ```
-For JNDI data sources, you may simply specify the JNDI location as follows (the
-correct adapter type will be automatically detected) :
+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
+  jndi: jdbc/PostgreDB
 ```
 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**) :
+or using the *properties:* syntax (available since AR-JDBC **1.2.6**):
 ```yml
 production:
   adapter: mysql
   username: blog
   password: blog
-  url: "jdbc:mysql://localhost:3306/weblog?profileSQL=true"
+  url: "jdbc:mysql://localhost:3306/blog?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 :
+If you're really old school you might want to use AR-JDBC with a DB2 on z/OS:
 ```yml
 development:
@@ -144,34 +137,28 @@ development:
   password: lion
 ```
-If your SGBD isn't automatically discovered you can force dialect :
+If your SGBD isn't automatically discovered you can force a dialect as well:
 ```yml
 development:
   [...]
   dialect: as400 # For example
 ```
-### Standalone (with ActiveRecord)
+More information on (configuring) AR-JDBC might be found on our [wiki][5].
-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
+### Standalone with ActiveRecord
-2. After this you can establish a JDBC connection like this :
+Once the setup is made (see below) you can establish a JDBC connection like this (e.g. for `activerecord-jdbcderby-adapter`):
 ```ruby
 ActiveRecord::Base.establish_connection(
-  :adapter => 'derby', # or 'jdbcderby'
-  :database => "db/my-database"
+  adapter: 'derby',
+  database: 'db/my-database'
 )
 ```
-or like (but requires that you manually put the driver jar on the classpath) :
+or using (requires that you manually put the driver jar on the classpath):
 ```ruby
 ActiveRecord::Base.establish_connection(
@@ -181,69 +168,79 @@ ActiveRecord::Base.establish_connection(
 )
 ```
-## Source
+#### Using Bundler
-The source for activerecord-jdbc-adapter is available using git :
+Proceed as with Rails; specify the ActiveRecord gem in your Bundle along with
+the chosen (JDBC) adapters this time sample *Gemfile* for MySQL:
-    git clone git://github.com/jruby/activerecord-jdbc-adapter.git
+```ruby
+gem 'activerecord', '~> 3.2.13'
+gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+```
-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 :
+When you `require 'bundler/setup'` everything will be set up for you as expected.
+You do not need to use the 'helper' *activerecord-jdbcxxx-adapter* gem we provide
+but than should make sure an appropriate JDBC driver is available at runtime, in
+that case simply setup your *Gemfile* as:
 ```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'
+gem 'activerecord', '~> 4.0.0'
+gem 'activerecord-jdbc-adapter', '~> 1.3.0', platform: :jruby
 ```
-## Running AR-JDBC Tests
+#### Without Bundler
-[![Build Status][9]](http://travis-ci.org/#!/jruby/activerecord-jdbc-adapter)
+Install the needed gems with JRuby:
-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.*'.
+    jruby -S gem install activerecord activerecord-jdbc-adapter
-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`.
+If you wish to use the adapter for a specific database, you can install it
+directly and the (jdbc-) driver gem (dependency) will be installed as well:
-To execute a single test case, you can run:
+    jruby -S gem install activerecord-jdbcderby-adapter
-    rake appraisal:{version} test_{db} TEST=test/{tests_file}
+Your program should include:
-Substitute the *version* of ActiveRecord for version, which can be one of :
-  *rails23*, *rails30*, *rails31*, or *rails32*.
+```ruby
+require 'active_record'
+require 'activerecord-jdbc-adapter' if defined? JRUBY_VERSION
+# or in case you're using the pre-packaged adapter gem :
+require 'activerecord-jdbcderby-adapter' if defined? JRUBY_VERSION
+```
-The db can be one of these : *sqlite3*, *mysql*, *postgres*,
-  *mssql*, *sybase*, *oracle*, *db2*, *derby*, *h2* or *hssql*.
+## Extending AR-JDBC
-Finally, the *tests_file* will be whichever (.rb) test case you want to run.
+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.
-### Running AR Tests
+## Source
-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 :
+The source for activerecord-jdbc-adapter is available using git:
-    jruby -S rake rails:test DRIVER=mysql RAILS=/path/rails_source_dir
+    git clone git://github.com/jruby/activerecord-jdbc-adapter.git
-## Extending AR-JDBC
+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:
-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.
+```ruby
+gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter'
+gem 'activerecord-jdbcmysql-adapter', :github => 'jruby/activerecord-jdbc-adapter'
+```
+## Getting Involved
+Please read our [CONTRIBUTING](CONTRIBUTING.md) & [RUNNING_TESTS](RUNNING_TESTS.md)
+guides for starters. You can always help us by maintaining AR-JDBC's [wiki][5].
 ## Feedback
-Please report bugs at our [issue tracker][3]. If you're not sure if
+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/.
+ask on the #JRuby IRC channel on http://freenode.net/ (try [web-chat][6]).
 ## Authors
@@ -252,10 +249,10 @@ This project was written by Nick Sieger <nick@nicksieger.com> and Ola Bini
 ## License
-ActiveRecord-JDBC-Adapter is released under the BSD/MIT license.
-See the LICENSE.txt file included with the distribution for details.
+ActiveRecord-JDBC-Adapter is open-source released under the BSD/MIT license.
+See [LICENSE.txt](LICENSE.txt) included with the distribution for details.
-Open-source driver gems within AR-JDBC's sources are licensed under the same
+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/
@@ -263,4 +260,5 @@ license the database's drivers are licensed. See each driver gem's LICENSE.txt.
 [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
+[5]: https://github.com/jruby/activerecord-jdbc-adapter/wiki
+[6]: https://webchat.freenode.net/?channels=#jruby

data/RUNNING_TESTS.md ADDED Viewed

@@ -0,0 +1,76 @@
+## Running AR-JDBC's Tests
+Most DB specific unit tests hide under the **test/db** directory, the files
+included in the *test* directory are mostly shared test modules and helpers.
+Rake tasks are loaded from **rakelib/02-test-rake**, most adapters have a
+corresponding test_[adapter] task e.g. `rake test_sqlite3` that run against DB.
+To check all available (test related) tasks simply `rake -T | grep test`.
+If the adapter supports creating a database it will try to do so automatically
+(most embed databases such as SQLite3) for some adapters (MySQL, PostgreSQL) we
+do this auto-magically (see the `rake db:create` tasks), but otherwise you'll
+need to setup a database dedicated for tests (using the standard tools that come
+with your DB installation).
+Connection parameters: database, host etc. can usually be changed from the shell
+`env` for adapters where there might be no direct control over the DB
+instance/configuration, e.g. for Oracle (by looking at **test/db/oracle.rb**)
+one might adapt the test database configuration using :
+```
+export ORACLE_HOST=192.168.1.2
+export ORACLE_USER=SAMPLE
+export ORACLE_PASS=sample
+export ORACLE_SID=MAIN
+```
+Tests are by default run against the "current" ActiveRecord version locked down
+by Bundler, however since we usually do support more versions from a single code
+base run those with the (appraisal) provided task e.g. for MySQL :
+    rake appraisal:rails31 test_mysql TEST=test/db/mysql/rake_test.rb
+Observe the **TEST** variable used to specify a single file to be used to resolve
+test cases, you pick tests by matching their names as well using **TESTOPTS** :
+    rake appraisal:rails40 test_postgres TESTOPTS="--name=/integer/"
+This of course also works when running the "plain" test (no appraisal:xxx) task.
+Since 1.3.0 we also support prepared statements, these are off by default (AR)
+but one can easily run tests with prepared statements enabled using env vars :
+    rake test_derby PS=true # or PREPARED_STATEMENTS=true
+### ActiveRecord (Rails) Tests
+It's very desirable to pass all unit tests from ActiveRecord's own test suite.
+Unfortunately it's been a while since we have accomplished that, luckily a lot
+of failures are artificial (and would require tweaks at the Rails repo itself),
+others simply need quality time spent to get them in shape and address issues.
+First make sure you have the ActiveRecord (Rails) sources cloned locally :
+    git clone git://github.com/rails/rails.git
+To run the AR-JDBC's sources agains AR tests, use the **rails:test** task, be
+sure to specify a **DRIVER** and the **RAILS** sources path on the file system :
+    jruby -S rake rails:test DRIVER=derby RAILS=path/to/rails_source_dir
+There's even tasks for Rails built-in adapters e.g. `rake rails:test_mysql`
+You will likely only be able to run the Rails suite against the latest (stable)
+ActiveRecord ~> version we support (check the *Gemfile.lock*) e.g. for
+**activerecord (3.2.13)** you want to **git checkout 3-2-stable** branch.
+We strive to not stub and include native (MRI) test required artefacts into
+(non-test) code e.g. the `Mysql` module, instead put that into **test/rails**.
+[![Build Status][0]](http://travis-ci.org/#!/jruby/activerecord-jdbc-adapter)
+Happy Testing!
+[0]: https://secure.travis-ci.org/jruby/activerecord-jdbc-adapter.png

data/Rakefile.jdbc ADDED Viewed

@@ -0,0 +1,20 @@
+# NOTE: shared Rakefile used for jdbc-xxx gems
+require 'bundler/gem_helper'
+name = Dir["*.gemspec"].first.sub('.gemspec', '')
+gem_helper = Bundler::GemHelper.new(Dir.pwd, name)
+def gem_helper.version_tag
+  "#{name}-#{version}" # override "v#{version}"
+end
+version = gem_helper.send(:version)
+version_tag = gem_helper.version_tag
+desc "Build #{name}-#{version}.gem into the pkg directory"
+task('build') { gem_helper.build_gem }
+desc "Build and install #{name}-#{version}.gem into system gems"
+task('install') { gem_helper.install_gem }
+desc "Create tag #{version_tag} build and push #{name}-#{version}.gem to Rubygems"
+task('release') { gem_helper.release_gem }