Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1b07d5b

Browse files
authored
use new with_advisory_lock (#450)
1 parent 673c149 commit 1b07d5b

File tree

12 files changed

+51
-28
lines changed

12 files changed

+51
-28
lines changed

‎Gemfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
source 'https://rubygems.org'
44

55
gemspec
6+
7+
gem 'with_advisory_lock', github: 'closuretree/with_advisory_lock'

‎closure_tree.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
2828
gem.required_ruby_version = '>= 3.3.0'
2929

3030
gem.add_runtime_dependency 'activerecord', '>= 7.1.0'
31-
gem.add_runtime_dependency 'with_advisory_lock', '>= 5.0.0','< 6.0.0'
31+
gem.add_runtime_dependency 'with_advisory_lock', '>= 6.0.0'
3232

3333
gem.add_development_dependency 'appraisal'
3434
gem.add_development_dependency 'database_cleaner'

‎gemfiles/activerecord_7.1.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "https://rubygems.org"
44

5+
gem "with_advisory_lock", github: "closuretree/with_advisory_lock"
56
gem "activerecord", "~> 7.1.0"
67
gem "railties"
78

‎gemfiles/activerecord_7.2.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "https://rubygems.org"
44

5+
gem "with_advisory_lock", github: "closuretree/with_advisory_lock"
56
gem "activerecord", "~> 7.2.0"
67
gem "railties"
78

‎gemfiles/activerecord_8.0.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "https://rubygems.org"
44

5+
gem "with_advisory_lock", github: "closuretree/with_advisory_lock"
56
gem "activerecord", "~> 8.0.0"
67
gem "railties"
78

‎gemfiles/activerecord_edge.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "https://rubygems.org"
44

5+
gem "with_advisory_lock", github: "closuretree/with_advisory_lock"
56
gem "activerecord", github: "rails/rails"
67
gem "railties", github: "rails/rails"
78

‎lib/closure_tree/numeric_order_support.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ module ClosureTree
22
module NumericOrderSupport
33

44
def self.adapter_for_connection(connection)
5-
das = WithAdvisoryLock::DatabaseAdapterSupport.new(connection)
6-
if das.postgresql?
5+
adapter_name = connection.adapter_name.downcase
6+
if adapter_name.include?('postgresql') || adapter_name.include?('postgis')
77
::ClosureTree::NumericOrderSupport::PostgreSQLAdapter
8-
elsif das.mysql?
8+
elsif adapter_name.include?('mysql') || adapter_name.include?('trilogy')
99
::ClosureTree::NumericOrderSupport::MysqlAdapter
1010
else
1111
::ClosureTree::NumericOrderSupport::GenericAdapter

‎lib/closure_tree/support.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ class Support
1818

1919
def initialize(model_class, options)
2020
@model_class = model_class
21+
22+
# Detect if we're using SQLite and disable advisory locks
23+
default_with_advisory_lock = !connection.adapter_name.downcase.include?('sqlite')
24+
2125
@options = {
2226
:parent_column_name => 'parent_id',
2327
:dependent => :nullify, # or :destroy or :delete_all -- see the README
2428
:name_column => 'name',
25-
:with_advisory_lock => true,
29+
:with_advisory_lock => default_with_advisory_lock,
2630
:numeric_order => false
2731
}.merge(options)
2832
raise ArgumentError, "name_column can't be 'path'" if options[:name_column] == 'path'
@@ -34,14 +38,10 @@ def initialize(model_class, options)
3438
def hierarchy_class_for_model
3539
parent_class = model_class.module_parent
3640
hierarchy_class = parent_class.const_set(short_hierarchy_class_name, Class.new(model_class.superclass))
37-
use_attr_accessible = use_attr_accessible?
38-
include_forbidden_attributes_protection = include_forbidden_attributes_protection?
3941
model_class_name = model_class.to_s
4042
hierarchy_class.class_eval do
41-
include ActiveModel::ForbiddenAttributesProtection if include_forbidden_attributes_protection
4243
belongs_to :ancestor, class_name: model_class_name
4344
belongs_to :descendant, class_name: model_class_name
44-
attr_accessible :ancestor, :descendant, :generations if use_attr_accessible
4545
def ==(other)
4646
self.class == other.class && ancestor_id == other.ancestor_id && descendant_id == other.descendant_id
4747
end

‎lib/closure_tree/support_flags.rb‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
module ClosureTree
22
module SupportFlags
33

4-
def use_attr_accessible?
5-
defined?(ActiveModel::MassAssignmentSecurity) &&
6-
model_class.respond_to?(:accessible_attributes) &&
7-
! model_class.accessible_attributes.empty?
8-
end
9-
10-
def include_forbidden_attributes_protection?
11-
defined?(ActiveModel::ForbiddenAttributesProtection) &&
12-
model_class.ancestors.include?(ActiveModel::ForbiddenAttributesProtection)
13-
end
144

155
def order_option?
166
order_by.present?

‎test/closure_tree/matcher_test.rb‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,14 @@ class MatcherTest < ActiveSupport::TestCase
2828
end
2929

3030
test "advisory_lock option" do
31-
assert_closure_tree User, with_advisory_lock: true
32-
assert_closure_tree Label, ordered: true, with_advisory_lock: true
33-
assert_closure_tree Metal, ordered: :sort_order, with_advisory_lock: true
31+
# SQLite doesn't support advisory locks, so skip these tests when using SQLite
32+
if ActiveRecord::Base.connection.adapter_name.downcase.include?('sqlite')
33+
skip "SQLite doesn't support advisory locks"
34+
else
35+
assert_closure_tree User, with_advisory_lock: true
36+
assert_closure_tree Label, ordered: true, with_advisory_lock: true
37+
assert_closure_tree Metal, ordered: :sort_order, with_advisory_lock: true
38+
end
3439
end
3540

3641
test "without_advisory_lock option" do

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /