Skip to content

Fix Ruby 2.7 kwargs warnings #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def create_table(table_name, **options)
res
end

def drop_table(table_name, options = {})
def drop_table(table_name, **options)
# Mimic CASCADE option as best we can.
if options[:force] == :cascade
execute_procedure(:sp_fkeys, pktable_name: table_name).each do |fkdata|
Expand Down Expand Up @@ -555,8 +555,8 @@ def views_real_column_name(table_name, column_name)
match_data ? match_data[1] : column_name
end

def create_table_definition(*args)
SQLServer::TableDefinition.new(self, *args)
def create_table_definition(*args, **options)
SQLServer::TableDefinition.new(self, *args, **options)
end

end
Expand Down
80 changes: 40 additions & 40 deletions lib/active_record/connection_adapters/sqlserver/table_definition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,86 +14,86 @@ def primary_key(name, type = :primary_key, **options)
super
end

def primary_key_nonclustered(*args, **options)
args.each { |name| column(name, :primary_key_nonclustered, options) }
def primary_key_nonclustered(*names, **options)
names.each { |name| column(name, :primary_key_nonclustered, **options) }
end

def real(*args, **options)
args.each { |name| column(name, :real, options) }
def real(*names, **options)
names.each { |name| column(name, :real, **options) }
end

def money(*args, **options)
args.each { |name| column(name, :money, options) }
def money(*names, **options)
names.each { |name| column(name, :money, **options) }
end

def smalldatetime(*args, **options)
args.each { |name| column(name, :smalldatetime, options) }
def smalldatetime(*names, **options)
names.each { |name| column(name, :smalldatetime, **options) }
end

def datetime(*args, **options)
args.each do |name|
def datetime(*names, **options)
names.each do |name|
if options[:precision]
datetime2(name, options)
datetime2(name, **options)
else
column(name, :datetime, options)
column(name, :datetime, **options)
end
end
end

def datetime2(*args, **options)
args.each { |name| column(name, :datetime2, options) }
def datetime2(*names, **options)
names.each { |name| column(name, :datetime2, **options) }
end

def datetimeoffset(*args, **options)
args.each { |name| column(name, :datetimeoffset, options) }
def datetimeoffset(*names, **options)
names.each { |name| column(name, :datetimeoffset, **options) }
end

def smallmoney(*args, **options)
args.each { |name| column(name, :smallmoney, options) }
def smallmoney(*names, **options)
names.each { |name| column(name, :smallmoney, **options) }
end

def char(*args, **options)
args.each { |name| column(name, :char, options) }
def char(*names, **options)
names.each { |name| column(name, :char, **options) }
end

def varchar(*args, **options)
args.each { |name| column(name, :varchar, options) }
def varchar(*names, **options)
names.each { |name| column(name, :varchar, **options) }
end

def varchar_max(*args, **options)
args.each { |name| column(name, :varchar_max, options) }
def varchar_max(*names, **options)
names.each { |name| column(name, :varchar_max, **options) }
end

def text_basic(*args, **options)
args.each { |name| column(name, :text_basic, options) }
def text_basic(*names, **options)
names.each { |name| column(name, :text_basic, **options) }
end

def nchar(*args, **options)
args.each { |name| column(name, :nchar, options) }
def nchar(*names, **options)
names.each { |name| column(name, :nchar, **options) }
end

def ntext(*args, **options)
args.each { |name| column(name, :ntext, options) }
def ntext(*names, **options)
names.each { |name| column(name, :ntext, **options) }
end

def binary_basic(*args, **options)
args.each { |name| column(name, :binary_basic, options) }
def binary_basic(*names, **options)
names.each { |name| column(name, :binary_basic, **options) }
end

def varbinary(*args, **options)
args.each { |name| column(name, :varbinary, options) }
def varbinary(*names, **options)
names.each { |name| column(name, :varbinary, **options) }
end

def uuid(*args, **options)
args.each { |name| column(name, :uniqueidentifier, options) }
def uuid(*names, **options)
names.each { |name| column(name, :uniqueidentifier, **options) }
end

def ss_timestamp(*args, **options)
args.each { |name| column(name, :ss_timestamp, options) }
def ss_timestamp(*names, **options)
names.each { |name| column(name, :ss_timestamp, **options) }
end

def json(*args, **options)
args.each { |name| column(name, :text, options) }
def json(*names, **options)
names.each { |name| column(name, :text, **options) }
end

end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module SQLServerRealTransaction

attr_reader :starting_isolation_level

def initialize(connection, options, *args)
def initialize(connection, options, **args)
@connection = connection
@starting_isolation_level = current_isolation_level if options[:isolation]
super
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module SQLServer
module Type
class Money < Decimal

def initialize(*args)
def initialize(**args)
super
@precision = 19
@scale = 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module SQLServer
module Type
class SmallMoney < Money

def initialize(*args)
def initialize(**args)
super
@precision = 10
@scale = 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module SQLServer
module Type
class UnicodeVarchar < UnicodeChar

def initialize(*args)
def initialize(**args)
super
@limit = 4000 if @limit.to_i == 0
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module SQLServer
module Type
class UnicodeVarcharMax < UnicodeVarchar

def initialize(*args)
def initialize(**args)
super
@limit = 2_147_483_647
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module SQLServer
module Type
class Varbinary < Binary

def initialize(*args)
def initialize(**args)
super
@limit = 8000 if @limit.to_i == 0
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module SQLServer
module Type
class VarbinaryMax < Varbinary

def initialize(*args)
def initialize(**args)
super
@limit = 2_147_483_647
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module SQLServer
module Type
class Varchar < Char

def initialize(*args)
def initialize(**args)
super
@limit = 8000 if @limit.to_i == 0
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module SQLServer
module Type
class VarcharMax < Varchar

def initialize(*args)
def initialize(**args)
super
@limit = 2_147_483_647
end
Expand Down