activerecord-aurora-serverless-adapter 5.2.2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60b59ea21f9e813832a9b157fd65ae5d9d686afb0f04c51700cd5664eeb2edcd
-  data.tar.gz: 6555d62f42ccb9c421382353f5fa14990c456a2d3555437b03965a3ed0d3d97d
+  metadata.gz: 753090515e0b5d6dc65ac1fdabd712a1c7c673af742340d6e89c41464d1f5863
+  data.tar.gz: d48a50c7bc45a756202b4377ee16693db6d1ea153ba52d89459a3cb64f85f726
 SHA512:
-  metadata.gz: 4271e26bc9ad5f0a8de508b30914cd39d7d870e45c5985a6857ec1881fcc2c6ff6b23a38d1c611c9beba607a658cabd4723b8d45140afd365121a0d992f9b762
-  data.tar.gz: 4cc64d2e19eff3da7f7fdc5d939f90a40c952cfdaf72fd6168b3fd7280fec7aa409038707c6c691da3522a29c49dc313f0949e5f01b6fb21b43d3fe491bb9e2a
+  metadata.gz: 418749f96453b0dedf58dc2183e4886f09180423c008ab2f7c0126f2db4abf031b9ac3f3df80cba3c2088b4a14a1798b3861df5f31cf0e0847ebcbf6f4c4092d
+  data.tar.gz: 700cab49d4ea92f32c24b74c2cc1edee63a1c0ad42004db8dcc56560486144ea7a1491cee584d9fba60ffef3d1aad6619180fc8f97a4d987c5108465bb2846b8

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
-ENV['RAILS_VERSION'] = '5.2.4.1'
+ENV['RAILS_VERSION'] = '6.0.2.1'
 
 # This allows us to bundle to Rails via Git to get the ActiveRecord test files
 # which comes down to a git tag. We can also use the `RAILS_VERSION` env variable
@@ -28,5 +28,3 @@ version = ENV['RAILS_VERSION'] || begin
   end
 end
 gem 'rails', github: "rails/rails", tag: "v#{version}"
-gem 'mocha', '1.9.0', require: false
-gem 'bcrypt'

data/Gemfile.lock

@@ -1,76 +1,91 @@
 GIT
   remote: https://github.com/rails/rails
-  revision: 56f45bedd617a76e8e3596c84c872a37c8be9795
-  tag: v5.2.4.1
+  revision: 3a6e8a3ff94f8690dcd68d5184600eabc9e05664
+  tag: v6.0.2.1
   specs:
