activerecord-jdbc-adapter 1.3.0.rc1 → 1.3.0

data/CONTRIBUTING.md

@@ -37,10 +37,8 @@ When fixing issues for a particular Rails version please be aware that we suppor
 multiple AR versions from a single code-base (and that means supporting Ruby 1.8
 as well - esp. targeting 4.x **we can not use the 1.9 syntax** yet).
 
-
-To speed-up fixes and response times on your issues or simply support AR-JDBC's
-development (esp. the refurbished **1.3.x** line) please consider [donating][0].
+Please keep our [test-suite](https://travis-ci.org/jruby/activerecord-jdbc-adapter)
+green (been funky for a while and it's been hard-work getting in back to shape),
+while making changes, if they're related to an adapter covered by those.
 
 :heart: JRuby-Up!
-
-[0]: https://www.bountysource.com/#fundraisers/311-activerecord-jdbc-adapter-1-3-x

data/Gemfile

@@ -33,8 +33,6 @@ group :rails do
   gem 'actionpack', :require => nil
 end
 
-group :test do
-  gem 'mysql2', :require => nil, :platform => :mri
-  gem 'pg', :require => nil, :platform => :mri
-  gem 'sqlite3', :require => nil, :platform => :mri
-end
+gem 'mysql2', :require => nil, :platform => :mri, :group => :test
+gem 'pg', :require => nil, :platform => :mri, :group => :test
+gem 'sqlite3', :require => nil, :platform => :mri, :group => :test

data/Gemfile.lock

@@ -77,7 +77,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     test-unit (2.5.4)
     test-unit-context (0.3.1)
       test-unit (>= 2.4.0)

data/History.md

@@ -1,3 +1,33 @@
+## 1.3.0 (08/29/13)
+
+- [oracle] fix structure_dump: `column['data_default']` might come back as ''
+- [oracle] avoid the JDBC call `connection.getMetaData` with exec_query (#453)
+- review MSSQL/HSQLDB/H2 explain - make sure prepared statements are used
+- [oracle] make sure explain works with prepared statements
+- warn users about using our now deprecated suble_binds "extension"
+- [mysql] username defaults to 'root' on MRI
+- [mysql] match `columns` returned with latest AR 4.0 (collation, strict, extra)
+- only `suble_binds` if not an arel passed + allow to turn bind subling off
+- [postgres] fix `extension_enabled?` to work with raw boolean values
+- [derby] setting true/false into text/string columns values should use `to_s`
+  also non-serializable attrs should use `to_s` (instead of `to_yaml`) on 3.x
+- [derby] needs `quote_table_name_for_assignment` (on AR 4.0)
+- [postgres] driver "hooks" to make PG types work with prepared statements, now
+  working: ranges, arrays, interval, (ip) addr types, tsvector, json and uuid
+- missing `last_insert_id_result` method on PostgreSQL (#450)
+- emulate pre AR 4.0 behavior with date-times/booleans (in custom SELECTs) they
+  will be returned as (raw) strings on AR 3.x
+- warn when driver is not JDBC 4.0 compilant when checking if valid (#445)
+- fix inline rescue syntax - invalid syntax at MSSQL's `string_to_time` (#444)
+- no need to (double) update LOB values when using prepared statements
+- replaced `emulate_booleans` with `emulate_booleans?` on adapter specs
+- [firebird] emulate booleans with char(1) + fix time and review native types
+- [db2] using new `update_lob_values` - now handles null inserts safely (#430)
+- [mssql] configurable `update_lob_values?` - `string_to_binary` no longer abused
+- refactored SerializedAttributesHelper and moved to Util::SerializedAttributes
+  there's now a new `update_lob_columns` helper hooked onto AR::Base for adapters
+  that send clob/blob values in a separate statement DB2, Oracle, MSSQL, Firebird
+
 ## 1.3.0.rc1 (08/03/13)
 
 - add activerecord gem as a dependency of the main AR-JDBC gem
@@ -62,9 +92,6 @@
 Code Contributors (in no particular order): Alexey Noskov, Pierrick Rouxel,
 Matías Battocchia, @gapthemind and Sören Mothes
 
-Code Contributors (in no particular order): @alno, @pierrickrouxel,
-@matiasbattocchia, @gapthemind, @soemo
-
 ## 1.3.0.beta2 (05/30/13)
 
 - only load rake tasks if AR is being used - AR::Railtie is loaded (#234)

data/README.md

@@ -1,24 +1,27 @@
 # ActiveRecord JDBC Adapter
 
+[![Gem Version](https://badge.fury.io/rb/activerecord-jdbc-adapter.png)][7]
+
 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 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.
+We supports *ActiveRecord* **2.3**, **3.x** and **4.x** from a single code base.
+You'll need JRuby >= **1.6.8** (we recommend using the latest and greatest of
+JRubies) thus Java >= **1.6** is mandatory.
 
-**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.
+#### AR-JDBC **1.3.x** is a recommended update for all **1.2.x** users.
 
-[![Gem Version](https://badge.fury.io/rb/activerecord-jdbc-adapter.png)](http://badge.fury.io/rb/activerecord-jdbc-adapter)
+Our latest major version **1.3.x** represents a few months of refactoring and
+updates covering (not just) new *ActiveRecord* features. It tries to stay compatible
+with 1.2.9 as much as possible but please be aware that it's not always possible
+(mostly for the best), please read our [migration guide][8] for details.
 
 ## 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**.
+**MySQL**, **PostgreSQL**, **SQLite3**, **Oracle**, *MS-SQL** (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
@@ -262,3 +265,5 @@ license the database's drivers are licensed. See each driver gem's LICENSE.txt.
 [4]: http://github.com/nicksieger/activerecord-cachedb-adapter
 [5]: https://github.com/jruby/activerecord-jdbc-adapter/wiki
 [6]: https://webchat.freenode.net/?channels=#jruby
+[7]: http://badge.fury.io/rb/activerecord-jdbc-adapter
+[8]: https://github.com/jruby/activerecord-jdbc-adapter/wiki/Migrating-from-1.2.x-to-1.3.0

data/gemfiles/rails23.gemfile

@@ -11,6 +11,9 @@ gem "test-unit-context", ">= 0.3.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
 gem "simplecov", :require=>nil, :group=>:test
 gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
+gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
+gem "pg", :require=>nil, :platform=>:mri, :group=>:test
+gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
 gem "activerecord", "~> 2.3.18"
 gem "rails", "~> 2.3.18"
 

data/gemfiles/rails23.gemfile.lock

@@ -14,7 +14,9 @@ GEM
     appraisal (0.5.2)
       bundler
       rake
+    atomic (1.1.10)
     atomic (1.1.10-java)
+    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0147)
     jruby-openssl (0.8.8)
@@ -39,11 +41,14 @@ GEM
     test-unit (2.5.4)
     test-unit-context (0.3.1)
       test-unit (>= 2.4.0)
+    thread_safe (0.1.2)
+      atomic
     thread_safe (0.1.2-java)
       atomic
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   activerecord (~> 2.3.18)
@@ -51,9 +56,12 @@ DEPENDENCIES
   bcrypt-ruby (~> 3.0.0)
   jruby-openssl
   mocha (~> 0.13.1)
+  mysql2
+  pg
   rails (~> 2.3.18)
   rake
   simplecov
+  sqlite3
   test-unit (= 2.5.4)
   test-unit-context (>= 0.3.0)
   thread_safe

data/gemfiles/rails30.gemfile

@@ -11,5 +11,8 @@ gem "test-unit-context", ">= 0.3.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
 gem "simplecov", :require=>nil, :group=>:test
 gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
+gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
+gem "pg", :require=>nil, :platform=>:mri, :group=>:test
+gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
 gem "activerecord", "~> 3.0.20"
 

data/gemfiles/rails30.gemfile.lock

@@ -15,7 +15,9 @@ GEM
       bundler
       rake
     arel (2.0.10)
+    atomic (1.1.10)
     atomic (1.1.10-java)
+    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0147)
     builder (2.1.2)
@@ -26,20 +28,26 @@ GEM
     mocha (0.13.3)
       metaclass (~> 0.0.1)
     multi_json (1.7.7)
+    mysql2 (0.3.13)
+    pg (0.16.0)
     rake (10.1.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    sqlite3 (1.3.8)
     test-unit (2.5.4)
     test-unit-context (0.3.1)
       test-unit (>= 2.4.0)
+    thread_safe (0.1.2)
+      atomic
     thread_safe (0.1.2-java)
       atomic
     tzinfo (0.3.37)
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   activerecord (~> 3.0.20)
@@ -47,8 +55,11 @@ DEPENDENCIES
   bcrypt-ruby (~> 3.0.0)
   jruby-openssl
   mocha (~> 0.13.1)
+  mysql2
+  pg
   rake
   simplecov
+  sqlite3
   test-unit (= 2.5.4)
   test-unit-context (>= 0.3.0)
   thread_safe

data/gemfiles/rails31.gemfile

@@ -11,5 +11,8 @@ gem "test-unit-context", ">= 0.3.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
 gem "simplecov", :require=>nil, :group=>:test
 gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
+gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
+gem "pg", :require=>nil, :platform=>:mri, :group=>:test
+gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
 gem "activerecord", "~> 3.1.12"
 

data/gemfiles/rails31.gemfile.lock

@@ -16,7 +16,9 @@ GEM
       bundler
       rake
     arel (2.2.3)
+    atomic (1.1.10)
     atomic (1.1.10-java)
+    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0147)
     builder (3.0.4)
@@ -35,12 +37,15 @@ GEM
     test-unit (2.5.4)
     test-unit-context (0.3.1)
       test-unit (>= 2.4.0)
+    thread_safe (0.1.2)
+      atomic
     thread_safe (0.1.2-java)
       atomic
     tzinfo (0.3.37)
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   activerecord (~> 3.1.12)
@@ -48,8 +53,11 @@ DEPENDENCIES
   bcrypt-ruby (~> 3.0.0)
   jruby-openssl
   mocha (~> 0.13.1)
+  mysql2
+  pg
   rake
   simplecov
+  sqlite3
   test-unit (= 2.5.4)
   test-unit-context (>= 0.3.0)
   thread_safe

data/gemfiles/rails32.gemfile

@@ -11,5 +11,8 @@ gem "test-unit-context", ">= 0.3.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
 gem "simplecov", :require=>nil, :group=>:test
 gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
+gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
+gem "pg", :require=>nil, :platform=>:mri, :group=>:test
+gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
 gem "activerecord", "~> 3.2.13"
 

data/gemfiles/rails32.gemfile.lock

@@ -16,7 +16,9 @@ GEM
       bundler
       rake
     arel (3.0.2)
+    atomic (1.1.10)
     atomic (1.1.10-java)
+    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0147)
     builder (3.0.4)
@@ -27,20 +29,26 @@ GEM
     mocha (0.13.3)
       metaclass (~> 0.0.1)
     multi_json (1.7.7)
+    mysql2 (0.3.13)
+    pg (0.16.0)
     rake (10.1.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    sqlite3 (1.3.8)
     test-unit (2.5.4)
     test-unit-context (0.3.1)
       test-unit (>= 2.4.0)
+    thread_safe (0.1.2)
+      atomic
     thread_safe (0.1.2-java)
       atomic
     tzinfo (0.3.37)
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   activerecord (~> 3.2.13)
@@ -48,8 +56,11 @@ DEPENDENCIES
   bcrypt-ruby (~> 3.0.0)
   jruby-openssl
   mocha (~> 0.13.1)
+  mysql2
+  pg
   rake
   simplecov
+  sqlite3
   test-unit (= 2.5.4)
   test-unit-context (>= 0.3.0)
   thread_safe

data/gemfiles/rails40.gemfile

@@ -11,5 +11,8 @@ gem "test-unit-context", ">= 0.3.0", :group=>:test
 gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
 gem "simplecov", :require=>nil, :group=>:test
 gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
+gem "mysql2", :require=>nil, :platform=>:mri, :group=>:test
+gem "pg", :require=>nil, :platform=>:mri, :group=>:test
+gem "sqlite3", :require=>nil, :platform=>:mri, :group=>:test
 gem "activerecord", "~> 4.0.0"
 

data/gemfiles/rails40.gemfile.lock

@@ -20,7 +20,9 @@ GEM
       bundler
       rake
     arel (4.0.0)
+    atomic (1.1.10)
     atomic (1.1.10-java)
+    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0147)
     builder (3.1.4)
@@ -46,6 +48,7 @@ GEM
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   activerecord (~> 4.0.0)
@@ -53,8 +56,11 @@ DEPENDENCIES
   bcrypt-ruby (~> 3.0.0)
   jruby-openssl
   mocha (~> 0.13.1)
+  mysql2
+  pg
   rake
   simplecov
+  sqlite3
   test-unit (= 2.5.4)
   test-unit-context (>= 0.3.0)
   thread_safe

data/lib/arjdbc/db2/adapter.rb

@@ -16,19 +16,8 @@ module ArJdbc
     def self.initialize!
       return if @@_initialized; @@_initialized = true
 
-      require 'arjdbc/jdbc/serialized_attributes_helper'
-      ActiveRecord::Base.class_eval do
-        def after_save_with_db2_lob
-          lob_columns = self.class.columns.select { |c| c.sql_type =~ /blob|clob/i }
-          lob_columns.each do |column|
-            value = ::ArJdbc::SerializedAttributesHelper.dump_column_value(self, column)
-            next if value.nil? # already set NULL
-
-            self.class.connection.update_lob_value(self, column, value)
-          end
-        end
-      end
-      ActiveRecord::Base.after_save :after_save_with_db2_lob
+      require 'arjdbc/util/serialized_attributes'
+      Util::SerializedAttributes.setup /blob|clob/i, 'after_save_with_db2_lob'
     end
 
     # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
@@ -52,9 +41,6 @@ module ArJdbc
       { 'db2' => arel_visitor_type }
     end
 
-    # @private
-    def self.handle_lobs?; true; end
-
     # @private
     @@emulate_booleans = true
 
@@ -62,9 +48,38 @@ module ArJdbc
     #
     #   ArJdbc::DB2.emulate_booleans = false
     #
+    def self.emulate_booleans?; @@emulate_booleans; end
+    # @deprecated Use {#emulate_booleans?} instead.
     def self.emulate_booleans; @@emulate_booleans; end
+    # @see #emulate_booleans?
     def self.emulate_booleans=(emulate); @@emulate_booleans = emulate; end
 
+    # @private
+    @@update_lob_values = true
+
+    # Updating records with LOB values (binary/text columns) in a separate
+    # statement can be disabled using :
+    #
+    #   ArJdbc::DB2.update_lob_values = false
+    #
+    # @note This only applies when prepared statements are not used.
+    def self.update_lob_values?; @@update_lob_values; end
+    # @see #update_lob_values?
+    def self.update_lob_values=(update); @@update_lob_values = update; end
+
+    # @see #update_lob_values?
+    # @see ArJdbc::Util::SerializedAttributes#update_lob_columns
+    def update_lob_value?(value, column = nil)
+      DB2.update_lob_values? && ! prepared_statements? # && value
+    end
+
+    # @see #quote
+    # @private
+    BLOB_VALUE_MARKER = "BLOB('')"
+    # @see #quote
+    # @private
+    CLOB_VALUE_MARKER = "''"
+
     def configure_connection
       schema = self.schema
       set_schema(schema) if schema && schema != config[:username]
@@ -248,6 +263,7 @@ module ArJdbc
     # @override
     def quote(value, column = nil)
       return value.quoted_id if value.respond_to?(:quoted_id)
+      return value if sql_literal?(value)
 
       if column
         if column.respond_to?(:primary) && column.primary && column.klass != String
@@ -261,7 +277,7 @@ module ArJdbc
       column_type = column && column.type.to_sym
 
       case value
-      when nil then "NULL"
+      when nil then 'NULL'
       when Numeric # IBM_DB doesn't accept quotes on numeric types
         # if the column type is text or string, return the quote value
         if column_type == :text || column_type == :string
@@ -270,20 +286,20 @@ module ArJdbc
           value.to_s
         end
       when String, ActiveSupport::Multibyte::Chars
-        if column_type == :binary && !(column.sql_type =~ /for bit data/i)
-          if ArJdbc::DB2.handle_lobs?
-            "NULL" # '@@@IBMBINARY@@@'"
+        if column_type == :binary && column.sql_type !~ /for bit data/i
+          if update_lob_value?(value, column)
+            value.nil? ? 'NULL' : BLOB_VALUE_MARKER # '@@@IBMBINARY@@@'"
           else
             "BLOB('#{quote_string(value)}')"
           end
         elsif column && column.sql_type =~ /clob/ # :text
-          if ArJdbc::DB2.handle_lobs?
-            "NULL" # "'@@@IBMTEXT@@@'"
+          if update_lob_value?(value, column)
+            value.nil? ? 'NULL' : CLOB_VALUE_MARKER # "'@@@IBMTEXT@@@'"
           else
             "'#{quote_string(value)}'"
           end
         elsif column_type == :xml
-          value.nil? ? "NULL" : "'#{quote_string(value)}'" # "'<ibm>@@@IBMXML@@@</ibm>'"
+          value.nil? ? 'NULL' : "'#{quote_string(value)}'" # "'<ibm>@@@IBMXML@@@</ibm>'"
         else
           "'#{quote_string(value)}'"
         end