Skip to content

Commit 537ca08

Browse files
authored
Merge pull request #829 from rails-sqlserver/rubocop-EmptyLinesAround
Rubocop: Enable Layout/Layout/EmptyLinesAround* cops
2 parents fb170f9 + eae6065 commit 537ca08

35 files changed

+0
-120
lines changed

Rakefile

Lines changed: 0 additions & 4 deletions
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

Lines changed: 0 additions & 4 deletions
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 2 deletions
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
Lines changed: 0 additions & 2 deletions
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

0 commit comments

Comments
 (0)