activerecord-jdbc-adapter 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11049989079fcc38fceef1db1689c5db555fd37e
-  data.tar.gz: 01a9dab21474a9548126ee80d840264f8d0018f5
+  metadata.gz: f03faf8d22c162a753fa8ec38946245c02349313
+  data.tar.gz: 30303e6bb6a9a6ce48d40bf9d3ff82e9284a28ba
 SHA512:
-  metadata.gz: ed02de30c898c0a8fba369ef315572e16997b19436828294a367c93fd1101ae7bd077c7989d0372f524b87bf66cb6a421b4ac8e6d682d7d4655eb5cfc2157156
-  data.tar.gz: 1dafdc93914c961ae1894d79e23b8f7b10c957fd183c96fd471031c16ff2dd6f87b786a8554770ea79612131f406742088c0bbb3dc2ab7ae7fb94fcd32f255be
+  metadata.gz: 669950d37ac2e29a1940ceb0fa4105d760593757d14e90e6bb520bf56332c0935238f82eac066a3948c88fc6d330295f357b9eac7d62029ce87d3c4e5354b73a
+  data.tar.gz: 598604f3136587a838cc500fae9a3b152c5b5a853e29b2bffd5e8e1f4a55c417a6323b4eb1def19cef954fbfa8b2ba5daef827a52e3bba9786e4dd1107edae4e

data/History.md

@@ -1,3 +1,9 @@
+## 1.3.11 (10/20/14)
+
+- arjdbc: performance improvement - avodinng JRuby's impl iface generation
+- [firebird] Use ampersand literal in limit offset sub to fix FIRST 1/SKIP 1
+- require super call is not needed and causes issues double loading features
+
 ## 1.3.10 (08/29/14)
 
 - [postgres] preliminary (temp) fix for Marshal.dump broken since 1.3.8 (#573)

data/lib/arel/visitors/firebird.rb

@@ -13,7 +13,7 @@ module Arel
         sql = o.cores.map { |x| do_visit_select_core x, a }.join
         sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
 
-        sql.sub!(/\A(\s*SELECT\s)/i, "\&#{lim_off} ") unless lim_off.empty?
+        sql.sub!(/\A(\s*SELECT\s)/i, '\&' + lim_off + ' ') unless lim_off.empty?
         sql
       end
 

data/lib/arjdbc/jdbc/adapter_require.rb

@@ -39,7 +39,6 @@ module ActiveRecord
         super('arjdbc/sqlite3')
       else super
       end
-      super
     end
 
   end

data/lib/arjdbc/jdbc/connection.rb

@@ -67,7 +67,20 @@ module ActiveRecord
           Java::JavaxNaming::InitialContext.new.lookup(config[:jndi].to_s)
 
         @jndi = true
-        self.connection_factory = JdbcConnectionFactory.impl { data_source.connection }
+        self.connection_factory = JndiConnectionFactoryImpl.new(data_source)
+      end
+
+      # @private
+      class JndiConnectionFactoryImpl
+        include JdbcConnectionFactory
+
+        def initialize(data_source)
+          @data_source = data_source
+        end
+
+        def new_connection
+          @data_source.connection
+        end
       end
 
       def setup_jdbc_factory
@@ -79,12 +92,26 @@ module ActiveRecord
         url = jdbc_url
         username = config[:username]
         password = config[:password]
-        jdbc_driver = ( config[:driver_instance] ||=
+        driver = ( config[:driver_instance] ||=
             JdbcDriver.new(config[:driver].to_s, config[:properties]) )
 
         @jndi = false
-        self.connection_factory = JdbcConnectionFactory.impl do
-          jdbc_driver.connection(url, username, password)
+        self.connection_factory = JdbcConnectionFactoryImpl.new(url, username, password, driver)
+      end
+
+      # @private
+      class JdbcConnectionFactoryImpl
+        include JdbcConnectionFactory
+
+        def initialize(url, username, password, driver)
+          @url = url
+          @username = username
+          @password = password
+          @driver = driver
+        end
+
+        def new_connection
+          @driver.connection(@url, @username, @password)
         end
       end
 

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  VERSION = "1.3.10"
+  VERSION = "1.3.11"
   # @deprecated
   module Version
     # @private 1.2.x compatibility

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.4.1
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.