Skip to content

Commit 082a2f7

Browse files
author
Rob Widmer
committed
Removed some rails version variables that are no longer needed
1 parent e6691d3 commit 082a2f7

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

lib/arjdbc/jdbc.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
module ArJdbc
44

5-
# @private
6-
AR40 = ::ActiveRecord::VERSION::MAJOR > 3
75
# @private
86
AR42 = ::ActiveRecord::VERSION::STRING >= '4.2'
9-
# @private
10-
AR50 = ::ActiveRecord::VERSION::MAJOR > 4
117

128
class << self
139

lib/arjdbc/jdbc/column.rb

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,17 @@ def initialize(config, name, *args)
2626
end
2727
end
2828

29-
if ArJdbc::AR50
30-
default = args[0].cast(default)
29+
default = args[0].cast(default)
3130

32-
sql_type = args.delete_at(1)
33-
type = args.delete_at(0)
31+
sql_type = args.delete_at(1)
32+
type = args.delete_at(0)
3433

35-
args.unshift(SqlTypeMetadata.new(:sql_type => sql_type, :type => type))
36-
elsif ArJdbc::AR42
37-
default = args[0].type_cast_from_database(default)
38-
else
39-
default = default_value(default)
40-
end
34+
args.unshift(SqlTypeMetadata.new(:sql_type => sql_type, :type => type))
4135

4236
# super <= 4.1: (name, default, sql_type = nil, null = true)
4337
# super >= 4.2: (name, default, cast_type, sql_type = nil, null = true)
4438
# super >= 5.0: (name, default, sql_type_metadata = nil, null = true)
45-
39+
4640
super(name, default, *args)
4741
init_column(name, default, *args)
4842
end

0 commit comments

Comments
 (0)