activerecord-jdbc-adapter 70.0.pre-java → 70.1-java

data/lib/arjdbc/tasks/database_tasks.rb

@@ -10,21 +10,6 @@ module ArJdbc
 
     require 'arjdbc/tasks/jdbc_database_tasks'
     require 'arjdbc/tasks/sqlite_database_tasks_patch'
-    #require 'arjdbc/tasks/db2_database_tasks'
-    #require 'arjdbc/tasks/derby_database_tasks'
-    #require 'arjdbc/tasks/h2_database_tasks'
-    #require 'arjdbc/tasks/hsqldb_database_tasks'
-    #require 'arjdbc/tasks/mssql_database_tasks'
-
-    # re-invent built-in (but deprecated on 4.0) tasks :
-    #register_tasks(/sqlserver/, MSSQLDatabaseTasks)
-    #register_tasks(/mssql/, MSSQLDatabaseTasks) # (built-in) alias
-    # tasks for custom (JDBC) adapters :
-    #register_tasks(/db2/, DB2DatabaseTasks)
-    #register_tasks(/derby/, DerbyDatabaseTasks)
-    #register_tasks(/h2/, H2DatabaseTasks)
-    #register_tasks(/hsqldb/, HSQLDBDatabaseTasks)
-    # (default) generic JDBC task :
     register_tasks(/^jdbc$/, JdbcDatabaseTasks)
 
     # NOTE: no need to register "built-in" adapters such as MySQL

data/lib/arjdbc/util/serialized_attributes.rb

@@ -31,33 +31,11 @@ module ArJdbc
         SerializedAttributes.dump_column_value(self, column)
       end
 
-      if defined? ActiveRecord::Type::Serialized # ArJdbc::AR42
-
       def self.dump_column_value(record, column)
         value = record[ column.name.to_s ]
         column.cast_type.type_cast_for_database(value)
       end
 
-      else
-
-      def self.dump_column_value(record, column)
-        value = record[ name = column.name.to_s ]
-        if record.class.respond_to?(:serialized_attributes)
-          if coder = record.class.serialized_attributes[name]
-            value = coder.respond_to?(:dump) ? coder.dump(value) : value.to_yaml
-          end
-        else
-          if record.respond_to?(:unserializable_attribute?)
-            value = value.to_yaml if record.unserializable_attribute?(name, column)
-          else
-            value = value.to_yaml if value.is_a?(Hash)
-          end
-        end
-        value
-      end
-
-      end
-
       def self.setup(lob_type = nil, after_save_alias = nil)
         ActiveRecord::Base.send :include, self # include SerializedAttributes
         ActiveRecord::Base.lob_type = lob_type unless lob_type.nil?

data/lib/arjdbc/util/table_copier.rb

@@ -4,7 +4,8 @@ module ArJdbc
   module Util
     module TableCopier
 
-      # taken from SQLite adapter, code loosely based on http://git.io/P7tFQA
+      # taken from SQLite adapter, code loosely based on
+      # https://github.com/rails/rails/blob/d3e5118/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
 
       # Performs changes for table by first copying (and preserving contents)
       # into another (temporary) table, than alters and copies all data back.

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '70.0.pre'
+  VERSION = '70.1'
 end

data/rakelib/02-test.rake

@@ -1,7 +1,7 @@
 
 test_tasks = [ 'test_mysql', 'test_sqlite3', 'test_postgresql_with_hint' ]
 if defined?(JRUBY_VERSION)
-  test_tasks.push :test_derby, :test_hsqldb, :test_h2
+  test_tasks.push :test_hsqldb, :test_h2
   test_tasks.push :test_jndi, :test_jdbc
 end
 
@@ -55,7 +55,6 @@ def test_task_for(adapter, options = {})
   test_task
 end
 
