Skip to content

Commit eae6065

Browse files
committed
Rubocop: Enable Layout/Layout/EmptyLinesAround* cops
1 parent fb170f9 commit eae6065

35 files changed

+0
-120
lines changed

‎Rakefile

-4
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,18 @@ task test: ["test:dblib"]
99
task default: [:test]
1010

1111
namespace :test do
12-
1312
%w(dblib).each do |mode|
14-
1513
Rake::TestTask.new(mode) do |t|
1614
t.libs = ARTest::SQLServer.test_load_paths
1715
t.test_files = test_files
1816
t.warning = !!ENV["WARNING"]
1917
t.verbose = false
2018
end
21-
2219
end
2320

2421
task "dblib:env" do
2522
ENV["ARCONN"] = "dblib"
2623
end
27-
2824
end
2925

3026
task "test:dblib" => "test:dblib:env"

‎lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb

-4
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,17 @@ module ConnectionAdapters
55
module SQLServer
66
module CoreExt
77
module ActiveRecord
8-
98
extend ActiveSupport::Concern
109

1110
module ClassMethods
12-
1311
def execute_procedure(proc_name, *variables)
1412
if connection.respond_to?(:execute_procedure)
1513
connection.execute_procedure(proc_name, *variables)
1614
else
1715
[]
1816
end
1917
end
20-
2118
end
22-
2319
end
2420
end
2521
end

‎lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ module ConnectionAdapters
77
module SQLServer
88
module CoreExt
99
module AttributeMethods
10-
1110
private
1211

1312
def attributes_for_update(attribute_names)
@@ -16,7 +15,6 @@ def attributes_for_update(attribute_names)
1615
column && column.respond_to?(:is_identity?) && column.is_identity?
1716
end
1817
end
19-
2018
end
2119
end
2220
end

‎lib/active_record/connection_adapters/sqlserver/core_ext/calculations.rb

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module ConnectionAdapters
88
module SQLServer
99
module CoreExt
1010
module Calculations
11-
1211
# Same as original except we don't perform PostgreSQL hack that removes ordering.
1312
def calculate(operation, column_name)
1413
if has_include?(column_name)

‎lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ module ConnectionAdapters
55
module SQLServer
66
module CoreExt
77
module Explain
8-
98
SQLSERVER_STATEMENT_PREFIX = "EXEC sp_executesql "
109
SQLSERVER_STATEMENT_REGEXP = /N'(.+)', N'(.+)', (.+)/
1110

@@ -34,7 +33,6 @@ def unprepare_sqlserver_statement(sql, binds)
3433

3534
executesql
3635
end
37-
3836
end
3937
end
4038
end

‎lib/active_record/connection_adapters/sqlserver/core_ext/finder_methods.rb

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module ConnectionAdapters
88
module SQLServer
99
module CoreExt
1010
module FinderMethods
11-
1211
private
1312

1413
# Same as original except we order by values in distinct select if present.

‎lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.rb

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module ConnectionAdapters
88
module SQLServer
99
module CoreExt
1010
module QueryMethods
11-
1211
private
1312

1413
# Copy of original from Rails master.

‎lib/active_record/connection_adapters/sqlserver/database_statements.rb

-1
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,6 @@ def finish_statement_handle(handle)
454454
end
455455
handle
456456
end
457-
458457
end
459458
end
460459
end

‎lib/active_record/connection_adapters/sqlserver/database_tasks.rb

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ module ActiveRecord
44
module ConnectionAdapters
55
module SQLServer
66
module DatabaseTasks
7-
87
def create_database(database, options = {})
98
name = SQLServer::Utils.extract_identifiers(database)
109
db_options = create_database_options(options)
@@ -60,7 +59,6 @@ def create_database_edition_options(options={})
6059
edition_options = "( #{edition_options} )" if edition_options.present?
6160
edition_options
6261
end
63-
6462
end
6563
end
6664
end
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# frozen_string_literal: true
22

33
module ActiveRecord
4-
54
class DeadlockVictim < WrappedDatabaseException
65
end
7-
86
end

‎lib/active_record/connection_adapters/sqlserver/quoting.rb

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ module ActiveRecord
44
module ConnectionAdapters
55
module SQLServer
66
module Quoting
7-
87
QUOTED_TRUE = "1".freeze
98
QUOTED_FALSE = "0".freeze
109
QUOTED_STRING_PREFIX = "N".freeze
@@ -130,7 +129,6 @@ def _type_cast(value)
130129
super
131130
end
132131
end
133-
134132
end
135133
end
136134
end

‎lib/active_record/connection_adapters/sqlserver/schema_statements.rb

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ module ActiveRecord
44
module ConnectionAdapters
55
module SQLServer
66
module SchemaStatements
7-
87
def native_database_types
98
@native_database_types ||= initialize_native_database_types.freeze
109
end
@@ -561,7 +560,6 @@ def views_real_column_name(table_name, column_name)
561560
def create_table_definition(*args, **options)
562561
SQLServer::TableDefinition.new(self, *args, **options)
563562
end
564-
565563
end
566564
end
567565
end

‎lib/active_record/connection_adapters/sqlserver/showplan.rb

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ module ActiveRecord
77
module ConnectionAdapters
88
module SQLServer
99
module Showplan
10-
1110
OPTION_ALL = "SHOWPLAN_ALL"
1211
OPTION_TEXT = "SHOWPLAN_TEXT"
1312
OPTION_XML = "SHOWPLAN_XML"
@@ -61,7 +60,6 @@ def showplan_printer
6160
else PrinterTable
6261
end
6362
end
64-
6563
end
6664
end
6765
end

‎lib/active_record/connection_adapters/sqlserver/table_definition.rb

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
module ActiveRecord
44
module ConnectionAdapters
55
module SQLServer
6-
76
module ColumnMethods
8-
97
def primary_key(name, type = :primary_key, **options)
108
if [:integer, :bigint].include?(type)
119
options[:is_identity] = true unless options.key?(:default)
@@ -97,7 +95,6 @@ def ss_timestamp(*names, **options)
9795
def json(*names, **options)
9896
names.each { |name| column(name, :text, **options) }
9997
end
100-
10198
end
10299

103100
class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition

‎lib/active_record/connection_adapters/sqlserver/transaction.rb

-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
module ActiveRecord
66
module ConnectionAdapters
7-
87
module SQLServerTransaction
9-
108
private
119

1210
def sqlserver?
@@ -25,13 +23,11 @@ def current_isolation_level
2523
level.upcase
2624
end
2725
end
28-
2926
end
3027

3128
Transaction.send :prepend, SQLServerTransaction
3229

3330
module SQLServerRealTransaction
34-
3531
attr_reader :starting_isolation_level
3632

3733
def initialize(connection, options, **args)
@@ -57,7 +53,6 @@ def reset_starting_isolation_level
5753
connection.set_transaction_isolation_level(starting_isolation_level)
5854
end
5955
end
60-
6156
end
6257

6358
RealTransaction.send :prepend, SQLServerRealTransaction

‎lib/active_record/connection_adapters/sqlserver/type/time_value_fractional.rb

-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ module ActiveRecord
44
module ConnectionAdapters
55
module SQLServer
66
module Type
7-
87
module TimeValueFractional
9-
108
private
119

1210
def apply_seconds_precision(value)
@@ -47,11 +45,9 @@ def fractional_precision
4745
def fractional_scale
4846
3
4947
end
50-
5148
end
5249

5350
module TimeValueFractional2
54-
5551
include TimeValueFractional
5652

5753
private
@@ -84,9 +80,7 @@ def fractional_max
8480
def fractional_scale_max
8581
("9" * fractional_scale) + ("0" * (fractional_digits - fractional_scale))
8682
end
87-
8883
end
89-
9084
end
9185
end
9286
end

‎lib/active_record/connection_adapters/sqlserver/utils.rb

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ module ActiveRecord
66
module ConnectionAdapters
77
module SQLServer
88
module Utils
9-
109
QUOTED_STRING_PREFIX = "N"
1110

1211
# Value object to return identifiers from SQL Server names http://bit.ly/1CZ3EiL
@@ -139,7 +138,6 @@ def unquote_string(s)
139138
def extract_identifiers(name)
140139
SQLServer::Utils::Name.new(name)
141140
end
142-
143141
end
144142
end
145143
end

‎lib/active_record/connection_adapters/sqlserver/version.rb

-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ module ActiveRecord
44
module ConnectionAdapters
55
module SQLServer
66
module Version
7-
87
VERSION = File.read(File.expand_path("../../../../../VERSION", __FILE__)).chomp
9-
108
end
119
end
1210
end

‎lib/active_record/tasks/sqlserver_database_tasks.rb

-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
module ActiveRecord
99
module Tasks
10-
1110
class SQLServerDatabaseTasks
1211
DEFAULT_COLLATION = "SQL_Latin1_General_CP1_CI_AS"
1312

@@ -94,11 +93,9 @@ def establish_master_connection
9493
end
9594

9695
module DatabaseTasksSQLServer
97-
9896
extend ActiveSupport::Concern
9997

10098
module ClassMethods
101-
10299
LOCAL_IPADDR = [
103100
IPAddr.new("192.168.0.0/16"),
104101
IPAddr.new("10.0.0.0/8"),
@@ -120,13 +117,10 @@ def local_ipaddr?(host_ip)
120117
return false unless host_ip
121118
LOCAL_IPADDR.any? { |ip| ip.include?(host_ip) }
122119
end
123-
124120
end
125-
126121
end
127122

128123
DatabaseTasks.register_task %r{sqlserver}, SQLServerDatabaseTasks
129124
DatabaseTasks.send :include, DatabaseTasksSQLServer
130-
131125
end
132126
end

0 commit comments

Comments
 (0)