activerecord-aurora-serverless-adapter 5.2.1 → 5.2.2

data/test/config.yml

@@ -0,0 +1,20 @@
+default_connection: mysql
+
+connections:
+  mysql:
+    arunit:
+      database: 'activerecord_unittest'
+      adapter: aurora_serverless
+      secret_arn: <%= ENV['AASA_SECRET_ARN'] %>
+      resource_arn: <%= ENV['AASA_RESOURCE_ARN'] %>
+      # HTTP has no true sessions. Ensure base state.
+      variables:
+        foreign_key_checks: 1
+    arunit2:
+      database: 'activerecord_unittest2'
+      adapter: aurora_serverless
+      secret_arn: <%= ENV['AASA_SECRET_ARN2'] %>
+      resource_arn: <%= ENV['AASA_RESOURCE_ARN2'] %>
+      # HTTP has no true sessions. Ensure base state.
+      variables:
+        foreign_key_checks: 1

data/test/support/aasa_coerceable.rb

@@ -0,0 +1,53 @@
+module AASA
+  module Coerceable
+
+    extend ActiveSupport::Concern
+
+    included do
+      cattr_accessor :coerced_tests, instance_accessor: false
+      self.coerced_tests = []
+    end
+
+    module ClassMethods
+
+      def coerce_tests!(*methods)
+        methods.each do |method|
+          self.coerced_tests.push(method)
+          coerced_test_warning(method)
+        end
+      end
+
+      def coerce_all_tests!
+        once = false
+        instance_methods(false).each do |method|
+          next unless method.to_s =~ /\Atest/
+          undef_method(method)
+          once = true
+        end
+        STDOUT.puts "🙉🙈🙊 Undefined all tests: #{self.name}"
+      end
+
+      private
+
+      def coerced_test_warning(method)
+        method = instance_methods(false).select { |m| m =~ method } if method.is_a?(Regexp)
+        Array(method).each do |m|
+          result = undef_method(m) if m && method_defined?(m)
+          if result.blank?
+            STDOUT.puts "🐳 Unfound coerced test: #{self.name}##{m}"
+          else
+            STDOUT.puts "🐵 Undefined coerced test: #{self.name}##{m}"
+          end
+        end
+      end
+
+    end
+
+  end
+end
+
+module ActiveRecord
+  class TestCase < ActiveSupport::TestCase
+    include AASA::Coerceable
+  end
+end

data/test/support/aasa_env.rb

@@ -0,0 +1,11 @@
+# We need `ActiveRecord::ConnectionHandling::RAILS_ENV.call` to return
+# nil just like when running the ActiveRecord suite. This allows the
+# `DEFAULT_ENV.call` to return `default_env` propery for a lot fo tests.
+#
+module Rails
+  class << self
+    def env
+      nil
+    end
+  end
+end

data/test/support/aasa_fixtures.rb

@@ -0,0 +1,9 @@
+# The `citations` fixture exceeds our `max_allowed_packet` size
+# and will raise a `Fixtures set is too large` error. Also, since
+# we do not support batch operations, 65K inserts is just too slow.
+#
+if defined?(FIXTURES_ROOT)
+  citations_file = File.join FIXTURES_ROOT, 'citations.yml'
+  citations_data = File.read(citations_file).sub '65536.times', '1500.times'
+  File.open(citations_file, 'w') { |f| f.write(citations_data) }
+end

data/test/support/aasa_minitest.rb

@@ -0,0 +1,39 @@
+module AASA
+  module Mtr
+
+    def retry_foreign_key_checks?
+      defined?(::ActiveRecord) && defined?(::ARUnit2Model)
+    end
+
+    def retry_foreign_key_checks(count)
+      return unless retry_foreign_key_checks?
+      reset_foreign_key_check_for_class ActiveRecord::Base, count
+      reset_foreign_key_check_for_class ARUnit2Model, count
+    end
+
+    def reset_foreign_key_check_for_class(model, count)
+      c = model.connection
+      return unless c
+      v = c.query_value "SELECT @@FOREIGN_KEY_CHECKS"
+      puts "[RETRY-FOREIGN_KEY_CHECKS] current: #{v}"
+      c.update "SET FOREIGN_KEY_CHECKS = 1"
+      sleep(count)
+    end
+
+    extend self
+
+  end
+end
+
+# Helpful to see test names for us vs dots.
+Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new()]
+
+# There is something a little with how fixtures & foreign key checks
+# are not session based with Aurora Serverless. Makes a little sense but
+# even tho each connection (see config.yml) sets this up for us, some
+# VERY small percentage of tests will fail. This helps?
+#
+Minitest::Retry.use! retry_count: 3, verbose: true
+Minitest::Retry.on_retry do |klass, test_name, retry_count|
+  AASA::Mtr.retry_foreign_key_checks(retry_count)
+end

data/test/support/aasa_mysqlpatch.rb

@@ -0,0 +1,8 @@
+# Rails v6 does this for us automatically
+#
+ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.prepend(Module.new {
+  def create_table(table_name, options = {})
+    options[:options] = "ENGINE=InnoDB ROW_FORMAT=DYNAMIC"
+    super
+  end
+}) if defined?(ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter)

data/test/support/aasa_paths.rb

