database_cleaner-active_record 1.99.0 → 2.0.0.beta

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: db0629196991321d7ca040c181f5e10feffb27a307c0db0f3a0aeaced412eaaa
4
- data.tar.gz: 1b298eeb459d1903cba80e1031b5bbd24ea146fe6d4ad8ed2d4eeb93eb6cf254
3
+ metadata.gz: 476fea7e84362519c14f1413c9af334688b3634f1b93eb337b35e52ca0c6aaea
4
+ data.tar.gz: e9022df4c0c38d5cb422c2f2daca8b5427c6a95ea452c0cddc46367fecfcc616
5
5
  SHA512:
6
- metadata.gz: 69e20a7c75b34cadff9745bafae326a3d160cf285d9f2c37f4078363ceb9e88976cd22a3cc8f8789815f79843aa42c7b70b0549236447829377adc3af28e7e67
7
- data.tar.gz: d7a27c45270537e4d72a09e8a1c23f95931f6bd1aec979aa9bba1318eab9a64e4395fc36398bdd8a77b0173b8d7c5cace9e42d68f351cd1e9249c5c330545f79
6
+ metadata.gz: c27d71a958fedeb6391c3218a92bdaed05049f0feafe6402ca2dce691b6d159504f147053ce322f64d05f08216d882d040ea97fce14e39721ee4710da52f4175
7
+ data.tar.gz: 32e627ff45a35adc27bcbcc08af228f497fcec093ff869c73f3c5ff4febcafa8b216a200b86ff7ece3b2a36882e2d9fe896b83a69aa58deca6239bc19b3118b2
data/.gitignore CHANGED
@@ -8,6 +8,11 @@
8
8
  /spec/support/config.yml
9
9
  /tmp/
10
10
  !/tmp/.keep
11
+ /.ruby-version
12
+ /.byebug_history
11
13
 
12
14
  # rspec failure tracking
13
15
  .rspec_status