-test_task_for :Derby, :desc => 'Run tests against (embedded) DerbyDB'
 test_task_for :H2, :desc => 'Run tests against H2 database engine'
 test_task_for :HSQLDB, :desc => 'Run tests against HyperSQL (Java) database'
 test_task_for :MySQL #, :prereqs => 'db:mysql'
@@ -64,29 +63,22 @@ test_task_for :PostgreSQL, :driver => ENV['JDBC_POSTGRES_VERSION'] || 'postgres'
 task :test_postgres => :test_postgresql # alias
 test_task_for :SQLite3, :driver => ENV['JDBC_SQLITE_VERSION']
 task :test_sqlite => :test_sqlite3 # alias
-test_task_for :Firebird
 
 test_task_for :MariaDB, :files => FileList["test/db/mysql/*_test.rb"] do |test_task| #, :prereqs => 'db:mysql'
   test_task.ruby_opts << '-rdb/mariadb_config'
 end
 
 # ensure driver for these DBs is on your class-path
-[ :Oracle, :DB2, :Informix, :CacheDB ].each do |adapter|
+[ :Oracle ].each do |adapter|
   test_task_for adapter, :desc => "Run tests against #{adapter} (ensure driver is on class-path)"
 end
 
-test_task_for :AS400, :desc => "Run tests against AS400 (DB2) (ensure driver is on class-path)",
-              :files => FileList["test/db2*_test.rb"] + FileList["test/db/db2/*_test.rb"]
-
-#task :test_jdbc => [ :test_jdbc_mysql, :test_jdbc_derby ] if defined?(JRUBY_VERSION)
-
 test_task_for 'JDBC', :desc => 'Run tests against plain JDBC adapter (uses MySQL and Derby)',
   :prereqs => [ 'db:mysql' ], :files => FileList['test/*jdbc_*test.rb'] do |test_task|
-  test_task.libs << 'jdbc-mysql/lib' << 'jdbc-derby/lib'
+  test_task.libs << 'jdbc-mysql/lib'
 end
 
 # TODO since Derby AR 5.x support is not implemented we only run JNDI with MySQL :
-#task :test_jndi => [ :test_jndi_mysql, :test_jndi_derby ] if defined?(JRUBY_VERSION)
 task :test_jndi => [ :test_jndi_mysql ] if defined?(JRUBY_VERSION)
 
 jndi_classpath = [ 'test/jars/tomcat-juli.jar', 'test/jars/tomcat-catalina.jar' ]
@@ -100,13 +92,6 @@ get_jndi_classpath_opt = lambda do
   "-J-cp \"#{cp.join(File::PATH_SEPARATOR)}\""
 end
 
-test_task_for 'JNDI_Derby', :desc => 'Run tests against a Derby JNDI connection',
-  :prereqs => jndi_classpath, :files => FileList['test/*jndi_derby*test.rb'] do |test_task|
-  test_task.libs << 'jdbc-derby/lib'
-  test_task.ruby_opts << get_jndi_classpath_opt.call
-  #test_task.verbose = true
-end
-
 test_task_for 'JNDI_MySQL', :desc => 'Run tests against a MySQL JNDI connection',
   :prereqs => [ 'db:mysql' ] + jndi_classpath, :files => FileList['test/*jndi_mysql*test.rb'] do |test_task|
   test_task.libs << 'jdbc-mysql/lib'

data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java

@@ -214,6 +214,11 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         });
     }
 
+    @JRubyMethod
+    public IRubyObject exec_params(ThreadContext context, IRubyObject sql, IRubyObject binds) {
+        return execute_prepared_query(context, sql, binds, null);
+    }
+
     private transient RubyClass oidArray; // PostgreSQL::OID::Array
 
     private RubyClass oidArray(final ThreadContext context) {

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

@@ -402,6 +402,11 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         finally { close(statement); }
     }
 
