Skip to content

Commit 7eb64a4

Browse files
authored
Merge pull request #2204 from yahonda/remove_parallel_option_from_rubocop
Support RuboCop 1.19.0
2 parents 5a158ed + 11fac7f commit 7eb64a4

File tree

17 files changed

+115
-115
lines changed

17 files changed

+115
-115
lines changed

.github/workflows/ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ jobs:
3434
- name: Build and run RuboCop
3535
run: |
3636
bundle install --jobs 4 --retry 3
37-
bundle exec rubocop --parallel
37+
bundle exec rubocop

lib/active_record/connection_adapters/emulation/oracle_adapter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
class ActiveRecord::ConnectionAdapters::OracleAdapter < ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter #:nodoc:
3+
class ActiveRecord::ConnectionAdapters::OracleAdapter < ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter # :nodoc:
44
def adapter_name
55
"Oracle"
66
end

lib/active_record/connection_adapters/oracle_enhanced/column.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# frozen_string_literal: true
22

33
module ActiveRecord
4-
module ConnectionAdapters #:nodoc:
4+
module ConnectionAdapters # :nodoc:
55
module OracleEnhanced
66
class Column < ActiveRecord::ConnectionAdapters::Column
77
delegate :virtual, to: :sql_type_metadata, allow_nil: true
88

9-
def initialize(name, default, sql_type_metadata = nil, null = true, comment: nil) #:nodoc:
9+
def initialize(name, default, sql_type_metadata = nil, null = true, comment: nil) # :nodoc:
1010
super(name, default, sql_type_metadata, null, comment: comment)
1111
end
1212

lib/active_record/connection_adapters/oracle_enhanced/connection.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveRecord
44
module ConnectionAdapters
55
# interface independent methods
66
module OracleEnhanced
7-
class Connection #:nodoc:
7+
class Connection # :nodoc:
88
def self.create(config)
99
case ORACLE_ENHANCED_CONNECTION
1010
when :oci
@@ -118,7 +118,7 @@ def _select_value(arel, name = nil, binds = [])
118118
def database_version
119119
raise NoMethodError, "Not implemented for this raw driver"
120120
end
121-
class ConnectionException < StandardError #:nodoc:
121+
class ConnectionException < StandardError # :nodoc:
122122
end
123123
end
124124
end

lib/active_record/connection_adapters/oracle_enhanced/database_limits.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module DatabaseLimits
99
# maximum length of Oracle identifiers
1010
IDENTIFIER_MAX_LENGTH = 30
1111

12-
def table_alias_length #:nodoc:
12+
def table_alias_length # :nodoc:
1313
IDENTIFIER_MAX_LENGTH
1414
end
1515

lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def exec_update(sql, name = nil, binds = [])
164164

165165
alias :exec_delete :exec_update
166166

167-
def begin_db_transaction #:nodoc:
167+
def begin_db_transaction # :nodoc:
168168
@connection.autocommit = false
169169
end
170170

@@ -183,27 +183,27 @@ def begin_isolated_db_transaction(isolation)
183183
execute "SET TRANSACTION ISOLATION LEVEL #{transaction_isolation_levels.fetch(isolation)}"
184184
end
185185

186-
def commit_db_transaction #:nodoc:
186+
def commit_db_transaction # :nodoc:
187187
@connection.commit
188188
ensure
189189
@connection.autocommit = true
190190
end
191191

192-
def exec_rollback_db_transaction #:nodoc:
192+
def exec_rollback_db_transaction # :nodoc:
193193
@connection.rollback
194194
ensure
195195
@connection.autocommit = true
196196
end
197197

198-
def create_savepoint(name = current_savepoint_name) #:nodoc:
198+
def create_savepoint(name = current_savepoint_name) # :nodoc:
199199
execute("SAVEPOINT #{name}", "TRANSACTION")
200200
end
201201

202-
def exec_rollback_to_savepoint(name = current_savepoint_name) #:nodoc:
202+
def exec_rollback_to_savepoint(name = current_savepoint_name) # :nodoc:
203203
execute("ROLLBACK TO #{name}", "TRANSACTION")
204204
end
205205

206-
def release_savepoint(name = current_savepoint_name) #:nodoc:
206+
def release_savepoint(name = current_savepoint_name) # :nodoc:
207207
# there is no RELEASE SAVEPOINT statement in Oracle
208208
end
209209

@@ -214,7 +214,7 @@ def default_sequence_name(table_name, primary_key = nil)
214214
end
215215

216216
# Inserts the given fixture into the table. Overridden to properly handle lobs.
217-
def insert_fixture(fixture, table_name) #:nodoc:
217+
def insert_fixture(fixture, table_name) # :nodoc:
218218
super
219219

220220
if ActiveRecord::Base.pluralize_table_names
@@ -249,7 +249,7 @@ def empty_insert_statement_value
249249
end
250250

251251
# Writes LOB values from attributes for specified columns
252-
def write_lobs(table_name, klass, attributes, columns) #:nodoc:
252+
def write_lobs(table_name, klass, attributes, columns) # :nodoc:
253253
id = quote(attributes[klass.primary_key])
254254
columns.each do |col|
255255
value = attributes[col.name]

lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module ActiveRecord
5252
module ConnectionAdapters
5353
# JDBC database interface for JRuby
5454
module OracleEnhanced
55-
class JDBCConnection < OracleEnhanced::Connection #:nodoc:
55+
class JDBCConnection < OracleEnhanced::Connection # :nodoc:
5656
attr_accessor :active
5757
alias :active? :active
5858

lib/active_record/connection_adapters/oracle_enhanced/lob.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# frozen_string_literal: true
22

3-
module ActiveRecord #:nodoc:
4-
module ConnectionAdapters #:nodoc:
5-
module OracleEnhanced #:nodoc:
6-
module Lob #:nodoc:
3+
module ActiveRecord # :nodoc:
4+
module ConnectionAdapters # :nodoc:
5+
module OracleEnhanced # :nodoc:
6+
module Lob # :nodoc:
77
extend ActiveSupport::Concern
88

99
included do

lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module ActiveRecord
2626
module ConnectionAdapters
2727
# OCI database interface for MRI
2828
module OracleEnhanced
29-
class OCIConnection < OracleEnhanced::Connection #:nodoc:
29+
class OCIConnection < OracleEnhanced::Connection # :nodoc:
3030
def initialize(config)
3131
@raw_connection = OCI8EnhancedAutoRecover.new(config, OracleEnhancedOCIFactory)
3232
# default schema owner
@@ -299,7 +299,7 @@ def create_time_with_default_timezone(value)
299299

300300
# The OracleEnhancedOCIFactory factors out the code necessary to connect and
301301
# configure an Oracle/OCI connection.
302-
class OracleEnhancedOCIFactory #:nodoc:
302+
class OracleEnhancedOCIFactory # :nodoc:
303303
DEFAULT_TCP_KEEPALIVE_TIME = 600
304304

305305
def self.new_connection(config)
@@ -375,18 +375,18 @@ def self.new_connection(config)
375375
# this would be dangerous (as the earlier part of the implied transaction
376376
# may have failed silently if the connection died) -- so instead the
377377
# connection is marked as dead, to be reconnected on it's next use.
378-
#:stopdoc:
379-
class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
380-
attr_accessor :active #:nodoc:
381-
alias :active? :active #:nodoc:
378+
# :stopdoc:
379+
class OCI8EnhancedAutoRecover < DelegateClass(OCI8) # :nodoc:
380+
attr_accessor :active # :nodoc:
381+
alias :active? :active # :nodoc:
382382

383383
cattr_accessor :auto_retry
384384
class << self
385-
alias :auto_retry? :auto_retry #:nodoc:
385+
alias :auto_retry? :auto_retry # :nodoc:
386386
end
387387
@@auto_retry = false
388388

389-
def initialize(config, factory) #:nodoc:
389+
def initialize(config, factory) # :nodoc:
390390
@active = true
391391
@config = config
392392
@factory = factory
@@ -397,7 +397,7 @@ def initialize(config, factory) #:nodoc:
397397
# Checks connection, returns true if active. Note that ping actively
398398
# checks the connection, while #active? simply returns the last
399399
# known state.
400-
def ping #:nodoc:
400+
def ping # :nodoc:
401401
@connection.exec("select 1 from dual") { |r| nil }
402402
@active = true
403403
rescue
@@ -406,7 +406,7 @@ def ping #:nodoc:
406406
end
407407

408408
# Resets connection, by logging off and creating a new connection.
409-
def reset! #:nodoc:
409+
def reset! # :nodoc:
410410
logoff rescue nil
411411
begin
412412
@connection = @factory.new_connection @config
@@ -423,10 +423,10 @@ def reset! #:nodoc:
423423
# ORA-03113: end-of-file on communication channel
424424
# ORA-03114: not connected to ORACLE
425425
# ORA-03135: connection lost contact
426-
LOST_CONNECTION_ERROR_CODES = [ 28, 1012, 3113, 3114, 3135 ] #:nodoc:
426+
LOST_CONNECTION_ERROR_CODES = [ 28, 1012, 3113, 3114, 3135 ] # :nodoc:
427427

428428
# Adds auto-recovery functionality.
429-
def with_retry #:nodoc:
429+
def with_retry # :nodoc:
430430
should_retry = self.class.auto_retry? && autocommit?
431431

432432
begin
@@ -441,8 +441,8 @@ def with_retry #:nodoc:
441441
end
442442
end
443443

444-
def exec(sql, *bindvars, &block) #:nodoc:
444+
def exec(sql, *bindvars, &block) # :nodoc:
445445
with_retry { @connection.exec(sql, *bindvars, &block) }
446446
end
447447
end
448-
#:startdoc:
448+
# :startdoc:

lib/active_record/connection_adapters/oracle_enhanced/procedures.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require "active_support"
44

5-
module ActiveRecord #:nodoc:
5+
module ActiveRecord # :nodoc:
66
# Custom create, update, delete methods functionality.
77
#
88
# Example:
@@ -33,7 +33,7 @@ module ActiveRecord #:nodoc:
3333
# end
3434
# end
3535
#
36-
module OracleEnhancedProcedures #:nodoc:
36+
module OracleEnhancedProcedures # :nodoc:
3737
module ClassMethods
3838
# Specify custom create method which should be used instead of Rails generated INSERT statement.
3939
# Provided block should return ID of new record.
@@ -83,7 +83,7 @@ def self.included(base)
8383
end
8484
end
8585

86-
def destroy #:nodoc:
86+
def destroy # :nodoc:
8787
# check if class has custom delete method
8888
if self.class.custom_delete_method
8989
# wrap destroy in transaction

0 commit comments

Comments
 (0)