From 4dec18b6c389225d8c29580c425f20bfe90974d7 Mon Sep 17 00:00:00 2001 From: mor-wtag Date: Wed, 29 Nov 2023 10:07:24 +0600 Subject: [PATCH 1/4] Support for Activerecord 6.1 --- apartment.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apartment.gemspec b/apartment.gemspec index eb59070f..b4b51fab 100644 --- a/apartment.gemspec +++ b/apartment.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.licenses = ["MIT"] # must be >= 3.1.2 due to bug in prepared_statements - s.add_dependency 'activerecord', '>= 3.1.2', '< 6.1' + s.add_dependency 'activerecord', '>= 3.1.2', '<= 6.1' s.add_dependency 'rack', '>= 1.3.6' s.add_dependency 'public_suffix', '>= 2' s.add_dependency 'parallel', '>= 0.7.1' From bb1864db9da9348e3d4f5b0dd847162283fa494a Mon Sep 17 00:00:00 2001 From: mor-wtag Date: Wed, 29 Nov 2023 11:12:54 +0600 Subject: [PATCH 2/4] Update apartment.gemspec --- apartment.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apartment.gemspec b/apartment.gemspec index b4b51fab..73f7854c 100644 --- a/apartment.gemspec +++ b/apartment.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.licenses = ["MIT"] # must be >= 3.1.2 due to bug in prepared_statements - s.add_dependency 'activerecord', '>= 3.1.2', '<= 6.1' + s.add_dependency 'activerecord', '>= 3.1.2', '<= 6.1.7.6' s.add_dependency 'rack', '>= 1.3.6' s.add_dependency 'public_suffix', '>= 2' s.add_dependency 'parallel', '>= 0.7.1' From c57726fabb76e9f93f13b367cbddbb749d9e328a Mon Sep 17 00:00:00 2001 From: mor-wtag Date: Thu, 30 Nov 2023 14:36:34 +0600 Subject: [PATCH 3/4] replaced exists? with exist? --- Rakefile | 4 ++-- lib/apartment/adapters/abstract_adapter.rb | 2 +- lib/apartment/adapters/postgresql_adapter.rb | 2 +- lib/apartment/adapters/sqlite3_adapter.rb | 6 +++--- spec/adapters/postgresql_adapter_spec.rb | 2 +- spec/adapters/sqlite3_adapter_spec.rb | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Rakefile b/Rakefile index df67edc6..59c589eb 100644 --- a/Rakefile +++ b/Rakefile @@ -40,8 +40,8 @@ namespace :db do apartment_db_file = 'spec/config/database.yml' rails_db_file = 'spec/dummy/config/database.yml' - FileUtils.copy(apartment_db_file + '.sample', apartment_db_file, :verbose => true) unless File.exists?(apartment_db_file) - FileUtils.copy(rails_db_file + '.sample', rails_db_file, :verbose => true) unless File.exists?(rails_db_file) + FileUtils.copy(apartment_db_file + '.sample', apartment_db_file, :verbose => true) unless File.exist?(apartment_db_file) + FileUtils.copy(rails_db_file + '.sample', rails_db_file, :verbose => true) unless File.exist?(rails_db_file) end end diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb index 78b844b9..c7e2f0d0 100644 --- a/lib/apartment/adapters/abstract_adapter.rb +++ b/lib/apartment/adapters/abstract_adapter.rb @@ -209,7 +209,7 @@ def multi_tenantify_with_tenant_db_name(config, tenant) # Load a file or raise error if it doesn't exists # def load_or_raise(file) - if File.exists?(file) + if File.exist?(file) load(file) else raise FileNotFound, "#{file} doesn't exist yet" diff --git a/lib/apartment/adapters/postgresql_adapter.rb b/lib/apartment/adapters/postgresql_adapter.rb index 446b9b5d..6f423201 100644 --- a/lib/apartment/adapters/postgresql_adapter.rb +++ b/lib/apartment/adapters/postgresql_adapter.rb @@ -63,7 +63,7 @@ def drop_command(conn, tenant) # def connect_to_new(tenant = nil) return reset if tenant.nil? - raise ActiveRecord::StatementInvalid.new("Could not find schema #{tenant}") unless Apartment.connection.schema_exists?(tenant.to_s) + raise ActiveRecord::StatementInvalid.new("Could not find schema #{tenant}") unless Apartment.connection.schema_exist?(tenant.to_s) @current = tenant.to_s Apartment.connection.schema_search_path = full_search_path diff --git a/lib/apartment/adapters/sqlite3_adapter.rb b/lib/apartment/adapters/sqlite3_adapter.rb index dff5a21b..eb0469b0 100644 --- a/lib/apartment/adapters/sqlite3_adapter.rb +++ b/lib/apartment/adapters/sqlite3_adapter.rb @@ -17,7 +17,7 @@ def initialize(config) def drop(tenant) raise TenantNotFound, - "The tenant #{environmentify(tenant)} cannot be found." unless File.exists?(database_file(tenant)) + "The tenant #{environmentify(tenant)} cannot be found." unless File.exist?(database_file(tenant)) File.delete(database_file(tenant)) end @@ -30,14 +30,14 @@ def current def connect_to_new(tenant) raise TenantNotFound, - "The tenant #{environmentify(tenant)} cannot be found." unless File.exists?(database_file(tenant)) + "The tenant #{environmentify(tenant)} cannot be found." unless File.exist?(database_file(tenant)) super database_file(tenant) end def create_tenant(tenant) raise TenantExists, - "The tenant #{environmentify(tenant)} already exists." if File.exists?(database_file(tenant)) + "The tenant #{environmentify(tenant)} already exists." if File.exist?(database_file(tenant)) begin f = File.new(database_file(tenant), File::CREAT) diff --git a/spec/adapters/postgresql_adapter_spec.rb b/spec/adapters/postgresql_adapter_spec.rb index e246fd10..19db0f4e 100644 --- a/spec/adapters/postgresql_adapter_spec.rb +++ b/spec/adapters/postgresql_adapter_spec.rb @@ -39,7 +39,7 @@ def tenant_names expect { Apartment::Tenant.create('has-dashes') }.to_not raise_error end - after { Apartment::Tenant.drop('has-dashes') if Apartment.connection.schema_exists? 'has-dashes' } + after { Apartment::Tenant.drop('has-dashes') if Apartment.connection.schema_exist? 'has-dashes' } end context "using connections" do diff --git a/spec/adapters/sqlite3_adapter_spec.rb b/spec/adapters/sqlite3_adapter_spec.rb index 55004952..fcb6198b 100644 --- a/spec/adapters/sqlite3_adapter_spec.rb +++ b/spec/adapters/sqlite3_adapter_spec.rb @@ -40,7 +40,7 @@ def tenant_names it "should create a new database" do subject.create db_name - expect(File.exists?("#{default_dir}/#{Rails.env}_#{db_name}.sqlite3")).to eq true + expect(File.exist?("#{default_dir}/#{Rails.env}_#{db_name}.sqlite3")).to eq true end end @@ -55,7 +55,7 @@ def tenant_names it "should create a new database" do subject.create db_name - expect(File.exists?("#{default_dir}/#{db_name}.sqlite3")).to eq true + expect(File.exist?("#{default_dir}/#{db_name}.sqlite3")).to eq true end end @@ -73,7 +73,7 @@ def tenant_names it "should create a new database" do subject.create db_name - expect(File.exists?("#{default_dir}/#{db_name}_#{Rails.env}.sqlite3")).to eq true + expect(File.exist?("#{default_dir}/#{db_name}_#{Rails.env}.sqlite3")).to eq true end end From b1515d94db6b93aac8af4ee3c26576d319254a65 Mon Sep 17 00:00:00 2001 From: mor-wtag Date: Thu, 30 Nov 2023 14:38:29 +0600 Subject: [PATCH 4/4] :wrench: --- lib/apartment/adapters/postgresql_adapter.rb | 2 +- spec/adapters/postgresql_adapter_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/apartment/adapters/postgresql_adapter.rb b/lib/apartment/adapters/postgresql_adapter.rb index 6f423201..446b9b5d 100644 --- a/lib/apartment/adapters/postgresql_adapter.rb +++ b/lib/apartment/adapters/postgresql_adapter.rb @@ -63,7 +63,7 @@ def drop_command(conn, tenant) # def connect_to_new(tenant = nil) return reset if tenant.nil? - raise ActiveRecord::StatementInvalid.new("Could not find schema #{tenant}") unless Apartment.connection.schema_exist?(tenant.to_s) + raise ActiveRecord::StatementInvalid.new("Could not find schema #{tenant}") unless Apartment.connection.schema_exists?(tenant.to_s) @current = tenant.to_s Apartment.connection.schema_search_path = full_search_path diff --git a/spec/adapters/postgresql_adapter_spec.rb b/spec/adapters/postgresql_adapter_spec.rb index 19db0f4e..e246fd10 100644 --- a/spec/adapters/postgresql_adapter_spec.rb +++ b/spec/adapters/postgresql_adapter_spec.rb @@ -39,7 +39,7 @@ def tenant_names expect { Apartment::Tenant.create('has-dashes') }.to_not raise_error end - after { Apartment::Tenant.drop('has-dashes') if Apartment.connection.schema_exist? 'has-dashes' } + after { Apartment::Tenant.drop('has-dashes') if Apartment.connection.schema_exists? 'has-dashes' } end context "using connections" do