ros-apartment 3.0.4 → 3.2.0

data/lib/apartment/active_record/postgresql_adapter.rb

@@ -12,23 +12,38 @@ module Apartment::PostgreSqlAdapterPatch
     # for JDBC driver, if rescued in super_method, trim leading and trailing quotes
     res.delete!('"') if defined?(JRUBY_VERSION)
 
-    schema_prefix = "#{Apartment::Tenant.current}."
-    default_tenant_prefix = "#{Apartment::Tenant.default_tenant}."
+    schema_prefix = "#{sequence_schema(res)}."
 
     # NOTE: Excluded models should always access the sequence from the default
     # tenant schema
     if excluded_model?(table)
-      res.sub!(schema_prefix, default_tenant_prefix) if schema_prefix != default_tenant_prefix
+      default_tenant_prefix = "#{Apartment::Tenant.default_tenant}."
+
+      # Unless the res is already prefixed with the default_tenant_prefix
+      # we should delete the schema_prefix and add the default_tenant_prefix
+      unless res&.starts_with?(default_tenant_prefix)
+        res&.delete_prefix!(schema_prefix)
+        res = default_tenant_prefix + res
+      end
+
       return res
     end
 
-    res.delete_prefix!(schema_prefix) if res&.starts_with?(schema_prefix)
+    # Delete the schema_prefix from the res if it is present
+    res&.delete_prefix!(schema_prefix)
 
     res
   end
 
   private
 
+  def sequence_schema(sequence_name)
+    current = Apartment::Tenant.current
+    return current unless current.is_a?(Array)
+
+    current.find { |schema| sequence_name.starts_with?("#{schema}.") }
+  end
+
   def excluded_model?(table)
     Apartment.excluded_models.any? { |m| m.constantize.table_name == table }
   end

data/lib/apartment/adapters/abstract_adapter.rb

@@ -181,7 +181,7 @@ module Apartment
         query_cache_enabled = ActiveRecord::Base.connection.query_cache_enabled
 
         Apartment.establish_connection multi_tenantify(tenant)
-        Apartment.connection.active? # call active? to manually check if this connection is valid
+        Apartment.connection.verify! # call active? to manually check if this connection is valid
 
         Apartment.connection.enable_query_cache! if query_cache_enabled
       rescue *rescuable_exceptions => e

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -76,11 +76,6 @@ module Apartment
 
         @current = tenant.is_a?(Array) ? tenant.map(&:to_s) : tenant.to_s
         Apartment.connection.schema_search_path = full_search_path
-
-        # When the PostgreSQL version is < 9.3,
-        # there is a issue for prepared statement with changing search_path.
-        # https://www.postgresql.org/docs/9.3/static/sql-prepare.html
-        Apartment.connection.clear_cache! if postgresql_version < 90_300
       rescue *rescuable_exceptions => e
         raise_schema_connect_to_new(tenant, e)
       end
@@ -151,8 +146,9 @@ module Apartment
         /SET row_security/i,                          # new in postgresql 9.5
         /SET idle_in_transaction_session_timeout/i,   # new in postgresql 9.6
         /SET default_table_access_method/i,           # new in postgresql 12
-        /CREATE SCHEMA public/i,
-        /COMMENT ON SCHEMA public/i
+        /CREATE SCHEMA/i,
+        /COMMENT ON SCHEMA/i,
+        /SET transaction_timeout/i,                   # new in postgresql 17
 
       ].freeze
 
@@ -194,15 +190,13 @@ module Apartment
       #   @return {String} raw SQL contaning only postgres schema dump
       #
       def pg_dump_schema
-        # Skip excluded tables? :/
-        # excluded_tables =
-        #   collect_table_names(Apartment.excluded_models)
-        #   .map! {|t| "-T #{t}"}
-        #   .join(' ')
-
-        # `pg_dump -s -x -O -n #{default_tenant} #{excluded_tables} #{dbname}`
-
-        with_pg_env { `pg_dump -s -x -O -n #{default_tenant} #{dbname}` }
+        exclude_table =
+          if Apartment.pg_exclude_clone_tables
+            excluded_tables.map! { |t| "-T #{t}" }.join(' ')
+          else
+            ''
+          end
+        with_pg_env { `pg_dump -s -x -O -n #{default_tenant} #{dbname} #{exclude_table}` }
       end
 
       #   Dump data from schema_migrations table
@@ -254,6 +248,8 @@ module Apartment
         sql.gsub(/#{default_tenant}\.\w*/) do |match|
           if Apartment.pg_excluded_names.any? { |name| match.include? name }
             match
+          elsif Apartment.pg_exclude_clone_tables && excluded_tables.any?(match)
+            match
           else
             match.gsub("#{default_tenant}.", %("#{current}".))
           end
@@ -266,10 +262,10 @@ module Apartment
         regexps.select { |c| input.match c }
       end
 
-      #   Collect table names from AR Models
+      # Convenience method for excluded table names
       #
-      def collect_table_names(models)
-        models.map do |m|
+      def excluded_tables
+        Apartment.excluded_models.map do |m|
           m.constantize.table_name
         end
       end

data/lib/apartment/adapters/trilogy_adapter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'apartment/adapters/mysql2_adapter'
+
+module Apartment
+  # Helper module to decide wether to use trilogy adapter or trilogy adapter with schemas
+  module Tenant
+    def self.trilogy_adapter(config)
+      if Apartment.use_schemas
+        Adapters::TrilogySchemaAdapter.new(config)
+      else
+        Adapters::TrilogyAdapter.new(config)
+      end
+    end
+  end
+
+  module Adapters
+    class TrilogyAdapter < Mysql2Adapter
+      protected
+
+      def rescue_from
+        Trilogy::Error
+      end
+    end
+
+    class TrilogySchemaAdapter < Mysql2SchemaAdapter
+    end
+  end
+end

data/lib/apartment/deprecation.rb

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
 require 'active_support/deprecation'
+require_relative 'version'
 
 module Apartment
-  module Deprecation
-    def self.warn(message)
-      ActiveSupport::Deprecation.warn message
-    end
-  end
+  DEPRECATOR = ActiveSupport::Deprecation.new(Apartment::VERSION, 'Apartment')
 end

data/lib/apartment/migrator.rb

@@ -13,21 +13,33 @@ module Apartment
 
         migration_scope_block = ->(migration) { ENV['SCOPE'].blank? || (ENV['SCOPE'] == migration.scope) }
 
-        ActiveRecord::Base.connection.migration_context.migrate(version, &migration_scope_block)
+        if ActiveRecord.version >= Gem::Version.new('7.2.0')
+          ActiveRecord::Base.connection_pool.migration_context.migrate(version, &migration_scope_block)
+        else
+          ActiveRecord::Base.connection.migration_context.migrate(version, &migration_scope_block)
+        end
       end
     end
 
     # Migrate up/down to a specific version
     def run(direction, database, version)
       Tenant.switch(database) do
-        ActiveRecord::Base.connection.migration_context.run(direction, version)
+        if ActiveRecord.version >= Gem::Version.new('7.2.0')
+          ActiveRecord::Base.connection_pool.migration_context.run(direction, version)
+        else
+          ActiveRecord::Base.connection.migration_context.run(direction, version)
+        end
       end
     end
 
     # rollback latest migration `step` number of times
     def rollback(database, step = 1)
       Tenant.switch(database) do
-        ActiveRecord::Base.connection.migration_context.rollback(step)
+        if ActiveRecord.version >= Gem::Version.new('7.2.0')
+          ActiveRecord::Base.connection_pool.migration_context.rollback(step)
+        else
+          ActiveRecord::Base.connection.migration_context.rollback(step)
+        end
       end
     end
   end

data/lib/apartment/tasks/task_helper.rb

@@ -4,7 +4,9 @@ module Apartment
   module TaskHelper
     def self.each_tenant(&block)
       Parallel.each(tenants_without_default, in_threads: Apartment.parallel_migration_threads) do |tenant|
-        block.call(tenant)
+        Rails.application.executor.wrap do
+          block.call(tenant)
+        end
       end
     end
 

data/lib/apartment/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apartment
-  VERSION = '3.0.4'
+  VERSION = '3.2.0'
 end

data/lib/apartment.rb

@@ -5,19 +5,25 @@ require 'active_support/core_ext/object/blank'
 require 'forwardable'
 require 'active_record'
 require 'apartment/tenant'
+require 'apartment/deprecation'
 
 require_relative 'apartment/log_subscriber'
 require_relative 'apartment/active_record/connection_handling'
 require_relative 'apartment/active_record/schema_migration'
 require_relative 'apartment/active_record/internal_metadata'
 
+if ActiveRecord.version.release >= Gem::Version.new('7.1')
+  require_relative 'apartment/active_record/postgres/schema_dumper'
+end
+
 # Apartment main definitions
 module Apartment
   class << self
     extend Forwardable
 
     ACCESSOR_METHODS = %i[use_schemas use_sql seed_after_create prepend_environment default_tenant
-                          append_environment with_multi_server_setup tenant_presence_check active_record_log].freeze
+                          append_environment with_multi_server_setup tenant_presence_check
+                          active_record_log pg_exclude_clone_tables].freeze
 
     WRITER_METHODS = %i[tenant_names database_schema_file excluded_models
                         persistent_schemas connection_class
@@ -47,7 +53,7 @@ module Apartment
     end
 
     def tld_length=(_)
-      Apartment::Deprecation.warn('`config.tld_length` have no effect because it was removed in https://github.com/influitive/apartment/pull/309')
+      Apartment::DEPRECATOR.warn('`config.tld_length` have no effect because it was removed in https://github.com/influitive/apartment/pull/309')
     end
 
     def db_config_for(tenant)

data/ros-apartment.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |s|
   s.name = 'ros-apartment'
   s.version = Apartment::VERSION
 
-  s.authors       = ['Ryan Brunner', 'Brad Robertson', 'Rui Baltazar']
+  s.authors       = ['Ryan Brunner', 'Brad Robertson', 'Rui Baltazar', 'Mauricio Novelo']
   s.summary       = 'A Ruby gem for managing database multitenancy. Apartment Gem drop in replacement'
   s.description   = 'Apartment allows Rack applications to deal with database multitenancy through ActiveRecord'
-  s.email         = ['ryan@influitive.com', 'brad@influitive.com', 'rui.p.baltazar@gmail.com']
+  s.email         = ['ryan@influitive.com', 'brad@influitive.com', 'rui.p.baltazar@gmail.com', 'mauricio@campusesp.com']
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been
   # added into git.
@@ -21,44 +21,20 @@ Gem::Specification.new do |s|
     end
   end
   s.executables   = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
   s.homepage = 'https://github.com/rails-on-services/apartment'
   s.licenses = ['MIT']
   s.metadata = {
-    'github_repo' => 'ssh://github.com/rails-on-services/apartment'
+    'github_repo' => 'ssh://github.com/rails-on-services/apartment',
+    'rubygems_mfa_required' => 'true',
   }
 
-  s.required_ruby_version = '>= 3.0', '< 3.4'
+  s.required_ruby_version = '>= 3.1'
 
-  s.add_dependency 'activerecord', '>= 6.1.0', '< 7.2'
-  s.add_dependency 'parallel', '< 2.0'
-  s.add_dependency 'public_suffix', '>= 2.0.5', '< 6.0'
-  s.add_dependency 'rack', '>= 1.3.6', '< 4.0'
-
-  s.add_development_dependency 'appraisal', '~> 2.2'
-  s.add_development_dependency 'bundler', '>= 1.3', '< 3.0'
-  s.add_development_dependency 'guard-rspec', '~> 4.2'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'rspec', '~> 3.4'
-  s.add_development_dependency 'rspec_junit_formatter'
-  s.add_development_dependency 'rspec-rails', '~> 6.1'
-  s.add_development_dependency 'rubocop', '~> 1.63'
-  s.add_development_dependency 'rubocop-performance', '~> 1.21'
-  s.add_development_dependency 'rubocop-rails', '~> 2.24'
-  s.add_development_dependency 'rubocop-rspec', '~> 2.29'
-
-  if defined?(JRUBY_VERSION)
-    s.add_development_dependency 'activerecord-jdbc-adapter'
-    s.add_development_dependency 'activerecord-jdbcmysql-adapter'
-    s.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
-    s.add_development_dependency 'jdbc-mysql'
-    s.add_development_dependency 'jdbc-postgres'
-  else
-    s.add_development_dependency 'mysql2',  '~> 0.5'
-    s.add_development_dependency 'pg',      '~> 1.5'
-    s.add_development_dependency 'sqlite3', '< 2.0'
-  end
+  s.add_dependency('activerecord', '>= 6.1.0', '< 8.1')
+  s.add_dependency('activesupport', '>= 6.1.0', '< 8.1')
+  s.add_dependency('parallel', '< 2.0')
+  s.add_dependency('public_suffix', '>= 2.0.5', '<= 6.0.1')
+  s.add_dependency('rack', '>= 1.3.6', '< 4.0')
 end