IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 11:20:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use Rails 4.2+ API for typecasting on master

Browse Source 
Note: this is still considered a private (internal) API on Rails side and is
subject to change in the future.
This commit is contained in:
Godfrey Chan 2014-08-17 18:46:53 -07:00
parent 84d4307b1c
commit f955ec6018
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/sql_builder.rb
View File

@ -71,11 +71,20 @@ class SqlBuilder
#AS reloads this on tests #AS reloads this on tests
remove_const :FTYPE_MAP if defined? FTYPE_MAP remove_const :FTYPE_MAP if defined? FTYPE_MAP
FTYPE_MAP = {
23 => :value_to_integer, if rails_master?
1114 => :string_to_time, FTYPE_MAP = {
16 => :value_to_boolean 23 => ActiveRecord::Type::Integer.new,
} 1114 => ActiveRecord::Type::DateTime.new,
16 => ActiveRecord::Type::Boolean.new
}
else
FTYPE_MAP = {
23 => :value_to_integer,
1114 => :string_to_time,
16 => :value_to_boolean
}
end
def self.map_exec(klass, sql, args = {}) def self.map_exec(klass, sql, args = {})
self.new(sql).map_exec(klass, args) self.new(sql).map_exec(klass, args)
@ -93,7 +102,11 @@ class SqlBuilder
setters.each_with_index do |mapper, index| setters.each_with_index do |mapper, index|
translated = row[index] translated = row[index]
if mapper[1] && !translated.nil? if mapper[1] && !translated.nil?
translated = ActiveRecord::ConnectionAdapters::Column.send mapper[1], translated if rails_master?
translated = mapper[1].type_cast_from_database(translated)
else
translated = ActiveRecord::ConnectionAdapters::Column.send mapper[1], translated
end
end end
mapped.send mapper[0], translated mapped.send mapper[0], translated
end end