+    @JRubyMethod
+    public IRubyObject filename(ThreadContext context) {
+        return getConfigValue(context, "database");
+    }
+
     @Override
     @JRubyMethod(name = "rollback_savepoint", required = 1)
     public IRubyObject rollback_savepoint(final ThreadContext context, final IRubyObject name) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 70.0.pre
+  version: '70.1'
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -48,13 +48,9 @@ files:
 - Rakefile
 - Rakefile.jdbc
 - activerecord-jdbc-adapter.gemspec
-- lib/active_record/connection_adapters/as400_adapter.rb
-- lib/active_record/connection_adapters/db2_adapter.rb
-- lib/active_record/connection_adapters/derby_adapter.rb
 - lib/active_record/connection_adapters/firebird_adapter.rb
 - lib/active_record/connection_adapters/h2_adapter.rb
 - lib/active_record/connection_adapters/hsqldb_adapter.rb
-- lib/active_record/connection_adapters/informix_adapter.rb
 - lib/active_record/connection_adapters/jdbc_adapter.rb
 - lib/active_record/connection_adapters/jndi_adapter.rb
 - lib/active_record/connection_adapters/mariadb_adapter.rb
@@ -64,9 +60,6 @@ files:
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/activerecord-jdbc-adapter.rb
 - lib/arel/visitors/compat.rb
-- lib/arel/visitors/db2.rb
-- lib/arel/visitors/derby.rb
-- lib/arel/visitors/firebird.rb
 - lib/arel/visitors/h2.rb
 - lib/arel/visitors/hsqldb.rb
 - lib/arel/visitors/postgresql_jdbc.rb
@@ -78,20 +71,7 @@ files:
 - lib/arjdbc/abstract/database_statements.rb
 - lib/arjdbc/abstract/statement_cache.rb
 - lib/arjdbc/abstract/transaction_support.rb
-- lib/arjdbc/db2.rb
-- lib/arjdbc/db2/adapter.rb
-- lib/arjdbc/db2/as400.rb
-- lib/arjdbc/db2/column.rb
-- lib/arjdbc/db2/connection_methods.rb
-- lib/arjdbc/derby.rb
-- lib/arjdbc/derby/active_record_patch.rb
-- lib/arjdbc/derby/adapter.rb
-- lib/arjdbc/derby/connection_methods.rb
-- lib/arjdbc/derby/schema_creation.rb
 - lib/arjdbc/discover.rb
-- lib/arjdbc/firebird.rb
-- lib/arjdbc/firebird/adapter.rb
-- lib/arjdbc/firebird/connection_methods.rb
 - lib/arjdbc/h2.rb
 - lib/arjdbc/h2/adapter.rb
 - lib/arjdbc/h2/connection_methods.rb
@@ -101,8 +81,6 @@ files:
 - lib/arjdbc/hsqldb/explain_support.rb
 - lib/arjdbc/hsqldb/schema_creation.rb
 - lib/arjdbc/informix.rb
-- lib/arjdbc/informix/adapter.rb
-- lib/arjdbc/informix/connection_methods.rb
 - lib/arjdbc/jdbc.rb
 - lib/arjdbc/jdbc/adapter.rb
 - lib/arjdbc/jdbc/adapter_java.jar
@@ -138,13 +116,9 @@ files:
 - lib/arjdbc/sqlite3.rb
 - lib/arjdbc/sqlite3/adapter.rb
 - lib/arjdbc/sqlite3/connection_methods.rb
-- lib/arjdbc/sybase.rb
-- lib/arjdbc/sybase/adapter.rb
 - lib/arjdbc/tasks.rb
 - lib/arjdbc/tasks/database_tasks.rb
 - lib/arjdbc/tasks/databases.rake
-- lib/arjdbc/tasks/db2_database_tasks.rb
-- lib/arjdbc/tasks/derby_database_tasks.rb
 - lib/arjdbc/tasks/h2_database_tasks.rb
 - lib/arjdbc/tasks/hsqldb_database_tasks.rb
 - lib/arjdbc/tasks/jdbc_database_tasks.rb
