activerecord-jdbc-adapter 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8275489a147bf60f8705498a80efe51ec395cc
-  data.tar.gz: 757b6d0d663b6d94499d42bb4aa27873456b1034
+  metadata.gz: 11049989079fcc38fceef1db1689c5db555fd37e
+  data.tar.gz: 01a9dab21474a9548126ee80d840264f8d0018f5
 SHA512:
-  metadata.gz: 309e8913e85548dc626989380c8b6d0f3cd5cd66e98912b30d160995cb69e1b984a2671004c7ca26b8e5c5b2e4b0ab003e451958fa6656f25643a03aca296e09
-  data.tar.gz: 67e41e8ef986c2d4bc113f8d85a5ed5e2ef947e353ca6dd75fa607ebb1cbbc09a0d502afafc017a29e9927bd248dd5d05c6b44ccbd8cadfe72f1ddfa3618ff63
+  metadata.gz: ed02de30c898c0a8fba369ef315572e16997b19436828294a367c93fd1101ae7bd077c7989d0372f524b87bf66cb6a421b4ac8e6d682d7d4655eb5cfc2157156
+  data.tar.gz: 1dafdc93914c961ae1894d79e23b8f7b10c957fd183c96fd471031c16ff2dd6f87b786a8554770ea79612131f406742088c0bbb3dc2ab7ae7fb94fcd32f255be

data/Gemfile

@@ -51,3 +51,7 @@ 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
+group :mssql do
+  gem 'tiny_tds', :require => nil, :platform => :mri, :group => :test
+  gem 'activerecord-sqlserver-adapter', :require => nil, :platform => :mri, :group => :test
+end

data/History.md

@@ -1,3 +1,17 @@
+## 1.3.10 (08/29/14)
+
+- [postgres] preliminary (temp) fix for Marshal.dump broken since 1.3.8 (#573)
+- [postgres] adapter was missing the custom rename_index method (fixes #577)
+- [postgres] user defined types should not raise an error
+- [postgres] align with Rails distict white-space fix (regression in 4.0.10)
+- [mssql] allow for `offset(x)` without `limit(y)` to work ... (fixes #564)
+- [mssql] correctly parse set_table_name string with owner (#574)
+- allow database.yml or config option to set `:insert_returning` (#570)
+- [sqlite3] savepoint without passed explicit name not supported
+- synchronize setting resolved visitor type
+- [mssql] (hopefully) fix ORDER BY mis-detection - closes #532 (improved #549)
+- [mysql] columns were sometimes instantiated with the wrong column class (#566)
+
 ## 1.3.9 (07/07/14)
 
 - [postgres] improve Range's type cast - fixing minor quoting failure on AR 4.x

data/Rakefile

@@ -73,7 +73,9 @@ task 'release:do' => 'build:adapters' do
   sh("git diff-index --quiet --cached HEAD") { |ok| fail "git index is not clean" unless ok }
 
   sh "git tag -a -m \"AR-JDBC #{version}\" #{version_tag}"
-  sh "for gem in `ls pkg/*-#{version}.gem`; do gem push $gem; done"
+  sh "for gem in `ls pkg/*-#{version}.gem`; do gem push $gem; done" do |ok|
+    sh "git push origin master --tags" if ok
+  end
 end
 
 # ALL

data/lib/arel/visitors/sql_server.rb

@@ -8,11 +8,7 @@ module Arel
       def visit_Arel_Nodes_SelectStatement(*args) # [o] AR <= 4.0 [o, a] on 4.1
         o, a = args.first, args.last
 
-        if ! o.limit && ! o.offset
-          return super
-        elsif ! o.limit && o.offset
-          raise ActiveRecord::ActiveRecordError, "must specify :limit with :offset"
-        end
+        return super if ! o.limit && ! o.offset # NOTE: really?
 
         unless o.orders.empty?
           select_order_by = "ORDER BY #{do_visit_columns(o.orders, a).join(', ')}"
@@ -46,10 +42,13 @@ module Arel
         sql
       end
 
+      # @private
+      MAX_LIMIT_VALUE = 9_223_372_036_854_775_807
+
       def visit_Arel_Nodes_UpdateStatement(*args) # [o] AR <= 4.0 [o, a] on 4.1
         o = args.first
         if o.orders.any? && o.limit.nil?
-          o.limit = Nodes::Limit.new(9223372036854775807)
+          o.limit = Nodes::Limit.new(MAX_LIMIT_VALUE)
         end
         super
       end
@@ -67,7 +66,7 @@ module Arel
         #   User.select("distinct first_name").limit(10)
         # would generate "select top 10 distinct first_name from users",
         # which is invalid should be "select distinct top 10 first_name ..."
-        ""
+        ''
       end
 
       def visit_Arel_Nodes_Limit o, a = nil

data/lib/arjdbc/jdbc/arel_support.rb

@@ -49,8 +49,9 @@ module ActiveRecord::ConnectionAdapters
             visitor_type ||= ::Arel::Visitors::VISITORS[ arel_visitor_name(adapter_spec) ]
             visitor_type ||= ::Arel::Visitors::ToSql # default (if nothing resolved)
 
-            ::Arel::Visitors::VISITORS[ adapter ] = visitor_type
-            RESOLVED_VISITORS[ adapter ] = visitor_type
+            RESOLVED_VISITORS.to_java.synchronized do
+              RESOLVED_VISITORS[ adapter ] = ::Arel::Visitors::VISITORS[ adapter ] = visitor_type
+            end
           end
 
           visitor_type

data/lib/arjdbc/jdbc/connection.rb

@@ -38,10 +38,6 @@ module ActiveRecord
         ArJdbc.deprecate "set_native_database_types is no longer used and does nothing override native_database_types instead"
       end
 
-      def self.jndi_config?(config)
-        config[:jndi] || config[:data_source]
-      end
-
       def jndi?; @jndi; end
       alias_method :jndi_connection?, :jndi?
 

data/lib/arjdbc/mssql/limit_helpers.rb

@@ -4,64 +4,71 @@ module ArJdbc
 
       # @private
       FIND_SELECT = /\b(SELECT(\s+DISTINCT)?)\b(.*)/mi
-      FIND_AGGREGATE_FUNCTIONS = /AVG|COUNT|COUNT_BIG|MAX|MIN|SUM|STDDEV|STDEVP|VAR|VARP/
+      # @private
+      FIND_AGGREGATE_FUNCTION = /(AVG|COUNT|COUNT_BIG|MAX|MIN|SUM|STDDEV|STDEVP|VAR|VARP)\(/i
 
       module SqlServerReplaceLimitOffset
 
         module_function
 
         def replace_limit_offset!(sql, limit, offset, order)
-          if limit
-            offset ||= 0
-            start_row, end_row = offset + 1, offset + limit.to_i
+          offset ||= 0
 
-            if match = FIND_SELECT.match(sql)
-              select, distinct, rest_of_query = match[1], match[2], match[3]
-              rest_of_query.strip!
-            end
-            rest_of_query[0] = '*' if rest_of_query[0...1] == '1' && rest_of_query !~ /1 AS/i
-            if rest_of_query[0...1] == '*'
-              from_table = Utils.get_table_name(rest_of_query, true)
-              rest_of_query = "#{from_table}.#{rest_of_query}"
-            end
+          if match = FIND_SELECT.match(sql)
+            select, distinct, rest_of_query = match[1], match[2], match[3]
+            rest_of_query.strip!
+          end
+          rest_of_query[0] = '*' if rest_of_query[0...1] == '1' && rest_of_query !~ /1 AS/i
+          if rest_of_query[0...1] == '*'
+            from_table = Utils.get_table_name(rest_of_query, true)
+            rest_of_query = "#{from_table}.#{rest_of_query}"
+          end
 
-            # Ensure correct queries if the rest_of_query contains a 'GROUP BY'. Otherwise the following error occurs:
-            #   ActiveRecord::StatementInvalid: ActiveRecord::JDBCError: Column 'users.id' is invalid in the select list because it is not contained in either an aggregate function or the GROUP BY clause.
-            #   SELECT t.* FROM ( SELECT ROW_NUMBER() OVER(ORDER BY users.id) AS _row_num, [users].[lft], COUNT([users].[lft]) FROM [users] GROUP BY [users].[lft] HAVING COUNT([users].[lft]) > 1 ) AS t WHERE t._row_num BETWEEN 1 AND 1
-            if rest_of_query.downcase.include?('group by')
-              if order.match(/^ORDER +BY +(#{FIND_AGGREGATE_FUNCTIONS})\(/i)
-                # do nothing
-              elsif order.count(',') == 0
-                order.gsub!(/ORDER +BY +([^\s]+)(\s+ASC|\s+DESC)?/i, 'ORDER BY MIN(\1)\2')
-              else
-                raise('Only one order condition allowed.')
-              end
+          # Ensure correct queries if the rest_of_query contains a 'GROUP BY'. Otherwise the following error occurs:
+          #   ActiveRecord::StatementInvalid: ActiveRecord::JDBCError: Column 'users.id' is invalid in the select list because it is not contained in either an aggregate function or the GROUP BY clause.
+          #   SELECT t.* FROM ( SELECT ROW_NUMBER() OVER(ORDER BY users.id) AS _row_num, [users].[lft], COUNT([users].[lft]) FROM [users] GROUP BY [users].[lft] HAVING COUNT([users].[lft]) > 1 ) AS t WHERE t._row_num BETWEEN 1 AND 1
+          if rest_of_query.downcase.include?('group by')
+            order_start = order.strip[0, 8]; order_start.upcase!
+            if order_start == 'ORDER BY' && order.match(FIND_AGGREGATE_FUNCTION)
+              # do nothing
+            elsif order.count(',') == 0
+              order.gsub!(/ORDER +BY +([^\s]+)(\s+ASC|\s+DESC)?/i, 'ORDER BY MIN(\1)\2')
+            else
+              raise('Only one order condition allowed.')
             end
+          end
 
-            if distinct # select =~ /DISTINCT/i
-              order = order.gsub(/([a-z0-9_])+\./, 't.')
-              new_sql = "SELECT t.* FROM "
-              new_sql << "( SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, t.* FROM (#{select} #{rest_of_query}) AS t ) AS t"
-              new_sql << " WHERE t._row_num BETWEEN #{start_row} AND #{end_row}"
-            else
-              select_columns_before_from = rest_of_query.gsub(/FROM.*/, '').strip
-              only_one_column            = !select_columns_before_from.include?(',')
-              only_one_id_column         = only_one_column && (select_columns_before_from.ends_with?('.id') || select_columns_before_from.ends_with?('.[id]'))
+          if distinct # select =~ /DISTINCT/i
+            order = order.gsub(/([a-z0-9_])+\./, 't.')
+            new_sql = "SELECT t.* FROM "
+            new_sql << "( SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, t.* FROM (#{select} #{rest_of_query}) AS t ) AS t"
+            append_limit_row_num_clause(new_sql, limit, offset)
+          else
+            select_columns_before_from = rest_of_query.gsub(/FROM.*/, '').strip
+            only_one_column            = !select_columns_before_from.include?(',')
+            only_one_id_column         = only_one_column && (select_columns_before_from.ends_with?('.id') || select_columns_before_from.ends_with?('.[id]'))
 
-              if only_one_id_column
-                # If there's only one id column a subquery will be created which only contains this column
-                new_sql = "#{select} t.id FROM "
-              else
-                # All selected columns are used
-                new_sql = "#{select} t.* FROM "
-              end
-              new_sql << "( SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{rest_of_query} ) AS t"
-              new_sql << " WHERE t._row_num BETWEEN #{start_row} AND #{end_row}"
+            if only_one_id_column
+              # If there's only one id column a subquery will be created which only contains this column
+              new_sql = "#{select} t.id FROM "
+            else
+              # All selected columns are used
+              new_sql = "#{select} t.* FROM "
             end
+            new_sql << "( SELECT ROW_NUMBER() OVER(#{order}) AS _row_num, #{rest_of_query} ) AS t"
+            append_limit_row_num_clause(new_sql, limit, offset)
+          end
 
-            sql.replace(new_sql)
+          sql.replace new_sql
+        end
+
+        def append_limit_row_num_clause(sql, limit, offset)
+          if limit
+            start_row = offset + 1; end_row = offset + limit.to_i
+            sql << " WHERE t._row_num BETWEEN #{start_row} AND #{end_row}"
+          else
+            sql << " WHERE t._row_num > #{offset}"
           end
-          sql
         end
 
       end
@@ -75,7 +82,7 @@ module ArJdbc
             offset ||= 0
             start_row = offset + 1
             end_row = offset + limit.to_i
-            
+
             if match = FIND_SELECT.match(sql)
               select, distinct, rest_of_query = match[1], match[2], match[3]
             end

data/lib/arjdbc/mssql/utils.rb

@@ -21,19 +21,6 @@ module ArJdbc
         end
       end
 
-      # protected
-
-      # See "Delimited Identifiers": http://msdn.microsoft.com/en-us/library/ms176027.aspx
-      def remove_identifier_delimiters(keyword)
-        if /\A(\[|")(.*)/m.match(keyword)
-          delim, rest = $1, $2
-          if delim == '[' && rest =~ /]\z/ || delim == '"' && rest =~ /"\z/
-            return rest.chop
-          end
-        end
-        keyword
-      end
-
       def unquote_table_name(table_name)
         remove_identifier_delimiters(table_name)
       end
@@ -51,7 +38,8 @@ module ArJdbc
       end
 
       def unqualify_table_schema(table_name)
-        remove_identifier_delimiters(table_name.to_s.split('.')[-2]) rescue nil
+        schema_name = table_name.to_s.split('.')[-2]
+        schema_name.nil? ? nil : remove_identifier_delimiters(schema_name)
       end
 
       def unqualify_db_name(table_name)
@@ -59,6 +47,13 @@ module ArJdbc
         table_names.length == 3 ? remove_identifier_delimiters(table_names.first) : nil
       end
 
+      # private
+
+      # See "Delimited Identifiers": http://msdn.microsoft.com/en-us/library/ms176027.aspx
+      def remove_identifier_delimiters(keyword)
+        keyword.to_s.tr("\]\[\"", '')
+      end
+
     end
   end
-end
+end

data/lib/arjdbc/mysql/adapter.rb

@@ -332,7 +332,7 @@ module ArJdbc
       sql = "SHOW FULL COLUMNS FROM #{quote_table_name(table_name)}"
       columns = execute(sql, name || 'SCHEMA')
       strict = strict_mode?
-      column = jdbc_column_class
+      column = ::ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
       pass_cast_type = respond_to?(:lookup_cast_type)
       columns.map! do |field|
         sql_type = field['Type']

data/lib/arjdbc/oracle/adapter.rb

@@ -608,7 +608,7 @@ module ArJdbc
     private :next_id_value
 
     def use_insert_returning?
-      if ( @use_insert_returning ||= nil ).nil?
+      if @use_insert_returning.nil?
         @use_insert_returning = false
       end
       @use_insert_returning

data/lib/arjdbc/postgresql/adapter.rb

@@ -58,7 +58,7 @@ module ArJdbc
     end
 
     def use_insert_returning?
-      if ( @use_insert_returning ||= nil ).nil?
+      if @use_insert_returning.nil?
         @use_insert_returning = supports_insert_with_returning?
       end
       @use_insert_returning
@@ -777,11 +777,13 @@ module ArJdbc
       end
 
       order_columns = orders.reject(&:blank?).map! do |column|
-        column = column.to_sql unless column.is_a?(String) # handle AREL node
-        column.gsub(/\s+(ASC|DESC)\s*(NULLS\s+(FIRST|LAST)\s*)?/i, '') # remove ASC/DESC
+        column = column.is_a?(String) ? column.dup : column.to_sql # AREL node
+        column.gsub!(/\s+(?:ASC|DESC)\s*/i, '') # remove any ASC/DESC modifiers
+        column.gsub!(/\s*NULLS\s+(?:FIRST|LAST)?\s*/i, '')
+        column
       end
-      order_columns.reject!(&:blank?)
-      i = -1; order_columns.map! { |c| "#{c} AS alias_#{i += 1}" }
+      order_columns.reject!(&:empty?)
+      i = -1; order_columns.map! { |column| "#{column} AS alias_#{i += 1}" }
 
       columns = [ columns ]; columns.flatten!
       columns.push( *order_columns ).join(', ')
@@ -805,7 +807,7 @@ module ArJdbc
     # @return [String]
     # @override
     def quote(value, column = nil)
-      return super unless column
+      return super unless column && column.type
       return value if sql_literal?(value)
 
       case value
@@ -1065,6 +1067,10 @@ module ArJdbc
       execute "DROP INDEX #{quote_table_name(index_name)}"
     end
 
+    def rename_index(table_name, old_name, new_name)
+      execute "ALTER INDEX #{quote_column_name(old_name)} RENAME TO #{quote_table_name(new_name)}"
+    end
+
     def index_name_length
       63
     end

data/lib/arjdbc/postgresql/column.rb

@@ -327,6 +327,24 @@ module ArJdbc
         ::Float::INFINITY * (options[:negative] ? -1 : 1)
       end if AR4_COMPAT
 
+      private
+
+      # TODO marshaling worked in 1.3.7 ,,, got broken in 1.3.8 (due @adapter)
+      # but the fix introduced in 1.3.10 causes backwards (1.3) incompatibility
+      # ... for now should be fine - there's likely more refactoring to happen!
+
+      def marshal_dump
+        # NOTE: disabled oid_type ... due range warnings (maybe they're fine) :
+        # unknown OID 3904: failed to recognize type of 'int4_range'. It will be treated as String.
+        #oid_type if respond_to?(:oid_type)
+        @adapter = nil
+        instance_variables.map { |var| [ var, instance_variable_get(var) ] }
+      end
+
+      def marshal_load(data)
+        data.each { |pair| instance_variable_set( pair[0], pair[1] ) }
+      end
+
       # @note Based on *active_record/connection_adapters/postgresql/cast.rb* (4.0).
       module Cast
 

data/lib/arjdbc/version.rb

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

data/rakelib/01-tomcat.rake

@@ -1,8 +1,7 @@
-
 namespace :'tomcat-jndi' do # contains a FS JNDI impl (for tests)
-  
+
   TOMCAT_MAVEN_REPO = 'http://repo2.maven.org/maven2/org/apache/tomcat'
-  TOMCAT_VERSION = '7.0.34'
+  TOMCAT_VERSION = '7.0.54'
 
   DOWNLOAD_DIR = File.expand_path('../test/jars', File.dirname(__FILE__))
 
@@ -36,7 +35,7 @@ namespace :'tomcat-jndi' do # contains a FS JNDI impl (for tests)
 
     FileUtils.rm_r temp_dir
   end
-  
+
   task :check do
     jar_path = File.join(DOWNLOAD_DIR, catalina_jar)
     unless File.exist?(jar_path)
@@ -49,4 +48,4 @@ namespace :'tomcat-jndi' do # contains a FS JNDI impl (for tests)
     rm jar_path if File.exist?(jar_path)
   end
 
-end
+end

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -1394,6 +1394,37 @@ public class RubyJdbcConnection extends RubyObject {
         return value;
     }
 
+    @JRubyMethod(name = "jndi_config?", meta = true)
+    public static IRubyObject jndi_config_p(final ThreadContext context,
+        final IRubyObject self, final IRubyObject config) {
+        // config[:jndi] || config[:data_source]
+
+        final Ruby runtime = context.getRuntime();
+
+        IRubyObject configValue;
+
+        if ( config.getClass() == RubyHash.class ) { // "optimized" version
+            final RubyHash configHash = ((RubyHash) config);
+            configValue = configHash.fastARef(runtime.newSymbol("jndi"));
+            if ( configValue == null ) {
+                configValue = configHash.fastARef(runtime.newSymbol("data_source"));
+            }
+        }
+        else {
+            configValue = config.callMethod(context, "[]", runtime.newSymbol("jndi"));
+            if ( configValue.isNil() ) configValue = null;
+            if ( configValue == null ) {
+                configValue = config.callMethod(context, "[]", runtime.newSymbol("data_source"));
+            }
+        }
+
+        final IRubyObject rubyFalse = runtime.newBoolean( false );
+        if ( configValue == null || configValue.isNil() || configValue == rubyFalse ) {
+            return rubyFalse;
+        }
+        return context.getRuntime().newBoolean( true );
+    }
+
     protected final IRubyObject getConfigValue(final ThreadContext context, final String key) {
         final IRubyObject config = callMethod(context, "config");
         return config.callMethod(context, "[]", context.getRuntime().newSymbol(key));
@@ -3380,17 +3411,17 @@ public class RubyJdbcConnection extends RubyObject {
 
             final IRubyObject[] args;
 
-            final RubyArray cols = runtime.newArray(columns.length);
+            final RubyArray cols = RubyArray.newArray(runtime, columns.length);
 
             if ( INIT_COLUMN_TYPES ) { // NOTE: NOT IMPLEMENTED
-                for ( int i=0; i<columns.length; i++ ) {
-                    cols.add( columns[i].name );
+                for ( int i = 0; i < columns.length; i++ ) {
+                    cols.append( columns[i].name );
                 }
                 args = new IRubyObject[] { cols, rows };
             }
             else {
-                for ( int i=0; i<columns.length; i++ ) {
-                    cols.add( columns[i].name );
+                for ( int i = 0; i < columns.length; i++ ) {
+                    cols.append( columns[i].name );
                 }
                 args = new IRubyObject[] { cols, rows };
             }

data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java

@@ -119,11 +119,12 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
 
     @Override
     protected IRubyObject indexes(final ThreadContext context, String tableName, final String name, String schemaName) {
-        int i = -1;
-        if ( tableName != null ) i = tableName.indexOf('.');
-        if ( i > 0 && schemaName == null ) {
-            schemaName = tableName.substring(0, i);
-            tableName = tableName.substring(i + 1);
+        if ( tableName != null ) {
+            final int i = tableName.indexOf('.');
+            if ( i > 0 && schemaName == null ) {
+                schemaName = tableName.substring(0, i);
+                tableName = tableName.substring(i + 1);
+            }
         }
         return super.indexes(context, tableName, name, schemaName);
     }
@@ -214,7 +215,10 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     @Override
     @JRubyMethod(name = "create_savepoint", optional = 1)
     public IRubyObject create_savepoint(final ThreadContext context, final IRubyObject[] args) {
-        IRubyObject name = args.length > 0 ? args[0] : null;
+        final IRubyObject name = args.length > 0 ? args[0] : null;
+        if ( name == null || name.isNil() ) {
+            throw new IllegalArgumentException("create_savepoint (without name) not implemented!");
+        }
         final Connection connection = getConnection(true);
         try {
             connection.setAutoCommit(false);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-08-29 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.2.2
+rubygems_version: 2.4.1
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.