16
+
17
+ /Gemfile.lock
18
+ /gemfiles/*.lock
data/.travis.yml CHANGED
@@ -1,4 +1,21 @@
1
1
  language: ruby
2
+ services:
3
+ - mysql
4
+ - postgresql
2
5
  rvm:
3
- - 2.2.9
4
- before_install: gem install bundler -v 1.17.2
6
+ - 2.4
7
+ - 2.5
8
+ - 2.6
9
+ - 2.7
10
+ gemfile:
11
+ - gemfiles/rails_5.1.gemfile
12
+ - gemfiles/rails_5.2.gemfile
13
+ - gemfiles/rails_6.0.gemfile
14
+ jobs:
15
+ exclude:
16
+ - rvm: 2.4
17
+ gemfile: gemfiles/rails_6.0.gemfile
18
+ before_install:
19
+ - gem install bundler -v 1.17.2
20
+ - bin/setup
21
+
data/Appraisals ADDED
@@ -0,0 +1,11 @@
1
+ appraise "rails-5.1" do
2
+ gem "rails", "~>5.1.0"
3
+ end
4
+
5
+ appraise "rails-5.2" do
6
+ gem "rails", "~>5.2.0"
7
+ end
8
+
9
+ appraise "rails-6.0" do
10
+ gem "rails", "~>6.0.0"
11
+ end
data/Gemfile CHANGED
@@ -5,4 +5,8 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
5
5
  # Specify your gem's dependencies in database_cleaner-active_record.gemspec
6
6
  gemspec
7
7
 
8
- gem "database_cleaner", path: "../.."
8
+ gem "byebug"
9
+
10
+ gem "rails", "~>5.2"
11
+
12
+ gem "database_cleaner-core", branch: "master", github: "DatabaseCleaner/database_cleaner"
data/README.md CHANGED
@@ -107,4 +107,4 @@ test:
107
107
 
108
108
  ## COPYRIGHT
109
109
 
110
- See [LICENSE] for details.
110
+ See [LICENSE](LICENSE) for details.
data/bin/setup CHANGED
@@ -5,4 +5,3 @@ set -vx
5
5
 
6
6
  bundle check || bundle install
7
7
  cp spec/support/sample.config.yml spec/support/config.yml
8
-
@@ -6,7 +6,7 @@ require "database_cleaner/active_record/version"
6
6
  Gem::Specification.new do |spec|
7
7
  spec.name = "database_cleaner-active_record"
8
8
  spec.version = DatabaseCleaner::ActiveRecord::VERSION
9
- spec.authors = ["Ernesto Tagwerker"]
9
+ spec.authors = ["Ernesto Tagwerker", "Micah Geisel"]
10
10
  spec.email = ["ernesto@ombulabs.com"]
11
11
 
12
12
  spec.summary = "Strategies for cleaning databases using ActiveRecord. Can be used to ensure a clean state for testing."
@@ -21,20 +21,14 @@ Gem::Specification.new do |spec|
21
21
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
22
22
  spec.require_paths = ["lib"]
23
23
 
24
- spec.add_dependency "database_cleaner", "~> 1.99.0"
24
+ spec.add_dependency "database_cleaner-core", "2.0.0.beta"
25
25
  spec.add_dependency "activerecord"
26
26
 
27
- spec.add_development_dependency "rake", "~> 10.0"
28
- spec.add_development_dependency "bundler", "~> 1.16"
29
- spec.add_development_dependency "rspec", "~> 3.0"
30
-
31
- unless RUBY_PLATFORM =~ /java/
32
- spec.add_development_dependency 'mysql', '~> 2.9.1'
33
- spec.add_development_dependency 'mysql2'
34
- spec.add_development_dependency "activerecord-mysql2-adapter"
35
- spec.add_development_dependency 'pg'
36
- spec.add_development_dependency "sqlite3"
37
- else
38
- spec.add_development_dependency "activerecord-jdbc-adapter"
39
- end
27
+ spec.add_development_dependency "bundler"
28
+ spec.add_development_dependency "appraisal"
29
+ spec.add_development_dependency "rake"
30
+ spec.add_development_dependency "rspec"
31
+ spec.add_development_dependency "mysql2"
32
+ spec.add_development_dependency "pg"
33
+ spec.add_development_dependency "sqlite3"
40
34
  end
@@ -0,0 +1,2 @@
1
+ ---
2
+ BUNDLE_RETRY: "1"
@@ -0,0 +1,9 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "byebug"
6
+ gem "rails", "~>5.1.0"
7
+ gem "database_cleaner-core", branch: "master", git: "https://github.com/DatabaseCleaner/database_cleaner"
8
+
9
+ gemspec path: "../"
@@ -0,0 +1,9 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "byebug"
6
+ gem "rails", "~>5.2.0"
7
+ gem "database_cleaner-core", branch: "master", git: "https://github.com/DatabaseCleaner/database_cleaner"
8
+
9
+ gemspec path: "../"
@@ -0,0 +1,9 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "byebug"
6
+ gem "rails", "~>6.0.0"
7
+ gem "database_cleaner-core", branch: "master", git: "https://github.com/DatabaseCleaner/database_cleaner"
8
+
9
+ gemspec path: "../"
@@ -1,6 +1,7 @@
1
1
  require 'database_cleaner/active_record/version'
2
- require 'database_cleaner'
2
+ require 'database_cleaner/core'
3
3
  require 'database_cleaner/active_record/deletion'
4
4
  require 'database_cleaner/active_record/transaction'
5
5
  require 'database_cleaner/active_record/truncation'
6
6
 
7
+ DatabaseCleaner[:active_record].strategy = :transaction
@@ -18,12 +18,7 @@ module DatabaseCleaner
18
18
  end
19
19
 
20
20
  def self.config_file_location
21
- @config_file_location ||= begin
22
- # Has DC.app_root been set? Check in this intrusive way to avoid triggering deprecation warnings if it hasn't.
23
- app_root = DatabaseCleaner.send(:configuration).instance_variable_get(:@app_root)
24
- root = app_root || Dir.pwd
25
- "#{root}/config/database.yml"
26
- end
21
+ @config_file_location ||= "#{Dir.pwd}/config/database.yml"
27
22
  end
28
23
 
29
24
  module Base
@@ -51,9 +51,10 @@ module DatabaseCleaner::ActiveRecord
51
51
  end
52
52
  end
53
53
 
54
+ private
55
+
54
56
  def connection_maintains_transaction_count?
55
57
  ActiveRecord::VERSION::MAJOR < 4
56
58
  end
57
-
58
59
  end
59
60
  end
@@ -1,11 +1,10 @@
1
1
  require 'active_record/base'
2
2
  require 'database_cleaner/active_record/base'
3
3
  require 'active_record/connection_adapters/abstract_adapter'
4
- require 'database_cleaner/deprecation'
5
4
 
6
5
  #Load available connection adapters
7
6
  %w(
8
- abstract_mysql_adapter postgresql_adapter sqlite3_adapter mysql_adapter mysql2_adapter oracle_enhanced_adapter
7
+ abstract_mysql_adapter postgresql_adapter sqlite3_adapter mysql2_adapter oracle_enhanced_adapter
9
8
  ).each do |known_adapter|
10
9
  begin
11
10
  require "active_record/connection_adapters/#{known_adapter}"
@@ -32,7 +31,7 @@ module DatabaseCleaner
32
31
  end
33
32
 
34
33
  def database_tables
35
- ::ActiveRecord::VERSION::MAJOR >= 5 ? data_sources : tables
34
+ tables
36
35
  end
37
36
 
38
37
  def truncate_table(table_name)
@@ -146,6 +145,10 @@ module DatabaseCleaner
146
145
  @restart_identity ||= db_version >= 80400 ? 'RESTART IDENTITY' : ''
147
146
  end
148
147
 
148
+ def database_tables
149
+ tables_with_schema
150
+ end
151
+
149
152
  def truncate_table(table_name)
150
153
  truncate_tables([table_name])
151
154
  end
@@ -234,13 +237,6 @@ module DatabaseCleaner::ActiveRecord
234
237
  include ::DatabaseCleaner::ActiveRecord::Base
235
238
  include ::DatabaseCleaner::Generic::Truncation
236
239
 
237
- def initialize(*)
238
- super
239
- if !@reset_ids.nil?
240
- DatabaseCleaner.deprecate "The `:reset_ids` option for the ActiveRecord truncation strategy has no effect, and is deprecated. It will be removed in database_cleaner 2.0 with no replacement."
241
- end
242
- end
243
-
244
240
  def clean
245
241
  connection = connection_class.connection
246
242
  connection.disable_referential_integrity do
@@ -1,5 +1,5 @@
1
1
  module DatabaseCleaner
2
2
  module ActiveRecord
3
- VERSION = "1.99.0"
3
+ VERSION = "2.0.0.beta"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,29 +1,30 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: database_cleaner-active_record
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.99.0
4
+ version: 2.0.0.beta
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ernesto Tagwerker
8
+ - Micah Geisel
8
9
  autorequire:
9
10
  bindir: exe
10
11
  cert_chain: []
11
- date: 2021-01-31 00:00:00.000000000 Z
12
+ date: 2020-04-05 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
- name: database_cleaner
15
+ name: database_cleaner-core
15
16
  requirement: !ruby/object:Gem::Requirement
16
17
  requirements:
17
- - - "~>"
18
+ - - '='
18
19
  - !ruby/object:Gem::Version
19
- version: 1.99.0
20
+ version: 2.0.0.beta
20
21
  type: :runtime
21
22
  prerelease: false
22
23
  version_requirements: !ruby/object:Gem::Requirement
23
24
  requirements:
24
- - - "~>"
25
+ - - '='
25
26
  - !ruby/object:Gem::Version
26
- version: 1.99.0
27
+ version: 2.0.0.beta
27
28
  - !ruby/object:Gem::Dependency
28
29
  name: activerecord
29
30
  requirement: !ruby/object:Gem::Requirement
@@ -38,64 +39,50 @@ dependencies:
38
39
  - - ">="
39
40
  - !ruby/object:Gem::Version
40
41
  version: '0'
41
- - !ruby/object:Gem::Dependency
42
- name: rake
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - "~>"
46
- - !ruby/object:Gem::Version
47
- version: '10.0'
48
- type: :development
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - "~>"
53
- - !ruby/object:Gem::Version
54
- version: '10.0'
55
42
  - !ruby/object:Gem::Dependency
56
43
  name: bundler
57
44
  requirement: !ruby/object:Gem::Requirement
58
45
  requirements:
59
- - - "~>"
46
+ - - ">="
60
47
  - !ruby/object:Gem::Version
61
- version: '1.16'
48
+ version: '0'
62
49
  type: :development
63
50
  prerelease: false
64
51
  version_requirements: !ruby/object:Gem::Requirement
65
52
  requirements:
66
- - - "~>"
53
+ - - ">="
67
54
  - !ruby/object:Gem::Version
68
- version: '1.16'
55
+ version: '0'
69
56
  - !ruby/object:Gem::Dependency
70
- name: rspec
57
+ name: appraisal
71
58
  requirement: !ruby/object:Gem::Requirement
72
59
  requirements:
73
- - - "~>"
60
+ - - ">="
74
61
  - !ruby/object:Gem::Version
75
- version: '3.0'
62
+ version: '0'
76
63
  type: :development
77
64
  prerelease: false
78
65
  version_requirements: !ruby/object:Gem::Requirement
79
66
  requirements:
80
- - - "~>"
67
+ - - ">="
81
68
  - !ruby/object:Gem::Version
82
- version: '3.0'
69
+ version: '0'
83
70
  - !ruby/object:Gem::Dependency
84
- name: mysql
71
+ name: rake
85
72
  requirement: !ruby/object:Gem::Requirement
86
73
  requirements:
87
- - - "~>"
74
+ - - ">="
88
75
  - !ruby/object:Gem::Version
89
- version: 2.9.1
76
+ version: '0'
90
77
  type: :development
91
78
  prerelease: false
92
79
  version_requirements: !ruby/object:Gem::Requirement
93
80
  requirements:
94
- - - "~>"
81
+ - - ">="
95
82
  - !ruby/object:Gem::Version
96
- version: 2.9.1
83
+ version: '0'
97
84
  - !ruby/object:Gem::Dependency
98
- name: mysql2
85
+ name: rspec
99
86
  requirement: !ruby/object:Gem::Requirement
100
87
  requirements:
101
88
  - - ">="
@@ -109,7 +96,7 @@ dependencies:
109
96
  - !ruby/object:Gem::Version
110
97
  version: '0'
111
98
  - !ruby/object:Gem::Dependency
112
- name: activerecord-mysql2-adapter
99
+ name: mysql2
113
100
  requirement: !ruby/object:Gem::Requirement
114
101
  requirements:
115
102
  - - ">="
@@ -161,14 +148,18 @@ files:
161
148
  - ".gitignore"
162
149
  - ".rspec"
163
150
  - ".travis.yml"
151
+ - Appraisals
164
152
  - Gemfile
165
- - Gemfile.lock
166
153
  - LICENSE.txt
167
154
  - README.md
168
155
  - Rakefile
169
156
  - bin/console
170
157
  - bin/setup
171
158
  - database_cleaner-active_record.gemspec
159
+ - gemfiles/.bundle/config
160
+ - gemfiles/rails_5.1.gemfile
161
+ - gemfiles/rails_5.2.gemfile
162
+ - gemfiles/rails_6.0.gemfile
172
163
  - lib/database_cleaner-active_record.rb
173
164
  - lib/database_cleaner/active_record.rb
174
165
  - lib/database_cleaner/active_record/base.rb
@@ -192,11 +183,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
192
183
  version: '0'
193
184
  required_rubygems_version: !ruby/object:Gem::Requirement
194
185
  requirements:
195
- - - ">="
186
+ - - ">"
196
187
  - !ruby/object:Gem::Version
197
- version: '0'
188
+ version: 1.3.1
198
189
  requirements: []
199
- rubygems_version: 3.0.8
190
+ rubygems_version: 3.0.3
200
191
  signing_key:
201
192
  specification_version: 4
202
193
  summary: Strategies for cleaning databases using ActiveRecord. Can be used to ensure
data/Gemfile.lock DELETED
@@ -1,73 +0,0 @@
1
- PATH
2
- remote: ../..
3
- specs:
4
- database_cleaner (1.99.0)
5
-
6
- PATH
7
- remote: .
8
- specs:
9
- database_cleaner-active_record (1.99.0)
10
- activerecord
11
- database_cleaner (~> 1.99.0)
12
-
13
- GEM
14
- remote: https://rubygems.org/
15
- specs:
16
- activemodel (5.2.4.1)
17
- activesupport (= 5.2.4.1)
18
- activerecord (5.2.4.1)
19
- activemodel (= 5.2.4.1)
20
- activesupport (= 5.2.4.1)
21
- arel (>= 9.0)
22
- activerecord-mysql2-adapter (0.0.3)
23
- mysql2
24
- activesupport (5.2.4.1)
25
- concurrent-ruby (~> 1.0, >= 1.0.2)
26
- i18n (>= 0.7, < 2)
27
- minitest (~> 5.1)
28
- tzinfo (~> 1.1)
29
- arel (9.0.0)
30
- concurrent-ruby (1.1.5)
31
- diff-lcs (1.3)
32
- i18n (1.5.1)
33
- concurrent-ruby (~> 1.0)
34
- minitest (5.14.0)
35
- mysql (2.9.1)
36
- mysql2 (0.3.18)
37
- pg (0.18.2)
38
- rake (10.4.2)
39
- rspec (3.7.0)
40
- rspec-core (~> 3.7.0)
41
- rspec-expectations (~> 3.7.0)
42
- rspec-mocks (~> 3.7.0)
43
- rspec-core (3.7.1)
44
- rspec-support (~> 3.7.0)
45
- rspec-expectations (3.7.0)
46
- diff-lcs (>= 1.2.0, < 2.0)
47
- rspec-support (~> 3.7.0)
48
- rspec-mocks (3.7.0)
49
- diff-lcs (>= 1.2.0, < 2.0)
50
- rspec-support (~> 3.7.0)
51
- rspec-support (3.7.1)
52
- sqlite3 (1.3.10)
53
- thread_safe (0.3.6)
54
- tzinfo (1.2.6)
55
- thread_safe (~> 0.1)
56
-
57
- PLATFORMS
58
- ruby
59
-
60
- DEPENDENCIES
61
- activerecord-mysql2-adapter
62
- bundler (~> 1.16)
63
- database_cleaner!
64
- database_cleaner-active_record!
65
- mysql (~> 2.9.1)
66
- mysql2
67
- pg
68
- rake (~> 10.0)
69
- rspec (~> 3.0)
70
- sqlite3
71
-
72
- BUNDLED WITH
73
- 1.17.3