Skip to content

Commit eff5023

Browse files
authored
Merge pull request #822 from rails-sqlserver/enable-frozen-strings-part-2
Enable frozen strings - part 2
2 parents 019d712 + 1b01040 commit eff5023

35 files changed

+116
-42
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
- [#783](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/783) Update test matrix
1717
- [#820](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/820) Enable frozen strings for tests
1818
- [#821](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/821) Enable frozen strings - part 1
19+
- [#822](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/822) Enable frozen strings - part 2
1920

2021
#### Added
2122

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
# frozen_string_literal: true
2+
13
module ActiveRecord
24
module ConnectionAdapters
35
module SQLServer
46
module Type
57
class BigInteger < Integer
68

79
def sqlserver_type
8-
'bigint'.freeze
10+
"bigint"
911
end
1012

1113
end

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module ActiveRecord
24
module ConnectionAdapters
35
module SQLServer
@@ -9,8 +11,9 @@ def type
911
end
1012

1113
def sqlserver_type
12-
'binary'.tap do |type|
13-
type << "(#{limit})" if limit
14+
"binary".yield_self do |type|
15+
type += "(#{limit})" if limit
16+
type
1417
end
1518
end
1619

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
# frozen_string_literal: true
2+
13
module ActiveRecord
24
module ConnectionAdapters
35
module SQLServer
46
module Type
57
class Boolean < ActiveRecord::Type::Boolean
68

79
def sqlserver_type
8-
'bit'.freeze
10+
"bit"
911
end
1012

1113
end

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module ActiveRecord
24
module ConnectionAdapters
35
module SQLServer
@@ -15,8 +17,9 @@ def serialize(value)
1517
end
1618

1719
def sqlserver_type
18-
'char'.tap do |type|
19-
type << "(#{limit})" if limit
20+
"char".yield_self do |type|
21+
type += "(#{limit})" if limit
22+
type
2023
end
2124
end
2225

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module ActiveRecord
24
module ConnectionAdapters
35
module SQLServer

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
# frozen_string_literal: true
2+
13
module ActiveRecord
24
module ConnectionAdapters
35
module SQLServer
46
module Type
57
class Date < ActiveRecord::Type::Date
68

79
def sqlserver_type
8-
'date'.freeze
10+
'date'
911
end
1012

1113
def serialize(value)

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module ActiveRecord
24
module ConnectionAdapters
35
module SQLServer
@@ -7,16 +9,15 @@ class DateTime < ActiveRecord::Type::DateTime
79
include TimeValueFractional
810

911
def sqlserver_type
10-
'datetime'.freeze
12+
"datetime"
1113
end
1214

1315
def serialize(value)
1416
value = super
1517
return value unless value.acts_like?(:time)
16-
datetime = value.to_s(:_sqlserver_datetime).tap do |v|
17-
fraction = quote_fractional(value)
18-
v << ".#{fraction}"
19-
end
18+
19+
datetime = "#{value.to_s(:_sqlserver_datetime)}.#{quote_fractional(value)}"
20+
2021
Data.new datetime, self
2122
end
2223

@@ -43,7 +44,7 @@ def fast_string_to_time(string)
4344
end
4445

4546
def fast_string_to_time_format
46-
"#{::Time::DATE_FORMATS[:_sqlserver_datetime]}.%N".freeze
47+
"#{::Time::DATE_FORMATS[:_sqlserver_datetime]}.%N"
4748
end
4849
end
4950
end

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module ActiveRecord
24
module ConnectionAdapters
35
module SQLServer

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module ActiveRecord
24
module ConnectionAdapters
35
module SQLServer

0 commit comments

Comments
 (0)