activerecord-jdbc-alt-adapter 60.0.0-java → 60.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4018232c43fd8cfccb8349f8c9a1be1ebd8addf9aaa8f96f3830df20ceb33c96
-  data.tar.gz: 0a4971a64e52dbd5e3623777593d596511d96da7217ef8bcc83472a7638fd9d5
+  metadata.gz: f83a5e387ec9999cc730027498dec97428cfee7b3c3edcc6845a779c01c4272a
+  data.tar.gz: 3a7e9ce2b8e6e968bdb21f4ac72a9f498e3226c414ec4b003e4b463dffc74062
 SHA512:
-  metadata.gz: 28bae6826777ff61c6643bb96fab4aba5489c6d6650d6d1cfa1f3773f5cf7f85464b96e58ec113d61a02b513e928dcf71d82c63b569b710c247bd15ef371bb41
-  data.tar.gz: 733b05c9b0ccb42aa53480f8a4ee4bd6432849defb4483f3583364120420bf1c90df011a5b7abf73bb83c55cc3b85e71bb863da7cbc025852862ccc85841daf0
+  metadata.gz: f71a50d80a6f01837512d87a52ef32ec69a245e1927086cc0736efa35835c57710652f1ad6c294039422ad69eea20d308b48df02ba8d43e7c1acea4de7358ee0
+  data.tar.gz: 732cde407f1c4ff98bb7e528ea183dd483e2b8edf8a475f60f445dc7580fd8e8d3374ca248b5d7eb2f02b1c596efdeed5ce7dc393563425565657ca6302d6145

data/.gitignore

@@ -34,3 +34,5 @@ activerecord-jdbc.iml
 lib/arjdbc/jdbc/adapter_java.jar
 .jrubyrc
 tags
+pik.sh
+.ruby-version

data/.travis.yml

@@ -69,6 +69,9 @@ matrix:
     - addons:
         postgresql: "10"
       env: DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
+    - addons:
+        postgresql: "10"
+      env: DB=postgresql PREPARED_STATEMENTS=true JRUBY_OPTS=-J-Duser.timezone=America/Detroit
     - addons:
         postgresql: "9.4"
       env: DB=postgresql PREPARED_STATEMENTS=true

data/Gemfile

@@ -55,7 +55,7 @@ group :test do
   gem 'mocha', '~> 1.2', require: false # Rails has '~> 0.14'
 
   gem 'bcrypt', '~> 3.1.11', require: false
-  gem 'jdbc-mssql', '~> 0.7.0', require: nil
+  gem 'jdbc-mssql', '~> 0.9.0', require: nil
   # gem 'pry-debugger-jruby', platform: :jruby
 end
 

data/README.md

@@ -6,16 +6,20 @@ supported by the original adapter such as PostgreSQL but it is advised to
 use the [original adapter](https://github.com/jruby/active)
 
 This adapter only works with JRuby and it is advised to install the latest
-stable versions of Rails
+stable of this adapter and Rails
 
-- For Rails `5.0.7.2` install the `50.3.1` version of this adapter
-- For Rails `5.1.7` install the `51.3.0` version of this adapter
-- For Rails `5.2.3` install the `52.2.0` version of this adapter
-
-Support for Rails 6.0 is planned in the future.
+| Gem Version | Rails Version | min JRuby |
+| ----------- | ------------- | --------- |
+| 50.6.1      | 5.0.7.2       | 9.1.x     |
+| 51.6.1      | 5.1.7         | 9.1.x     |
+| 52.5.1      | 5.2.4.1       | 9.1.x     |
+| 60.0.0      | 6.0.2         | 9.2.9     |
 
 This adapter passes most of the Rails tests (ActiveRecord tests) with the
-exception of some test that are not compatible with the SQL Server
+exception of some test that are not compatible with the SQL Server. To run
+the test use the following fork [Rails](https://github.com/JesseChavez/rails/tree/6-0-stable-dev),
+and the instructions in file `RUNNING_TESTS.md`. The fork has some
+schema tweaks to make it compatible with SQL Server.
 
 ### How to use it:
 
@@ -24,13 +28,17 @@ Add the following to your `Gemfile`:
 ```ruby
 platforms :jruby do
   # Use jdbc as the database for Active Record
-  gem 'activerecord-jdbc-alt-adapter', '~> 50.3.1', require: 'arjdbc'
-  gem 'jdbc-mssql', '~> 0.6.0'
+  gem 'activerecord-jdbc-alt-adapter', '~> 60.0.0'
+  gem 'jdbc-mssql', '~> 0.7.0'
 end
 ```
 
-Or look at the sample rails 5.0 app  [wombat](https://github.com/JesseChavez/wombat50)
-and see how is set up.
+Or look at the sample rails and see how is set up:
+
+- Rails 6.0 sample app [wombat60](https://github.com/JesseChavez/wombat60)
+
+- Old rails 5.0 app  [wombat50](https://github.com/JesseChavez/wombat50)
+
 
 ### Breaking changes
 
@@ -102,14 +110,6 @@ production:
 ```
 
 
-### NOTE
-
-Keep one eye in the Rails connection pool, we have not thoroughly tested that
-part since we don't use the default Rails connection pool, other than that
-this adapter should just work.
-
-
-
 # ActiveRecord JDBC Adapter
 
 [![Gem Version](https://badge.fury.io/rb/activerecord-jdbc-adapter.svg)][7]

data/lib/arjdbc/postgresql/adapter.rb

@@ -303,6 +303,10 @@ module ArJdbc
       @has_pg_hint_plan
     end
 
+    def supports_common_table_expressions?
+      true
+    end
+
     def supports_lazy_transactions?
       true
     end
@@ -379,13 +383,23 @@ module ArJdbc
       end
     end
 
+    def execute_batch(statements, name = nil)
+      if statements.is_a? Array
+        execute(combine_multi_statements(statements), name)
+      else
+        execute(statements, name)
+      end
+    end
+
     def explain(arel, binds = [])
       sql, binds = to_sql_and_binds(arel, binds)
       ActiveRecord::ConnectionAdapters::PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query("EXPLAIN #{sql}", 'EXPLAIN', binds))
     end
 
     # from ActiveRecord::ConnectionAdapters::PostgreSQL::DatabaseStatements
-    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(:begin, :commit, :explain, :select, :set, :show, :release, :savepoint, :rollback) # :nodoc:
+    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
+      :begin, :commit, :explain, :select, :set, :show, :release, :savepoint, :rollback, :with
+    ) # :nodoc:
     private_constant :READ_QUERY
 
     def write_query?(sql) # :nodoc:
@@ -435,7 +449,12 @@ module ArJdbc
     end
 
     def build_truncate_statements(*table_names)
-      "TRUNCATE TABLE #{table_names.map(&method(:quote_table_name)).join(", ")}"
+      ["TRUNCATE TABLE #{table_names.flatten.map(&method(:quote_table_name)).join(", ")}"]
+    end
+
+    def truncate(table_name, name = nil)
+      ActiveRecord::Base.clear_query_caches_for_current_thread if @query_cache_enabled
+      execute("TRUNCATE TABLE #{quote_table_name(table_name)}", name)
     end
 
     def all_schemas
@@ -493,7 +512,7 @@ module ArJdbc
     alias_method :quote_schema_name, :quote_column_name
 
     # Need to clear the cache even though the AR adapter doesn't for some reason
-    def remove_column(table_name, column_name, type = nil, options = {})
+    def remove_column(table_name, column_name, type = nil, **options)
       super
       clear_cache!
     end

data/lib/arjdbc/postgresql/oid_types.rb

@@ -213,7 +213,7 @@ module ArJdbc
         if oid
           if oid.is_a? Numeric || oid.match(/^\d+$/)
             # numeric OID
-            query += "WHERE t.oid::integer = %s" % oid
+            query += "WHERE t.oid = %s" % oid
 
           elsif m = oid.match(/"?(\w+)"?\."?(\w+)"?/)
             # namespace and type name

data/lib/arjdbc/sqlite3/adapter.rb

@@ -97,6 +97,10 @@ module ArJdbc
       true
     end
 
+    def supports_common_table_expressions?
+      database_version >= "3.8.3"
+    end
+
     def supports_insert_on_conflict?
       database_version >= "3.24.0"
     end
@@ -154,7 +158,9 @@ module ArJdbc
     # DATABASE STATEMENTS ======================================
     #++
 
-    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(:begin, :commit, :explain, :select, :pragma, :release, :savepoint, :rollback) # :nodoc:
+    READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
+      :begin, :commit, :explain, :select, :pragma, :release, :savepoint, :rollback, :with
+    ) # :nodoc:
     private_constant :READ_QUERY
 
     def write_query?(sql) # :nodoc:
@@ -223,7 +229,7 @@ module ArJdbc
       end
     end
 
-    def remove_column(table_name, column_name, type = nil, options = {}) #:nodoc:
+    def remove_column(table_name, column_name, type = nil, **options) #:nodoc:
       alter_table(table_name) do |definition|
         definition.remove_column column_name
         definition.foreign_keys.delete_if do |_, fk_options|
@@ -317,11 +323,17 @@ module ArJdbc
       SQLite3Adapter::Version.new(query_value("SELECT sqlite_version(*)"))
     end
 
+    def build_truncate_statement(table_name)
+      "DELETE FROM #{quote_table_name(table_name)}"
+    end
+
     def build_truncate_statements(*table_names)
-      truncate_tables = table_names.map do |table_name|
-        "DELETE FROM #{quote_table_name(table_name)}"
-      end
-      combine_multi_statements(truncate_tables)
+      table_names.flatten.map { |table_name| build_truncate_statement table_name }
+    end
+
+    def truncate(table_name, name = nil)
+      ActiveRecord::Base.clear_query_caches_for_current_thread if @query_cache_enabled
+      execute(build_truncate_statement(table_name), name)
     end
 
     def check_version
@@ -352,7 +364,8 @@ module ArJdbc
     # See: https://www.sqlite.org/lang_altertable.html
     # SQLite has an additional restriction on the ALTER TABLE statement
     def invalid_alter_table_type?(type, options)
-      type.to_sym == :primary_key || options[:primary_key]
+      type.to_sym == :primary_key || options[:primary_key] ||
+        options[:null] == false && options[:default].nil?
     end
 
     def alter_table(table_name, foreign_keys = foreign_keys(table_name), **options)

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '60.0.0'
+  VERSION = '60.1.0'
 end

data/rakelib/01-tomcat.rake

@@ -1,6 +1,6 @@
 namespace :'tomcat-jndi' do # contains a FS JNDI impl (for tests)
 
-  TOMCAT_MAVEN_REPO = 'http://repo2.maven.org/maven2/org/apache/tomcat'
+  TOMCAT_MAVEN_REPO = 'https://repo1.maven.org/maven2/org/apache/tomcat'
   TOMCAT_VERSION = '7.0.54'
 
   DOWNLOAD_DIR = File.expand_path('../test/jars', File.dirname(__FILE__))
@@ -48,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

@@ -2165,7 +2165,7 @@ public class RubyJdbcConnection extends RubyObject {
             return RubyString.newString(runtime, DateTimeUtils.dateToString(value));
         }
 
-        return DateTimeUtils.newDateAsTime(context, value, null).callMethod(context, "to_date");
+        return DateTimeUtils.newDateAsTime(context, value, DateTimeZone.UTC).callMethod(context, "to_date");
     }
 
     protected IRubyObject timeToRuby(final ThreadContext context,

data/src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java

@@ -204,6 +204,57 @@ public class MSSQLRubyJdbcConnection extends RubyJdbcConnection {
         });
     }
 
+    /**
+     * Executes an INSERT SQL statement
+     * @param context
+     * @param sql
+     * @param pk Rails PK
+     * @return ActiveRecord::Result
+     * @throws SQLException
+     */
+    @Override
+    @JRubyMethod(name = "execute_insert_pk", required = 2)
+    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject pk) {
+
+        // MSSQL does not like composite primary keys here so chop it if there is more than one column
+        IRubyObject modifiedPk = pk;
+
+        if (pk instanceof RubyArray) {
+            RubyArray ary = (RubyArray) pk;
+            if (ary.size() > 0) {
+                modifiedPk = ary.eltInternal(0);
+            }
+        }
+
+        return super.execute_insert_pk(context, sql, modifiedPk);
+    }
+
+    /**
+     * Executes an INSERT SQL statement using a prepared statement
+     * @param context
+     * @param sql
+     * @param binds RubyArray of values to be bound to the query
+     * @param pk Rails PK
+     * @return ActiveRecord::Result
+     * @throws SQLException
+     */
+    @Override
+    @JRubyMethod(name = "execute_insert_pk", required = 3)
+    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject binds,
+                                         final IRubyObject pk) {
+        // MSSQL does not like composite primary keys here so chop it if there is more than one column
+        IRubyObject modifiedPk = pk;
+
+        if (pk instanceof RubyArray) {
+            RubyArray ary = (RubyArray) pk;
+            if (ary.size() > 0) {
+                modifiedPk = ary.eltInternal(0);
+            }
+        }
+
+        return super.execute_insert_pk(context, sql, binds, modifiedPk);
+    }
+
     @Override
     protected Integer jdbcTypeFor(final String type) {
 

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

@@ -36,26 +36,18 @@ import java.io.ByteArrayInputStream;
 import java.lang.StringBuilder;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.sql.*;
+import java.sql.Date;
+import java.util.*;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 
+import org.joda.time.DateTime;
 import org.jruby.*;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.ext.bigdecimal.RubyBigDecimal;
+import org.jruby.ext.date.RubyDate;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
@@ -115,6 +107,7 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
 
     // Used to wipe trailing 0's from points (3.0, 5.6) -> (3, 5.6)
     private static final Pattern pointCleanerPattern = Pattern.compile("\\.0\\b");
+    private static final TimeZone TZ_DEFAULT = TimeZone.getDefault();
 
     private RubyClass resultClass;
     private RubyHash typeMap = null;
@@ -386,7 +379,20 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
             }
         }
 
-        super.setDateParameter(context, connection, statement, index, value, attribute, type);
+        if ( ! "Date".equals(value.getMetaClass().getName()) && value.respondsTo("to_date") ) {
+            value = value.callMethod(context, "to_date");
+        }
+
+        if (value instanceof RubyDate) {
+            RubyDate rubyDate = (RubyDate) value;
+            DateTime dt = rubyDate.getDateTime();
+            // pgjdbc needs adjustment for default JVM timezone
+            statement.setDate(index, new Date(dt.getMillis() - TZ_DEFAULT.getOffset(dt.getMillis())));
+            return;
+        }
+
+        // NOTE: assuming Date#to_s does right ...
+        statement.setDate(index, Date.valueOf(value.toString()));
     }
 
     @Override

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 60.0.0
+  version: 60.1.0
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.0.0
   name: activerecord
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -264,8 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server