Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- [#783](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/783) Update test matrix
- [#820](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/820) Enable frozen strings for tests
- [#821](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/821) Enable frozen strings - part 1
- [#822](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/822) Enable frozen strings - part 2

#### Added

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
module Type
class BigInteger < Integer

def sqlserver_type
'bigint'.freeze
"bigint"
end

end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -9,8 +11,9 @@ def type
end

def sqlserver_type
'binary'.tap do |type|
type << "(#{limit})" if limit
"binary".yield_self do |type|
type += "(#{limit})" if limit
type
end
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
module Type
class Boolean < ActiveRecord::Type::Boolean

def sqlserver_type
'bit'.freeze
"bit"
end

end
Expand Down
7 changes: 5 additions & 2 deletions lib/active_record/connection_adapters/sqlserver/type/char.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -15,8 +17,9 @@ def serialize(value)
end

def sqlserver_type
'char'.tap do |type|
type << "(#{limit})" if limit
"char".yield_self do |type|
type += "(#{limit})" if limit
type
end
end

Expand Down
2 changes: 2 additions & 0 deletions lib/active_record/connection_adapters/sqlserver/type/data.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand Down
4 changes: 3 additions & 1 deletion lib/active_record/connection_adapters/sqlserver/type/date.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
module Type
class Date < ActiveRecord::Type::Date

def sqlserver_type
'date'.freeze
'date'
end

def serialize(value)
Expand Down
13 changes: 7 additions & 6 deletions lib/active_record/connection_adapters/sqlserver/type/datetime.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -7,16 +9,15 @@ class DateTime < ActiveRecord::Type::DateTime
include TimeValueFractional

def sqlserver_type
'datetime'.freeze
"datetime"
end

def serialize(value)
value = super
return value unless value.acts_like?(:time)
datetime = value.to_s(:_sqlserver_datetime).tap do |v|
fraction = quote_fractional(value)
v << ".#{fraction}"
end

datetime = "#{value.to_s(:_sqlserver_datetime)}.#{quote_fractional(value)}"

Data.new datetime, self
end

Expand All @@ -43,7 +44,7 @@ def fast_string_to_time(string)
end

def fast_string_to_time_format
"#{::Time::DATE_FORMATS[:_sqlserver_datetime]}.%N".freeze
"#{::Time::DATE_FORMATS[:_sqlserver_datetime]}.%N"
end
end
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
module Type
class Decimal < ActiveRecord::Type::Decimal

def sqlserver_type
'decimal'.tap do |type|
type << "(#{precision.to_i},#{scale.to_i})" if precision || scale
"decimal".yield_self do |type|
type += "(#{precision.to_i},#{scale.to_i})" if precision || scale
type
end
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -9,7 +11,7 @@ def type
end

def sqlserver_type
'float'.freeze
"float"
end

end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
module Type
class Integer < ActiveRecord::Type::Integer

def sqlserver_type
'int'.freeze
"int"
end

end
Expand Down
2 changes: 2 additions & 0 deletions lib/active_record/connection_adapters/sqlserver/type/json.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -15,7 +17,7 @@ def type
end

def sqlserver_type
'money'.freeze
"money"
end

end
Expand Down
4 changes: 3 additions & 1 deletion lib/active_record/connection_adapters/sqlserver/type/real.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -9,7 +11,7 @@ def type
end

def sqlserver_type
'real'.freeze
"real"
end

end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
module Type
class SmallInteger < Integer

def sqlserver_type
'smallint'.freeze
"smallint"
end

end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -15,7 +17,7 @@ def type
end

def sqlserver_type
'smallmoney'.freeze
"smallmoney"
end

end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -9,7 +11,7 @@ def type
end

def sqlserver_type
'smalldatetime'.freeze
"smalldatetime"
end

private
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand Down
4 changes: 3 additions & 1 deletion lib/active_record/connection_adapters/sqlserver/type/text.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -9,7 +11,7 @@ def type
end

def sqlserver_type
'text'.freeze
"text"
end

end
Expand Down
9 changes: 5 additions & 4 deletions lib/active_record/connection_adapters/sqlserver/type/time.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -9,10 +11,9 @@ class Time < ActiveRecord::Type::Time
def serialize(value)
value = super
return value unless value.acts_like?(:time)
time = value.to_s(:_sqlserver_time).tap do |v|
fraction = quote_fractional(value)
v << ".#{fraction}"
end

time = "#{value.to_s(:_sqlserver_time)}.#{quote_fractional(value)}"

Data.new time, self
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -9,7 +11,7 @@ def type
end

def sqlserver_type
'timestamp'.freeze
"timestamp"
end

end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
module Type
class TinyInteger < Integer

def sqlserver_type
'tinyint'.freeze
"tinyint"
end

private
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -9,8 +11,9 @@ def type
end

def sqlserver_type
'nchar'.tap do |type|
type << "(#{limit})" if limit
'nchar'.yield_self do |type|
type += "(#{limit})" if limit
type
end
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

module ActiveRecord
module ConnectionAdapters
module SQLServer
Expand All @@ -9,7 +11,7 @@ def type
end

def sqlserver_type
'ntext'.freeze
"ntext"
end

end
Expand Down
Loading