-    actioncable (5.2.4.1)
-      actionpack (= 5.2.4.1)
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      actionview (= 5.2.4.1)
-      activejob (= 5.2.4.1)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.1)
-      actionview (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.1)
-      activesupport (= 5.2.4.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.4.1)
-      activesupport (= 5.2.4.1)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activerecord (5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
-      arel (>= 9.0)
-    activestorage (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activerecord (= 5.2.4.1)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    rails (5.2.4.1)
-      actioncable (= 5.2.4.1)
-      actionmailer (= 5.2.4.1)
-      actionpack (= 5.2.4.1)
-      actionview (= 5.2.4.1)
-      activejob (= 5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activerecord (= 5.2.4.1)
-      activestorage (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+      zeitwerk (~> 2.2)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.1)
+      railties (= 6.0.2.1)
       sprockets-rails (>= 2.0.0)
-    railties (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
 
 PATH
   remote: .
   specs:
-    activerecord-aurora-serverless-adapter (5.2.2)
-      activerecord (~> 5.2.0)
+    activerecord-aurora-serverless-adapter (6.0.0)
+      activerecord (>= 6.0)
       aws-sdk-rdsdataservice
-      retriable
 
 GEM
   remote: https://rubygems.org/
@@ -80,10 +95,9 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    arel (9.0.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.265.0)
-    aws-sdk-core (3.89.1)
+    aws-partitions (1.260.0)
+    aws-sdk-core (3.86.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -93,7 +107,6 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
-    bcrypt (3.1.13)
     builder (3.2.4)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
@@ -112,7 +125,6 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    metaclass (0.0.4)
     method_source (0.9.2)
     mimemagic (0.3.3)
     mini_mime (1.0.2)
@@ -125,8 +137,6 @@ GEM
       ruby-progressbar
     minitest-retry (0.1.9)
       minitest (>= 5.0)
-    mocha (1.9.0)
-      metaclass (~> 0.0.1)
     nio4r (2.5.2)
     nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
@@ -142,7 +152,6 @@ GEM
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     rake (13.0.1)
-    retriable (3.1.2)
     ruby-progressbar (1.10.1)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
@@ -159,6 +168,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -166,12 +176,10 @@ PLATFORMS
 DEPENDENCIES
   activerecord-aurora-serverless-adapter!
   appraisal
-  bcrypt
   dotenv
   minitest
   minitest-reporters
   minitest-retry
-  mocha (= 1.9.0)
   pry
   rails!
   rake

data/README.md

@@ -1,5 +1,5 @@
 
-# Activerecord Aurora Serverless Adapter
+# ActiveRecord Aurora Serverless Adapter
 
 <a href="https://www.youtube.com/watch?v=Q0cqKl6ktIg"><img alt="Aurora Serverless on Rails" src="https://user-images.githubusercontent.com/2381/71551059-c507f180-29ab-11ea-91dc-0e83a0ed317f.png"></a>
 
@@ -7,7 +7,7 @@
 
 <a href="https://github.com/customink/lamby"><img src="https://user-images.githubusercontent.com/2381/59363668-89edeb80-8d03-11e9-9985-2ce14361b7e3.png" alt="Lamby: Simple Rails & AWS Lambda Integration using Rack." align="right" width="300" /></a>
 
-Simple ActiveRecord Mysql2 adapter extensions to allow Rails to use [AWS Aurora Serverless](https://aws.amazon.com/rds/aurora/serverless/) via the [Aws::RDSDataService::Client](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/RDSDataService/Client.html) internface. Perfect if you are using [Lamby](https://lamby.custominktech.com) to deploy your Rails applications to AWS Lambda.
+Simple ActiveRecord Mysql2 adapter extensions to allow Rails to use [AWS Aurora Serverless](https://aws.amazon.com/rds/aurora/serverless/) via the [Aws::RDSDataService::Client](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/RDSDataService/Client.html) interface. Perfect if you are using [Lamby](https://lamby.custominktech.com) to deploy your Rails applications to AWS Lambda.
 
 **[Lamby: Simple Rails & AWS Lambda Integration using Rack.](https://lamby.custominktech.com)**
 
@@ -16,6 +16,7 @@ Simple ActiveRecord Mysql2 adapter extensions to allow Rails to use [AWS Aurora
 
 This gem allows Rails to seamless use
 
+* Tested on Rails v5.2 and v6.0.
 * No need for the `mysql2` gem at all!
 * Developed and tested with Aurora Serverless MySQL v5.6.
 * Emoji support via `utf8mb4`. Please configure your cluster's parameter group. See our [CDK Stack](/blob/master/test/aurora-serverless/lib/aurora-serverless-stack.ts) for examples.
@@ -58,7 +59,7 @@ Cloning the repo and running the tests locally is super easy assuming you have:
 1. Docker Installed
 2. AWS Account Configured
 
-These commands will use Docker to setup a node runtime leveraging [AWD CDK](https://github.com/aws/aws-cdk) to deploy a Aurora Serverless stack. Note, you may be to use/set `AWS_PROFILE` for the deploy command.
+These commands will use Docker to setup a node runtime leveraging [AWD CDK](https://github.com/aws/aws-cdk) to deploy an Aurora Serverless stack. Note, you may be to use/set `AWS_PROFILE` for the deploy command.
 
 ```s
 $ ./bin/bootstrap
@@ -67,7 +68,7 @@ $ export AASA_MASTER_PASS=supersecret
 $ ./test/bin/deploy-aurora
 ```
 
-The outputs of this deployed stack will containt an `AASASecretArn` and a `AASAAuroraClusterArn` value. Please place these into the local `.env` file in the following format where `{{ Value }}` is replaced.
+The outputs of this deployed stack will contain an `AASASecretArn` and a `AASAAuroraClusterArn` value. Please place these into the local `.env` file in the following format where `{{ Value }}` is replaced.
 
 ```
 AASA_SECRET_ARN={{ AASASecretArn }}

data/activerecord-aurora-serverless-adapter.gemspec

@@ -12,16 +12,13 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/customink/activerecord-aurora-serverless-adapter'
   spec.license       = 'MIT'
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      f.match(%r{^(test|spec|features|docker)/i})
-    end
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_runtime_dependency     'activerecord', '~> 5.2.0'
+  spec.add_runtime_dependency     'activerecord', '>= 6.0'
   spec.add_runtime_dependency     'aws-sdk-rdsdataservice'
-  spec.add_runtime_dependency     'retriable'
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'dotenv'
   spec.add_development_dependency 'minitest'

data/lib/active_record/connection_adapters/aurora_serverless/client.rb

@@ -23,14 +23,6 @@ module ActiveRecord
           "#<#{self.class} database: #{database.inspect}, raw_client: #{raw_client.inspect}>"
         end
 
-        def execute_statement_retry(sql)
-          if @connected
-            execute_statement(sql)
-          else
-            auto_paused_retry { execute_statement(sql) }
-          end
-        end
-
         def execute_statement(sql)
           id = @transactions.first
           debug_transactions "EXECUTE: #{sql}", id
@@ -42,7 +34,6 @@ module ActiveRecord
             include_result_metadata: true,
             transaction_id: id
           }).tap do |r|
-            @connected = true
             @affected_rows = affected_rows_result(r)
             @last_id = last_id_result(r)
           end
@@ -109,22 +100,6 @@ module ActiveRecord
           field.long_value || field.string_value || field.double_value
         end
 
-        def auto_paused_retry
-          error_klass = Aws::RDSDataService::Errors::BadRequestException
-          error_msg = /last packet sent successfully to the server was/
-          retry_msg = 'Aurora auto paused, retrying...'
-          on_retry = Proc.new { sleep(1) ; ::Rails.logger.info(retry_msg)  }
-          Retriable.retriable({
-            on: { error_klass => error_msg },
-            on_retry: on_retry,
-            tries: auto_paused_retry_count
-          }) { yield }
-        end
-
-        def auto_paused_retry_count
-          10
-        end
-
         def debug_transactions(name, id = 'NOID')
           return unless @debug_transactions
           ActiveRecord::Base.logger.debug "  \e[36m#{name} #{id} #{object_id}\e[0m"

data/lib/active_record/connection_adapters/aurora_serverless/mysql2.rb

@@ -33,32 +33,33 @@ module ActiveRecord
 
       # Abstract Mysql Adapter
 
-      def translate_exception(exception, message)
-        case message
+      def translate_exception(exception, message:, sql:, binds:)
+        msg = exception.message
+        case msg
         when /Duplicate entry/
-          RecordNotUnique.new(message)
+          RecordNotUnique.new(msg, sql: sql, binds: binds)
         when /foreign key constraint fails/
-          InvalidForeignKey.new(message)
+          InvalidForeignKey.new(msg, sql: sql, binds: binds)
         when /Cannot add foreign key constraint/,
              /referenced column .* in foreign key constraint .* are incompatible/
-          mismatched_foreign_key(message)
+          mismatched_foreign_key(msg, sql: sql, binds: binds)
         when /Data too long for column/
-          ValueTooLong.new(message)
+          ValueTooLong.new(msg, sql: sql, binds: binds)
         when /Out of range value for column/
-          RangeError.new(message)
+          RangeError.new(msg, sql: sql, binds: binds)
         when /Column .* cannot be null/,
              /Field .* doesn't have a default value/
-          NotNullViolation.new(message)
+          NotNullViolation.new(msg, sql: sql, binds: binds)
         when /Deadlock found when trying to get lock/
-          Deadlocked.new(message)
+          Deadlocked.new(msg, sql: sql, binds: binds)
         when /Lock wait timeout exceeded/
-          LockWaitTimeout.new(message)
+          LockWaitTimeout.new(msg, sql: sql, binds: binds)
         when /max_statement_time exceeded/, /Sort aborted/
-          StatementTimeout.new(message)
+          StatementTimeout.new(msg, sql: sql, binds: binds)
         when /Query execution was interrupted/
-          QueryCanceled.new(message)
+          QueryCanceled.new(msg, sql: sql, binds: binds)
         else
-          ActiveRecord::StatementInvalid.new(message)
+          ActiveRecord::StatementInvalid.new(msg, sql: sql, binds: binds)
         end
       end
 

data/lib/active_record/connection_adapters/aurora_serverless/mysql2/client.rb

@@ -63,10 +63,6 @@ module ActiveRecord
             nil
           end
 
-          def more_results?
-            false
-          end
-
         end
       end
       AuroraServerless::Client.include AuroraServerless::Mysql2::Client

data/lib/active_record/connection_adapters/aurora_serverless/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module AuroraServerless
-      VERSION = "5.2.2"
+      VERSION = "6.0.0"
     end
   end
 end

data/lib/mysql2.rb

@@ -1,4 +1,5 @@
 # This is here so the Mysql2 gem require will no-op.
 #
 module Mysql2
+  VERSION = '0.0.0'
 end

metadata

@@ -1,45 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-aurora-serverless-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 6.0.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-rdsdataservice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: retriable
+  name: aws-sdk-rdsdataservice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -204,30 +190,6 @@ files:
 - lib/active_record/connection_adapters/aurora_serverless_adapter.rb
 - lib/activerecord-aurora-serverless-adapter.rb
 - lib/mysql2.rb
-- test/aasa_helper.rb
-- test/aurora-serverless/bin/aurora-serverless.ts
-- test/aurora-serverless/cdk.context.json
-- test/aurora-serverless/cdk.json
-- test/aurora-serverless/lib/aurora-serverless-stack.ts
-- test/aurora-serverless/package-lock.json
-- test/aurora-serverless/package.json
-- test/aurora-serverless/tsconfig.json
-- test/bin/_deploy-aurora
-- test/bin/_wakeup
-- test/bin/deploy-aurora
-- test/bin/wakeup
-- test/cases/aasa/mysql_client_test.rb
-- test/cases/aasa/mysql_result_test.rb
-- test/cases/aasa/mysql_types_test.rb
-- test/cases/coerced_tests.rb
-- test/config.yml
-- test/support/aasa_coerceable.rb
-- test/support/aasa_env.rb
-- test/support/aasa_fixtures.rb
-- test/support/aasa_minitest.rb
-- test/support/aasa_mysqlpatch.rb
-- test/support/aasa_paths.rb
-- test/support/aasa_rake.rb
 homepage: https://github.com/customink/activerecord-aurora-serverless-adapter
 licenses:
 - MIT