Skip to content

Commit 78aa385

Browse files
committed
Rubocop: Enable Spacing cops
1 parent 8480e4c commit 78aa385

23 files changed

+171
-171
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ else
2121
require "yaml"
2222

2323
spec = eval(File.read("activerecord-sqlserver-adapter.gemspec"))
24-
ver = spec.dependencies.detect{ |d|d.name == "activerecord" }.requirement.requirements.first.last.version
24+
ver = spec.dependencies.detect { |d| d.name == "activerecord" }.requirement.requirements.first.last.version
2525
major, minor, tiny, pre = ver.split(".")
2626

2727
if pre

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def calculate(operation, column_name)
1616
if operation.to_s.downcase == "count"
1717
unless distinct_value || distinct_select?(column_name || select_for_count)
1818
relation.distinct!
19-
relation.select_values = [ klass.primary_key || table[Arel.star] ]
19+
relation.select_values = [klass.primary_key || table[Arel.star]]
2020
end
2121
end
2222

lib/active_record/connection_adapters/sqlserver/database_statements.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def build_insert_sql(insert) # :nodoc:
143143
sql = +"INSERT #{insert.into}"
144144

145145
if returning = insert.send(:insert_all).returning
146-
sql << " OUTPUT " << returning.map {|column| "INSERTED.#{quote_column_name(column)}" }.join(", ")
146+
sql << " OUTPUT " << returning.map { |column| "INSERTED.#{quote_column_name(column)}" }.join(", ")
147147
end
148148

149149
sql << " #{insert.values_list}"
@@ -198,7 +198,7 @@ def user_options
198198
if row.instance_of? Hash
199199
set_option = row.values[0].gsub(/\s+/, "_")
200200
user_value = row.values[1]
201-
elsif row.instance_of? Array
201+
elsif row.instance_of? Array
202202
set_option = row[0].gsub(/\s+/, "_")
203203
user_value = row[1]
204204
end
@@ -341,7 +341,7 @@ def sp_executesql_sql(sql, types, params, name)
341341
end
342342
else
343343
types = quote(types.join(", "))
344-
params = params.map.with_index{ |p, i| "@#{i} = #{p}" }.join(", ") # Only p is needed, but with @i helps explain regexp.
344+
params = params.map.with_index { |p, i| "@#{i} = #{p}" }.join(", ") # Only p is needed, but with @i helps explain regexp.
345345
sql = "EXEC sp_executesql #{quote(sql)}"
346346
sql += ", #{types}, #{params}" unless params.empty?
347347
end

lib/active_record/connection_adapters/sqlserver/database_tasks.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ def collation
3131

3232
private
3333

34-
def create_database_options(options={})
34+
def create_database_options(options = {})
3535
keys = [:collate]
3636
copts = @connection_options
3737
options = {
3838
collate: copts[:collation]
3939
}.merge(options.symbolize_keys).select { |_, v|
4040
v.present?
41-
}.slice(*keys).map { |k,v|
41+
}.slice(*keys).map { |k, v|
4242
"#{k.to_s.upcase} #{v}"
4343
}.join(" ")
4444
options
4545
end
4646

47-
def create_database_edition_options(options={})
47+
def create_database_edition_options(options = {})
4848
keys = [:maxsize, :edition, :service_objective]
4949
copts = @connection_options
5050
edition_options = {
@@ -53,7 +53,7 @@ def create_database_edition_options(options={})
5353
service_objective: copts[:azure_service_objective]
5454
}.merge(options.symbolize_keys).select { |_, v|
5555
v.present?
56-
}.slice(*keys).map { |k,v|
56+
}.slice(*keys).map { |k, v|
5757
"#{k.to_s.upcase} = #{v}"
5858
}.join(", ")
5959
edition_options = "( #{edition_options} )" if edition_options.present?

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def type_to_sql(type, limit: nil, precision: nil, scale: nil, **)
248248
end
249249

250250
def columns_for_distinct(columns, orders)
251-
order_columns = orders.reject(&:blank?).map{ |s|
251+
order_columns = orders.reject(&:blank?).map { |s|
252252
s = s.to_sql unless s.is_a?(String)
253253
s.gsub(/\s+(?:ASC|DESC)\b/i, "")
254254
.gsub(/\s+NULLS\s+(?:FIRST|LAST)\b/i, "")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def quote_fractional(value)
2323
return 0 if fractional_scale == 0
2424
frac_seconds = seconds_precision(value)
2525
seconds = (frac_seconds.to_f / fractional_operator.to_f).round(fractional_scale)
26-
seconds.to_d.to_s.split(".").last.to(fractional_scale-1)
26+
seconds.to_d.to_s.split(".").last.to(fractional_scale - 1)
2727
end
2828

2929
def fractional_property
@@ -35,7 +35,7 @@ def fractional_digits
3535
end
3636

3737
def fractional_operator
38-
10 ** fractional_digits
38+
10**fractional_digits
3939
end
4040

4141
def fractional_precision

lib/active_record/connection_adapters/sqlserver/utils.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def to_s
5454
end
5555

5656
def quoted
57-
parts.map{ |p| quote(p) if p }.join SEPARATOR
57+
parts.map { |p| quote(p) if p }.join SEPARATOR
5858
end
5959

6060
def quoted_raw

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ def get_database_version # :nodoc:
293293
# === Abstract Adapter (Misc Support) =========================== #
294294

295295
def initialize_type_map(m = type_map)
296-
m.register_type %r{.*}, SQLServer::Type::UnicodeString.new
296+
m.register_type %r{.*}, SQLServer::Type::UnicodeString.new
297297
# Exact Numerics
298298
register_class_with_limit m, "bigint(8)", SQLServer::Type::BigInteger
299299
m.alias_type "bigint", "bigint(8)"
@@ -326,11 +326,11 @@ def initialize_type_map(m = type_map)
326326
SQLServer::Type::DateTime.new
327327
end
328328
end
329-
m.register_type %r{\Adatetimeoffset}i do |sql_type|
329+
m.register_type %r{\Adatetimeoffset}i do |sql_type|
330330
precision = extract_precision(sql_type)
331331
SQLServer::Type::DateTimeOffset.new precision: precision
332332
end
333-
m.register_type "smalldatetime", SQLServer::Type::SmallDateTime.new
333+
m.register_type "smalldatetime", SQLServer::Type::SmallDateTime.new
334334
m.register_type %r{\Atime}i do |sql_type|
335335
precision = extract_precision(sql_type) || DEFAULT_TIME_PRECISION
336336
SQLServer::Type::Time.new precision: precision
@@ -456,9 +456,9 @@ def config_encoding(config)
456456
config[:encoding].present? ? config[:encoding] : nil
457457
end
458458

459-
def configure_connection ; end
459+
def configure_connection; end
460460

461-
def configure_application_name ; end
461+
def configure_application_name; end
462462

463463
def initialize_dateformatter
464464
@database_dateformat = user_options_dateformat

lib/arel/visitors/sqlserver.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class SQLServer < Arel::Visitors::ToSql
1414
# SQLServer ToSql/Visitor (Overides)
1515

1616
def visit_Arel_Nodes_BindParam o, collector
17-
collector.add_bind(o.value) { |i| "@#{i-1}" }
17+
collector.add_bind(o.value) { |i| "@#{i - 1}" }
1818
end
1919

2020
def visit_Arel_Nodes_Bin o, collector
@@ -70,7 +70,7 @@ def visit_Arel_Nodes_SelectStatement o, collector
7070
collector = visit o.with, collector
7171
collector << " "
7272
end
73-
collector = o.cores.inject(collector) { |c,x|
73+
collector = o.cores.inject(collector) { |c, x|
7474
visit_Arel_Nodes_SelectCore(x, c)
7575
}
7676
collector = visit_Orders_And_Let_Fetch_Happen o, collector

test/cases/adapter_test_sqlserver.rb

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
5454
end
5555

5656
it "return true to insert sql query for inserts only" do
57-
assert connection.send(:insert_sql?,"INSERT...")
57+
assert connection.send(:insert_sql?, "INSERT...")
5858
assert connection.send(:insert_sql?, "EXEC sp_executesql N'INSERT INTO [fk_test_has_fks] ([fk_id]) VALUES (@0); SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident', N'@0 int', @0 = 0")
59-
assert !connection.send(:insert_sql?,"UPDATE...")
60-
assert !connection.send(:insert_sql?,"SELECT...")
59+
assert !connection.send(:insert_sql?, "UPDATE...")
60+
assert !connection.send(:insert_sql?, "SELECT...")
6161
end
6262

6363
it "return unquoted table name object from basic INSERT UPDATE and SELECT statements" do
@@ -155,17 +155,17 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
155155
end
156156

157157
it "return quoted table_name to #query_requires_identity_insert? when INSERT sql contains id column" do
158-
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?,@identity_insert_sql)
159-
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted)
160-
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered)
161-
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?,@identity_insert_sql_sp)
162-
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted_sp)
163-
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered_sp)
158+
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?, @identity_insert_sql)
159+
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?, @identity_insert_sql_unquoted)
160+
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?, @identity_insert_sql_unordered)
161+
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?, @identity_insert_sql_sp)
162+
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?, @identity_insert_sql_unquoted_sp)
163+
assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?, @identity_insert_sql_unordered_sp)
164164
end
165165

166166
it "return false to #query_requires_identity_insert? for normal SQL" do
167167
[basic_insert_sql, basic_update_sql, basic_select_sql].each do |sql|
168-
assert !connection.send(:query_requires_identity_insert?,sql), "SQL was #{sql}"
168+
assert !connection.send(:query_requires_identity_insert?, sql), "SQL was #{sql}"
169169
end
170170
end
171171

@@ -227,7 +227,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
227227
end
228228

229229
it "NOT ALLOW by default the deletion of a referenced parent" do
230-
SSTestHasPk.connection.disable_referential_integrity { }
230+
SSTestHasPk.connection.disable_referential_integrity {}
231231
assert_raise(ActiveRecord::StatementInvalid) { @parent.destroy }
232232
end
233233

@@ -237,7 +237,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
237237

238238
it "again NOT ALLOW deletion of referenced parent after #disable_referential_integrity block" do
239239
assert_raise(ActiveRecord::StatementInvalid) do
240-
SSTestHasPk.connection.disable_referential_integrity { }
240+
SSTestHasPk.connection.disable_referential_integrity {}
241241
@parent.destroy
242242
end
243243
end
@@ -318,27 +318,27 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
318318
end
319319

320320
it "not contain system views" do
321-
systables = ["sysconstraints","syssegments"]
321+
systables = ["sysconstraints", "syssegments"]
322322
systables.each do |systable|
323323
assert !connection.views.include?(systable), "This systable #{systable} should not be in the views array."
324324
end
325325
end
326326

327327
it "allow the connection#view_information method to return meta data on the view" do
328-
view_info = connection.send(:view_information,"sst_customers_view")
328+
view_info = connection.send(:view_information, "sst_customers_view")
329329
assert_equal("sst_customers_view", view_info["TABLE_NAME"])
330330
assert_match(/CREATE VIEW sst_customers_view/, view_info["VIEW_DEFINITION"])
331331
end
332332

333333
it "allow the connection#view_table_name method to return true table_name for the view" do
334-
assert_equal "customers", connection.send(:view_table_name,"sst_customers_view")
335-
assert_equal "topics", connection.send(:view_table_name,"topics"), "No view here, the same table name should come back."
334+
assert_equal "customers", connection.send(:view_table_name, "sst_customers_view")
335+
assert_equal "topics", connection.send(:view_table_name, "topics"), "No view here, the same table name should come back."
336336
end
337337

338338
# With same column names
339339

340340
it "have matching column objects" do
341-
columns = ["id","name","balance"]
341+
columns = ["id", "name", "balance"]
342342
assert !SSTestCustomersView.columns.blank?
343343
assert_equal columns.size, SSTestCustomersView.columns.size
344344
columns.each do |colname|
@@ -365,7 +365,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
365365
# With aliased column names
366366

367367
it "have matching column objects" do
368-
columns = ["id","pretend_null"]
368+
columns = ["id", "pretend_null"]
369369
assert !SSTestStringDefaultsView.columns.blank?
370370
assert_equal columns.size, SSTestStringDefaultsView.columns.size
371371
columns.each do |colname|

0 commit comments

Comments
 (0)