Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Oracle: fix quoted primary keys and datetime overflow. Closes #7798.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6388 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit bedb879913903e7b2548db7d67a57111b30fa267 1 parent 8e01143
@jeremy jeremy authored
View
2  activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Oracle: fix quoted primary keys and datetime overflow. #7798 [Michael Schoen]
+
* Consistently quote primary key column names. #7763 [toolmantim]
* Fixtures: fix YAML ordered map support. #2665 [Manuel Holtgrewe, nfbuckley]
View
17 activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
@@ -162,7 +162,7 @@ def table_alias_length
# camelCase column names need to be quoted; not that anyone using Oracle
# would really do this, but handling this case means we pass the test...
def quote_column_name(name) #:nodoc:
- name =~ /[A-Z]/ ? "\"#{name}\"" : name
+ name.to_s =~ /[A-Z]/ ? "\"#{name}\"" : name
end
def quote_string(s) #:nodoc:
@@ -507,10 +507,19 @@ def select(sql, name = nil)
when OCI8::LOB
name == 'Writable Large Object' ? row[i]: row[i].read
when OraDate
- if emulate_dates && (row[i].hour == 0 && row[i].minute == 0 && row[i].second == 0)
- row[i].to_date
+ d = row[i]
+ if emulate_dates && (d.hour == 0 && d.minute == 0 && d.second == 0)
+ d.to_date
else
- row[i].to_time rescue row[i].to_datetime
+ # see string_to_time; Time overflowing to DateTime, respecting the default timezone
+ time_array = [d.year, d.month, d.day, d.hour, d.minute, d.second]
+ begin
+ Time.send(Base.default_timezone, *time_array)
+ rescue
+ zone_offset = if Base.default_timezone == :local then DateTime.now.offset else 0 end
+ # Append zero calendar reform start to account for dates skipped by calendar reform
+ DateTime.new(*time_array[0..5] << zone_offset << 0) rescue nil
+ end
end
else row[i]
end unless col == 'raw_rnum_'
Please sign in to comment.
Something went wrong with that request. Please try again.