@@ -171,13 +145,9 @@ files:
 - src/java/arjdbc/ArJdbcModule.java
 - src/java/arjdbc/db2/DB2Module.java
 - src/java/arjdbc/db2/DB2RubyJdbcConnection.java
-- src/java/arjdbc/derby/DerbyModule.java
-- src/java/arjdbc/derby/DerbyRubyJdbcConnection.java
-- src/java/arjdbc/firebird/FirebirdRubyJdbcConnection.java
 - src/java/arjdbc/h2/H2Module.java
 - src/java/arjdbc/h2/H2RubyJdbcConnection.java
 - src/java/arjdbc/hsqldb/HSQLDBModule.java
-- src/java/arjdbc/informix/InformixRubyJdbcConnection.java
 - src/java/arjdbc/jdbc/AdapterJavaService.java
 - src/java/arjdbc/jdbc/Callable.java
 - src/java/arjdbc/jdbc/ConnectionFactory.java
@@ -215,9 +185,6 @@ post_install_message:
 rdoc_options:
 - "--main"
 - README.md
-- "-SHN"
-- "-f"
-- darkfish
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -227,11 +194,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.

data/lib/active_record/connection_adapters/as400_adapter.rb

@@ -1,2 +0,0 @@
-require 'arjdbc/db2'
-require 'arjdbc/db2/as400'

data/lib/active_record/connection_adapters/db2_adapter.rb

@@ -1 +0,0 @@
-require 'arjdbc/db2'

data/lib/active_record/connection_adapters/derby_adapter.rb

@@ -1 +0,0 @@
-require 'arjdbc/derby'

data/lib/active_record/connection_adapters/informix_adapter.rb

@@ -1 +0,0 @@
-require 'arjdbc/informix'

data/lib/arel/visitors/db2.rb

@@ -1,137 +0,0 @@
-# NOTE: file contains code adapted from **ruby-ibmdb**'s adapter, license follows
-=begin
-Copyright (c) 2006 - 2015 IBM Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=end
-
-require 'arel/visitors/compat'
-
-module Arel
-  module Visitors
-    class DB2 < Arel::Visitors::ToSql
-
-      if ArJdbc::AR42
-        def visit_Arel_Nodes_SelectStatement(o, a = nil)
-          a = o.cores.inject(a) { |c, x| visit_Arel_Nodes_SelectCore(x, c) }
-
-          unless o.orders.empty?
-            a << ' ORDER BY '
-            last = o.orders.length - 1
-            o.orders.each_with_index do |x, i|
-              visit(x, a);  a << ', ' unless last == i
-            end
-          end
-
-          if limit = o.limit
-            if limit = limit.value
-              limit = limit.to_i
-            end
-          end
-          if offset = o.offset
-            if offset = offset.value
-              offset = offset.to_i
-            end
-          end
-
-          if limit || offset
-            add_limit_offset(a, o, limit, offset)
-          else
-            a
-          end
-        end
-
-        def visit_Arel_Nodes_Limit o, collector
-          # visit o.expr, collector
-        end
-
-        def visit_Arel_Nodes_Offset o, collector
-          # visit o.expr, collector
-        end
-
-      else
-        def visit_Arel_Nodes_SelectStatement o, a = nil
-          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?
-
-          if limit = o.limit
-            if limit = limit.value
-              limit = limit.to_i
-            end
-          end
-          if offset = o.offset
-            if offset = offset.value
-              offset = offset.to_i
-            end
-          end
-
-          if limit || offset
-            add_limit_offset(sql, o, limit, offset)
-          else
-            sql
-          end
-        end
-      end
-
-      if ArJdbc::AR42
-        def visit_Arel_Nodes_InsertStatement o, a = nil
-          a << "INSERT INTO "
-          visit(o.relation, a)
-
-          values = o.values
-
-          if o.columns.any?
-            cols = o.columns.map { |x| quote_column_name x.name }
-            a << ' (' << cols.join(', ') << ') '
-          elsif o.values.eql? ArJdbc::DB2::VALUES_DEFAULT
-            cols = o.relation.engine.columns.map { |c| c.name }
-            a << ' (' << cols.join(', ') << ')'
-            a << ' VALUES '
-            a << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
-            values = false
-          end
-          visit(values, a) if values
-          a
-        end
-      elsif Arel::VERSION >= '4.0' # AR 4.0 ... AREL 5.0 since AR >= 4.1
-        def visit_Arel_Nodes_InsertStatement o, a = nil
-          sql = "INSERT INTO "
-          sql << visit(o.relation, a)
-
-          values = o.values
-
-          if o.columns.any?
-            cols = o.columns.map { |x| quote_column_name x.name }
-            sql << ' (' << cols.join(', ') << ') '
-          # should depend the other way around but who cares it's AR
-          elsif o.values.eql? ArJdbc::DB2::VALUES_DEFAULT
-            cols = o.relation.engine.columns.map { |c| c.name }
-            sql << ' (' << cols.join(', ') << ')'
-            sql << ' VALUES '
-            sql << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
-            values = nil
-          end
-
-          sql << visit(values, a) if values
-
-          sql
-        end
-      end
-
-      private
-
-      def add_limit_offset(sql, o, limit, offset)
-        @connection.replace_limit_offset! sql, limit, offset, o.orders
-      end
-
-    end
-  end
-end
-
-Arel::Collectors::Bind.class_eval do
-  attr_reader :parts
-end if defined? Arel::Collectors::Bind

data/lib/arel/visitors/derby.rb

@@ -1,112 +0,0 @@
-require 'arel/visitors/compat'
-
-module Arel
-  module Visitors
-    class Derby < Arel::Visitors::ToSql
-
-      # @private
-      STR_1 = ' '
-
-      if ArJdbc::AR42
-        def visit_Arel_Nodes_SelectStatement(o, a = nil)
-          a = o.cores.inject(a) { |c, x| visit_Arel_Nodes_SelectCore(x, c) }
-          unless o.orders.empty?
-            a << ' ORDER BY '
-            last = o.orders.length - 1
-            o.orders.each_with_index do |x, i|
-              visit(x, a);  a << ', ' unless last == i
-            end
-          end
-          if o.offset
-            a << STR_1; visit(o.offset, a)
-          end
-          if o.limit
-            a << STR_1; visit(o.limit, a)
-          end
-          if o.lock
-            a << STR_1; visit(o.lock, a)
-          end
-          a
-        end
-      else
-        def visit_Arel_Nodes_SelectStatement(o, a = nil)
-          sql = o.cores.map { |x| do_visit(x, a) }.join
-          sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
-          sql << " #{do_visit o.offset, a}" if o.offset
-          sql << " #{do_visit o.limit, a}" if o.limit
-          sql << " #{do_visit o.lock, a}" if o.lock
-          sql
-        end
-      end
-
-      def visit_Arel_Nodes_Limit(o, a = nil)
-        limit = "FETCH FIRST #{limit_for(o)} ROWS ONLY"
-        a << limit if a
-        limit
-      end
-
-      def visit_Arel_Nodes_Offset(o, a = nil)
-        if a
-          a << 'OFFSET '
-          do_visit(o.value, a)
-          a << ' ROWS'
-        else
-          "OFFSET #{do_visit o.value, a} ROWS"
-        end
-      end
-
-      # This generates SELECT...FOR UPDATE, but it will only work if the
-      # current transaction isolation level is set to SERIALIZABLE.  Otherwise,
-      # locks aren't held for the entire transaction.
-      def visit_Arel_Nodes_Lock o, a = nil
-        do_visit o.expr, a
-      end
-
-      # @private
-      VALUES_DEFAULT = 'VALUES ( DEFAULT )' # NOTE: marker set by ArJdbc::Derby
-
-      if ArJdbc::AR42
-        def visit_Arel_Nodes_InsertStatement o, a = nil
-          a << "INSERT INTO "
-          visit(o.relation, a)
-
-          values = o.values
-
-          if o.columns.any?
-            cols = o.columns.map { |x| quote_column_name x.name }
-            a << ' (' << cols.join(', ') << ') '
-          elsif o.values.eql? VALUES_DEFAULT
-            cols = o.relation.engine.columns.map { |c| c.name }
-            a << ' (' << cols.join(', ') << ')'
-            a << ' VALUES '
-            a << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
-            values = false
-          end
-          visit(values, a) if values
-          a
-        end
-      elsif Arel::VERSION >= '4.0' # AR 4.0 ... AREL 5.0 since AR >= 4.1
-        def visit_Arel_Nodes_InsertStatement o, a = nil
-          sql = 'INSERT INTO '
-          sql << visit(o.relation, a)
-
-          values = o.values
-
-          if o.columns.any?
-            cols = o.columns.map { |x| quote_column_name x.name }
-            sql << ' (' << cols.join(', ') << ') '
-          elsif o.values.eql? VALUES_DEFAULT
-            cols = o.relation.engine.columns.map { |c| c.name }
-            sql << ' (' << cols.join(', ') << ')'
-            sql << ' VALUES '
-            sql << ' (' << cols.map { 'DEFAULT' }.join(', ') << ')'
-            values = false
-          end
-
-          sql << visit(values, a) if values
-          sql
-        end
-      end
-    end
-  end
-end

data/lib/arel/visitors/firebird.rb

@@ -1,79 +0,0 @@
-require 'arel/visitors/compat'
-
-module Arel
-  module Visitors
-    class Firebird < Arel::Visitors::ToSql
-
-      if ArJdbc::AR42
-        def visit_Arel_Nodes_SelectStatement(o, a)
-          a = o.cores.inject(a) { |c, x| visit_Arel_Nodes_SelectCore(x, c) }
-
-          limit, offset = o.limit, o.offset
-          if limit || offset
-            select = a.parts[0]
-
-            sql = Arel::Collectors::SQLString.new
-            visit(limit, sql) if limit
-            if offset
-              sql << ' ' if limit
-              visit(offset, sql)
-            end
-
-            a.parts[0] = "#{select} #{sql.value}"
-          end
-
-          unless o.orders.empty?
-            a << ' ORDER BY '
-            last = o.orders.length - 1
-            o.orders.each_with_index do |x, i|
-              visit(x, a);  a << ', ' unless last == i
-            end
-          end
-
-          a
-        end
-
-        def visit_Arel_Nodes_Limit(o, a)
-          a << "FIRST #{limit_for(o)}"
-        end
-
-        def visit_Arel_Nodes_Offset(o, a)
-          a << 'SKIP '; visit(o.value, a)
-        end
-
-      else
-
-        def visit_Arel_Nodes_SelectStatement o, a = nil
-          if o.limit
-            limit = do_visit o.limit.expr, a
-          else
-            limit = nil
-          end
-          if o.offset
-            offset = do_visit o.offset.expr, a
-          else
-            offset = nil
-          end
-
-          sql = o.cores.map { |x| do_visit_select_core x, a }.join
-          @connection.insert_limit_offset!(sql, limit, offset) if limit || offset
-
-          unless o.orders.empty?
-            sql << ' ORDER BY '
-            last = o.orders.length - 1
-            o.orders.each_with_index do |x, i|
-              sql << do_visit(x, a);  sql << ', ' unless last == i
-            end
-          end
-
-          sql
-        end
-      end
-
-    end
-  end
-end
-
-Arel::Collectors::Bind.class_eval do
-  attr_reader :parts
-end if defined? Arel::Collectors::Bind