@@ -0,0 +1,47 @@
+module AASA
+  module Paths
+
+    extend self
+
+    def root_aasa
+      File.expand_path File.join(File.dirname(__FILE__), '..', '..')
+    end
+
+    def test_root_aasa
+      File.join root_aasa, 'test'
+    end
+
+    def root_activerecord
+      File.join Gem.loaded_specs['rails'].full_gem_path, 'activerecord'
+    end
+
+    def test_load_paths
+      [
+        File.join(root_aasa, 'lib'),
+        File.join(root_aasa, 'test'),
+        File.join(root_activerecord, 'lib'),
+        File.join(root_activerecord, 'test')
+      ]
+    end
+
+    def add_to_load_paths!
+      test_load_paths.each { |p| $LOAD_PATH.unshift(p) unless $LOAD_PATH.include?(p) }
+    end
+
+    def migrations_root
+      File.join test_root_aasa, 'migrations'
+    end
+
+    def arconfig_file
+      File.join test_root_aasa, 'config.yml'
+    end
+
+    def arconfig_file_env!
+      ENV['ARCONFIG'] = arconfig_file
+    end
+
+  end
+end
+
+AASA::Paths.add_to_load_paths!
+AASA::Paths.arconfig_file_env!

data/test/support/aasa_rake.rb

@@ -0,0 +1,102 @@
+module AASA
+  module Rake
+
+    AASA_HELPER = 'test/aasa_helper.rb'
+    AASA_COERCED = 'test/cases/coerced_tests.rb'
+
+    AASA_ARUNIT2_TESTS = [
+      'test/cases/multi_db_migrator_test.rb',
+      'test/cases/connection_adapters/connection_handlers_multi_db_test.rb',
+      'test/cases/multiple_db_test.rb'
+    ]
+    AASA_ARHABTM = ['test/cases/associations/has_and_belongs_to_many_associations_test.rb']
+    AASA_ARCONHANDLER = ['test/cases/connection_adapters/connection_handler_test.rb']
+
+    extend self
+
+    def env_ar_test_files
+      return unless ENV['TEST_FILES_AR'] && !ENV['TEST_FILES_AR'].empty?
+      @env_ar_test_files ||= begin
+        ENV['TEST_FILES_AR'].split(',').map { |file|
+          File.join AASA::Paths.root_activerecord, file.strip
+        }.sort
+      end
+    end
+
+    def env_test_files
+      return unless ENV['TEST_FILES'] && !ENV['TEST_FILES'].empty?
+      @env_test_files ||= ENV['TEST_FILES'].split(',').map(&:strip)
+    end
+
+    def aasa_cases
+      @aasa_cases ||= Dir.glob('test/cases/aasa/*_test.rb')
+    end
+
+    def ar_cases
+      @ar_cases ||= begin
+        cases = Dir.glob("#{AASA::Paths.root_activerecord}/test/cases/**/*_test.rb")
+        cases.reject! { |x| x =~ /\/adapters\// }
+        cases.sort
+      end
+    end
+
+    def ar_cases_isolated
+      ar_cases_unit2 + ar_cases_habtm + ar_cases_conhandler
+    end
+
+    def ar_cases_unit2
+      @ar_cases_unit2 ||= ar_files(AASA_ARUNIT2_TESTS)
+    end
+
+    def ar_cases_habtm
+      @ar_cases_isolated ||= ar_files(AASA_ARHABTM)
+    end
+
+    def ar_cases_conhandler
+      @ar_cases_conhandler ||= ar_files(AASA_ARCONHANDLER)
+    end
+
+    def ar_files(files)
+      files.map { |file|
+        File.join AASA::Paths.root_activerecord, file
+      }.select { |path|
+        File.exists?(path)
+      }
+    end
+
+    def test_files
+      if env_ar_test_files
+        [AASA_HELPER] + env_ar_test_files + [AASA_COERCED]
+      elsif env_test_files
+        env_test_files
+      elsif ENV['ONLY_AASA']
+        aasa_cases
+      elsif ENV['ONLY_ACTIVERECORD']
+        if ENV['AASA_ARHABTM']
+          [AASA_HELPER] + ar_cases_habtm + [AASA_COERCED]
+        elsif ENV['AASA_ARCONHANDLER']
+          [AASA_HELPER] + ar_cases_conhandler + [AASA_COERCED]
+        elsif ENV['AASA_ARUNIT2']
+          [AASA_HELPER] + ar_cases_unit2 + [AASA_COERCED]
+        else
+          cases = (ar_cases - ar_cases_isolated)
+          cases = test_file_batches(cases)
+          [AASA_HELPER] + cases + [AASA_COERCED]
+        end
+      else
+        [AASA_HELPER] + ar_cases + [AASA_COERCED] + aasa_cases
+      end.uniq
+    end
+
+    def test_file_batches(cases)
+      return cases unless ENV['AASA_BATCH']
+      groups = 3
+      index = ENV['AASA_BATCH'].to_i - 1
+      group = (cases.length / groups) + 1
+      cases = cases.each_slice(group).to_a[index]
+      raise "We have #{groups} groups and you requested #{index+1}" if cases.nil? || cases.empty?
+      cases
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-aurora-serverless-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-29 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +204,30 @@ 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