activerecord-jdbc-alt-adapter 70.0.0.rc2-java → 70.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61ee665d7dfe0dc2b0a84c5c2014ba1c4427dfb63a52a0992eee1ba8449360c0
-  data.tar.gz: fdd181f5107c6af495b97f3d67bc5031fd9b9c0a9e454ea6e0fc06e280a544dd
+  metadata.gz: 0c3d514e216f7046d55347dee117af72c6f9970542a59d720e4a570adc51481c
+  data.tar.gz: fb7ae7aa872404230ce35232237c4917f73971d0a39ef40998ca3ab6e11422af
 SHA512:
-  metadata.gz: 16c1ca8af769eec8eaab04650e6293f0b0e8cfdc20ae77bb5c2d37c276f5104ed3e42da35a1397215f4d8925bd192e87a18c163cdbdb03578573baa181d7550b
-  data.tar.gz: e200993abec93188a25038d74a3641d83e16cd11d87b10fba1051d51e2e61622dca977edad111c965215e731f51d013bec95bdf42ef73f6c98067a118acf9117
+  metadata.gz: 53c2771f7803cf7b5b34ddfb3d3786c4478263fd43ec609bf726b60b8c9056e799f3ebf61f6d48fc3fc7450ee2c15e9cf66be61784a48fec3edb64cd36b88d15
+  data.tar.gz: 7c23c77d26b5e845c3f9c779c5761f4fbce1ff29db75e5a8a9ea7cf115f14b2cf4be6d56d172f16200f5866f54e5c68253f0293c44be7bd2c2c7034a908af9a7

data/.github/workflows/main.yml

@@ -20,6 +20,54 @@ permissions:
   contents: read
 
 jobs:
+  test-arjdbc-mssql:
+
+    name: ARJDBC Tests (mssql)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['jruby-9.4.2.0']
+        db: ['mssql']
+        test_targets: ['test_mssql']
+
+    services:
+      mssql:
+        image: mcr.microsoft.com/mssql/server:2019-latest
+        env:
+          ACCEPT_EULA: Y
+          MSSQL_SA_PASSWORD: Password12!
+        ports:
+          - 1433:1433
+        options: >-
+          --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P \"Password12!\" -l 30 -Q \"SELECT 1\""
+          --health-start-period 10s
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+
+    env:
+      DB: ${{ matrix.db }}
+      JRUBY_OPTS: "-J-Xms64M -J-Xmx1024M"
+      SQLUSER: SA
+      SQLPASS: Password12!
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Setup database
+        run: /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "Password12!" -Q "CREATE DATABASE arjdbc_test;"
+      - name: Build
+        run: |
+          rake jar
+      - name: Run tests
+        run: |
+          bundle exec rake ${{ matrix.test_targets }}
+
   test-rails-pgsql:
 
     name: Rails Tests (Postgres)
@@ -27,7 +75,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [ 'jruby-head' ]
+        ruby-version: [ 'jruby-9.4.2.0' ]
         db: [ 'postgresql' ]
         test_targets: [ "rails:test_postgresql" ]
         ar_version: ["7-0-stable"]
@@ -78,7 +126,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['jruby-head']
+        ruby-version: ['jruby-9.4.2.0']
         db: ['postgresql']
         test_targets: ["db:postgresql test_postgresql"]
         prepared_statements: ['false', 'true']

data/lib/arjdbc/abstract/database_statements.rb

@@ -10,6 +10,8 @@ module ArJdbc
       NO_BINDS = [].freeze
 
       def exec_insert(sql, name = nil, binds = NO_BINDS, pk = nil, sequence_name = nil)
+        sql = transform_query(sql)
+
         if preventing_writes?
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -31,6 +33,8 @@ module ArJdbc
       # It appears that at this point (AR 5.0) "prepare" should only ever be true
       # if prepared statements are enabled
       def exec_query(sql, name = nil, binds = NO_BINDS, prepare: false, async: false)
+        sql = transform_query(sql)
+
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -52,6 +56,8 @@ module ArJdbc
       end
 
       def exec_update(sql, name = nil, binds = NO_BINDS)
