activerecord-aurora-serverless-adapter 1.0.0 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d55e3b914364d41374c560c6183e7def09de56c9d3e90a9cba15bac946c10353
-  data.tar.gz: 5266a9a3be80080fbdfe5b24a85611251ac2724994f3883066e6b2c045845168
+  metadata.gz: 60b59ea21f9e813832a9b157fd65ae5d9d686afb0f04c51700cd5664eeb2edcd
+  data.tar.gz: 6555d62f42ccb9c421382353f5fa14990c456a2d3555437b03965a3ed0d3d97d
 SHA512:
-  metadata.gz: 347d5f9690887b426f7d290295c92ee402ed2a8d808097f2e796e46bcbf3bc201c133a531a1b7a20e8e3790fed4859d191fa1f1be6a25a7ca16a519ddb8dc34b
-  data.tar.gz: 30192a0925ad931dd541da411a9817ac5c58d86c2f9d7c5c2ef70cf9117f3cb9cca39664946c03eafb2ea2fe03324bc56abad3c9cfa6882bec2b6b30a306e1d0
+  metadata.gz: 4271e26bc9ad5f0a8de508b30914cd39d7d870e45c5985a6857ec1881fcc2c6ff6b23a38d1c611c9beba607a658cabd4723b8d45140afd365121a0d992f9b762
+  data.tar.gz: 4cc64d2e19eff3da7f7fdc5d939f90a40c952cfdaf72fd6168b3fd7280fec7aa409038707c6c691da3522a29c49dc313f0949e5f01b6fb21b43d3fe491bb9e2a

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
-ENV['RAILS_VERSION'] = '6.0.2.1'
+ENV['RAILS_VERSION'] = '5.2.4.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,3 +28,5 @@ 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,91 +1,76 @@
 GIT
   remote: https://github.com/rails/rails
-  revision: 3a6e8a3ff94f8690dcd68d5184600eabc9e05664
-  tag: v6.0.2.1
+  revision: 56f45bedd617a76e8e3596c84c872a37c8be9795
+  tag: v5.2.4.1
   specs:
-    actioncable (6.0.2.1)
-      actionpack (= 6.0.2.1)
+    actioncable (5.2.4.1)
+      actionpack (= 5.2.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.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)
+    actionmailer (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.1)
-      actionview (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actionpack (5.2.4.1)
+      actionview (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      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)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.4.1)
+      activesupport (= 5.2.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2.1)
-      activesupport (= 6.0.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.4.1)
+      activesupport (= 5.2.4.1)
       globalid (>= 0.3.6)
-    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)
+    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)
       marcel (~> 0.3.1)
-    activesupport (6.0.2.1)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.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)
+    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)
       bundler (>= 1.3.0)
-      railties (= 6.0.2.1)
+      railties (= 5.2.4.1)
       sprockets-rails (>= 2.0.0)
-    railties (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    railties (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      thor (>= 0.19.0, < 2.0)
 
 PATH
   remote: .
   specs:
-    activerecord-aurora-serverless-adapter (1.0.0)
-      activerecord (>= 6.0)
+    activerecord-aurora-serverless-adapter (5.2.2)
+      activerecord (~> 5.2.0)
       aws-sdk-rdsdataservice
+      retriable
 
 GEM
   remote: https://rubygems.org/
@@ -95,9 +80,10 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
+    arel (9.0.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.260.0)
-    aws-sdk-core (3.86.0)
+    aws-partitions (1.265.0)
+    aws-sdk-core (3.89.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -107,6 +93,7 @@ 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)
@@ -125,6 +112,7 @@ 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)
@@ -137,6 +125,8 @@ 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)
@@ -152,6 +142,7 @@ 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)
@@ -168,7 +159,6 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -176,10 +166,12 @@ PLATFORMS
 DEPENDENCIES
   activerecord-aurora-serverless-adapter!
   appraisal
+  bcrypt
   dotenv
   minitest
   minitest-reporters
   minitest-retry
+  mocha (= 1.9.0)
   pry
   rails!
   rake

data/activerecord-aurora-serverless-adapter.gemspec

@@ -12,13 +12,16 @@ 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 { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features|docker)/i})
+    end
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_runtime_dependency     'activerecord', '>= 6.0'
+  spec.add_runtime_dependency     'activerecord', '~> 5.2.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,6 +23,14 @@ 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
@@ -34,6 +42,7 @@ 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
@@ -100,6 +109,22 @@ 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,33 +33,32 @@ module ActiveRecord
 
       # Abstract Mysql Adapter
 
-      def translate_exception(exception, message:, sql:, binds:)
-        msg = exception.message
-        case msg
+      def translate_exception(exception, message)
+        case message
         when /Duplicate entry/
-          RecordNotUnique.new(msg, sql: sql, binds: binds)
+          RecordNotUnique.new(message)
         when /foreign key constraint fails/
-          InvalidForeignKey.new(msg, sql: sql, binds: binds)
+          InvalidForeignKey.new(message)
         when /Cannot add foreign key constraint/,
              /referenced column .* in foreign key constraint .* are incompatible/
-          mismatched_foreign_key(msg, sql: sql, binds: binds)
+          mismatched_foreign_key(message)
         when /Data too long for column/
-          ValueTooLong.new(msg, sql: sql, binds: binds)
+          ValueTooLong.new(message)
         when /Out of range value for column/
-          RangeError.new(msg, sql: sql, binds: binds)
+          RangeError.new(message)
         when /Column .* cannot be null/,
              /Field .* doesn't have a default value/
-          NotNullViolation.new(msg, sql: sql, binds: binds)
+          NotNullViolation.new(message)
         when /Deadlock found when trying to get lock/
-          Deadlocked.new(msg, sql: sql, binds: binds)
+          Deadlocked.new(message)
         when /Lock wait timeout exceeded/
-          LockWaitTimeout.new(msg, sql: sql, binds: binds)
+          LockWaitTimeout.new(message)
         when /max_statement_time exceeded/, /Sort aborted/
-          StatementTimeout.new(msg, sql: sql, binds: binds)
+          StatementTimeout.new(message)
         when /Query execution was interrupted/
-          QueryCanceled.new(msg, sql: sql, binds: binds)
+          QueryCanceled.new(message)
         else
-          ActiveRecord::StatementInvalid.new(msg, sql: sql, binds: binds)
+          ActiveRecord::StatementInvalid.new(message)
         end
       end
 

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

@@ -63,6 +63,10 @@ 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 = "1.0.0"
+      VERSION = "5.2.2"
     end
   end
 end

data/test/aasa_helper.rb

@@ -0,0 +1,163 @@
+ENV['AASA_ENV'] = 'test'
+require 'bundler/setup'
+Bundler.require :default, :development
+Dotenv.load('.env')
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'minitest/retry'
+require 'minitest/reporters'
+require_relative 'support/aasa_mysqlpatch'
+require 'cases/helper' unless ENV['TEST_FILES'] || ENV['ONLY_AASA']
+require_relative 'support/aasa_coerceable'
+require_relative 'support/aasa_env'
+require_relative 'support/aasa_fixtures'
+require_relative 'support/aasa_minitest'
+Rails.backtrace_cleaner.remove_silencers! if ENV['REMOVE_SILENCERS']
+
+module ActiveRecord
+  module ConnectionAdapters
+    module AuroraServerless
+      class TestCase < Minitest::Spec
+
+        before { setup_table }
+        after  { drop_table }
+
+        private
+
+        def client
+          @client ||= AuroraServerless::Client.new(
+            'activerecord_unittest',
+            ENV['AASA_RESOURCE_ARN'],
+            ENV['AASA_SECRET_ARN']
+          )
+        end
+
+        def execute(sql)
+          r = client.execute_statement(sql)
+          # TODO: [PG] Make this a conditional result wrapper.
+          AuroraServerless::Mysql2::Result.new(r)
+        end
+
+        def setup_table
+          # TODO: [PG] Make this a conditional for constant SQL.
+          execute MYSQL_CREATE_TABLE_SQL
+          execute MYSQL_INSERT_SQL
+        end
+
+        def drop_table
+          execute 'DROP TABLE IF EXISTS aurora_test'
+        end
+
+        MYSQL_CREATE_TABLE_SQL = %[
+          CREATE TABLE IF NOT EXISTS aurora_test (
+            id int NOT NULL AUTO_INCREMENT,
+            PRIMARY KEY (id),
+            null_test VARCHAR(10),
+            bit_test BIT,
+            tiny_int_test TINYINT,
+            small_int_test SMALLINT,
+            medium_int_test MEDIUMINT,
+            int_test INT,
+            big_int_test BIGINT,
+            float_test FLOAT(10,3),
+            float_zero_test FLOAT(10,3),
+            double_test DOUBLE(10,3),
+            decimal_test DECIMAL(10,3),
+            decimal_zero_test DECIMAL(10,3),
+            date_test DATE,
+            date_time_test DATETIME,
+            timestamp_test TIMESTAMP,
+            time_test TIME,
+            year_test YEAR(4),
+            char_test CHAR(10),
+            varchar_test VARCHAR(10),
+            binary_test BINARY(10),
+            varbinary_test VARBINARY(10),
+            tiny_blob_test TINYBLOB,
+            tiny_text_test TINYTEXT,
+            blob_test BLOB,
+            text_test TEXT,
+            medium_blob_test MEDIUMBLOB,
+            medium_text_test MEDIUMTEXT,
+            long_blob_test LONGBLOB,
+            long_text_test LONGTEXT,
+            enum_test ENUM('val1', 'val2'),
+            set_test SET('val1', 'val2')
+          ) DEFAULT CHARSET=utf8
+        ]
+
+        MYSQL_INSERT_SQL = %[
+          INSERT INTO aurora_test (
+            null_test,
+            bit_test,
+            tiny_int_test,
+            small_int_test,
+            medium_int_test,
+            int_test,
+            big_int_test,
+            float_test,
+            float_zero_test,
+            double_test,
+            decimal_test,
+            decimal_zero_test,
+            date_test,
+            date_time_test,
+            timestamp_test,
+            time_test,
+            year_test,
+            char_test,
+            varchar_test,
+            binary_test,
+            varbinary_test,
+            tiny_blob_test,
+            tiny_text_test,
+            blob_test,
+            text_test,
+            medium_blob_test,
+            medium_text_test,
+            long_blob_test,
+            long_text_test,
+            enum_test,
+            set_test
+          )
+          VALUES (
+            NULL,
+            1,
+            5,
+            32766,
+            8388606,
+            2147483646,
+            9223372036854775806,
+            156.68449197860963,
+            0.0,
+            606682.8877005348,
+            676254.5454545454,
+            0,
+            '2010-4-4',
+            '2010-4-4 11:44:00',
+            '2010-4-4 11:44:00',
+            '11:44:00',
+            2019,
+            'abcdefg',
+            'abcdefg',
+            'abcdefg',
+            'abcdefg',
+            'abcdefg',
+            'abcdefg',
+            'abcdefg',
+            'abcdefg',
+            'abcdefg',
+            'abcdefg',
+            'abcdefg',
+            'abcdefg',
+            'val1',
+            'val1,val2'
+          )
+        ]
+
+      end
+    end
+  end
+end
+
+require "mocha/setup"