+        sql = transform_query(sql)
+
         if preventing_writes?
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end
@@ -70,6 +76,8 @@ module ArJdbc
       alias :exec_delete :exec_update
 
       def execute(sql, name = nil, async: false)
+        sql = transform_query(sql)
+        
         if preventing_writes? && write_query?(sql)
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
         end

data/lib/arjdbc/mssql/adapter.rb

@@ -472,7 +472,7 @@ module ActiveRecord
       # NOTE: This is ready, all implemented in the java part of adapter,
       # it uses MSSQLColumn, SqlTypeMetadata, etc.
       def column_definitions(table_name)
-       log('JDBC: GETCOLUMNS', 'SCHEMA') { @connection.columns(table_name) }
+       log('JDBC: GETCOLUMNS', 'SCHEMA') { @connection.columns(table_name, nil, default_schema) }
       rescue => e
         # raise translate_exception_class(e, nil)
         # FIXME: this breaks one arjdbc test but fixes activerecord tests

data/lib/arjdbc/mssql/connection_methods.rb

@@ -80,7 +80,7 @@ ArJdbc::ConnectionMethods.module_eval do
       url << "lockTimeout=#{config[:lock_timeout].to_i};"
       url << "encrypt=#{config[:encrypt]};" if config.key?(:encrypt)
       url << "trustServerCertificate=#{config[:trust_server_certificate]};" if config.key?(:trust_server_certificate)
-      app = config[:appname] || config[:application]
+      app = config[:application_name] || config[:appname] || config[:application]
       url << "applicationName=#{app};" if app
       isc = config[:integrated_security] # Win only - needs sqljdbc_auth.dll
       url << "integratedSecurity=#{isc};" unless isc.nil?

data/lib/arjdbc/postgresql/adapter.rb

@@ -21,6 +21,7 @@ require 'arjdbc/abstract/transaction_support'
 require 'arjdbc/postgresql/base/array_decoder'
 require 'arjdbc/postgresql/base/array_encoder'
 require 'arjdbc/postgresql/name'
+require 'active_model'
 
 module ArJdbc
   # Strives to provide Rails built-in PostgreSQL adapter (API) compatibility.

data/lib/arjdbc/postgresql/connection_methods.rb

@@ -24,7 +24,14 @@ ArJdbc::ConnectionMethods.module_eval do
     port = config[:port] ||= ( ENV['PGPORT'] || 5432 )
     database = config[:database] || config[:dbname] || ENV['PGDATABASE']
 
-    config[:url] ||= "jdbc:postgresql://#{host}:#{port}/#{database}"
+    app = config[:application_name] || config[:appname] || config[:application]
+
+    config[:url] ||= if app
+                       "jdbc:postgresql://#{host}:#{port}/#{database}?ApplicationName=#{app}"
+                     else
+                       "jdbc:postgresql://#{host}:#{port}/#{database}"
+                     end
+
     config[:url] << config[:pg_params] if config[:pg_params]
 
     config[:username] ||= ( config[:user] || ENV['PGUSER'] || ENV_JAVA['user.name'] )

data/lib/arjdbc/postgresql/oid_types.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 require 'thread'
 
 module ArJdbc
@@ -91,8 +90,23 @@ module ArJdbc
       end
 
       def get_oid_type(oid, fmod, column_name, sql_type = '') # :nodoc:
-        if !type_map.key?(oid)
-          load_additional_types([oid])
+        # Note: type_map is storing a bunch of oid type prefixed with a namespace even
+        # if they are not namespaced (e.g. ""."oidvector").  builtin types which are
+        # common seem to not be prefixed (e.g. "varchar").  OID numbers are also keys
+        # but JDBC never returns those.  So the current scheme is to check with
+        # what we got and that covers number and plain strings and otherwise we will
+        # wrap with the namespace form.
+        found = type_map.key?(oid)
+
+        if !found
+          key = oid.kind_of?(String) && oid != "oid" ? "\"\".\"#{oid}\"" : oid
+          found = type_map.key?(key)
+
+          if !found
+            load_additional_types([oid])
+          else
+            oid = key
+          end
         end
 
         type_map.fetch(oid, fmod, sql_type) {
@@ -207,7 +221,6 @@ module ArJdbc
         initializer = ArjdbcTypeMapInitializer.new(type_map)
         load_types_queries(initializer, oids) do |query|
           execute_and_clear(query, "SCHEMA", []) do |records|
-            #puts "RECORDS: #{records.to_a}"
             initializer.run(records)
           end
         end
@@ -224,8 +237,6 @@ module ArJdbc
             yield query + "WHERE t.oid IN (%s)" % oids.join(", ")
           else
             in_list = oids.map { |e| %Q{'#{e}'} }.join(", ")
-            #puts caller[0..40]
-            puts "IN_LIST = #{in_list}"
             yield query + "WHERE t.typname IN (%s)" % in_list
           end
         else

data/lib/arjdbc/sqlite3/adapter.rb

@@ -756,6 +756,29 @@ module ActiveRecord::ConnectionAdapters
     # Note: This is not an override of ours but a moved line from AR Sqlite3Adapter to register ours vs our copied module (which would be their class).
 #    ActiveSupport.run_load_hooks(:active_record_sqlite3adapter, SQLite3Adapter)
 
+    # DIFFERENCE: FQN
+    class SQLite3Integer < ::ActiveRecord::Type::Integer # :nodoc:
+      private
+      def _limit
+        # INTEGER storage class can be stored 8 bytes value.
+        # See https://www.sqlite.org/datatype3.html#storage_classes_and_datatypes
+        limit || 8
+      end
+    end
+
+    # DIFFERENCE: FQN
+    ::ActiveRecord::Type.register(:integer, SQLite3Integer, adapter: :sqlite3)
+
+    class << self
+      private
+        def initialize_type_map(m)
+          super
+          register_class_with_limit m, %r(int)i, SQLite3Integer
+        end
+    end
+
+    TYPE_MAP = ActiveRecord::Type::TypeMap.new.tap { |m| initialize_type_map(m) }
+
     private
 
     # because the JDBC driver doesn't like multiple SQL statements in one JDBC statement
@@ -763,6 +786,10 @@ module ActiveRecord::ConnectionAdapters
       total_sql
     end
 
+    def type_map
+      TYPE_MAP
+    end
+
     # combine
     def write_query?(sql) # :nodoc:
       return sql.any? { |stmt| super(stmt) } if sql.kind_of? Array
@@ -770,23 +797,5 @@ module ActiveRecord::ConnectionAdapters
     rescue ArgumentError # Invalid encoding
       !READ_QUERY.match?(sql.b)
     end
-
-    def initialize_type_map(m = type_map)
-      super
-      register_class_with_limit m, %r(int)i, SQLite3Integer
-    end
-
-    # DIFFERENCE: FQN
-    class SQLite3Integer < ::ActiveRecord::Type::Integer # :nodoc:
-      private
-      def _limit
-        # INTEGER storage class can be stored 8 bytes value.
-        # See https://www.sqlite.org/datatype3.html#storage_classes_and_datatypes
-        limit || 8
-      end
-    end
-
-    # DIFFERENCE: FQN
-    ::ActiveRecord::Type.register(:integer, SQLite3Integer, adapter: :sqlite3)
   end
 end

data/lib/arjdbc/tasks/mssql_database_tasks.rb

@@ -25,7 +25,7 @@ module ArJdbc
       rescue ActiveRecord::StatementInvalid => e
         case e.message
         when /database .* already exists/i
-          raise ActiveRecord::Tasks::DatabaseAlreadyExists
+          raise ActiveRecord::DatabaseAlreadyExists
         else
           raise
         end

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArJdbc
-  VERSION = '70.0.0.rc2'
+  VERSION = '70.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 70.0.0.rc2
+  version: 70.1.0
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek, Jesse Chavez, and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -231,9 +231,9 @@ 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.25
 signing_key: