Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix error preventing me from running any rake tasks. #222

Merged
merged 6 commits into from
Aug 17, 2012
Merged

fix error preventing me from running any rake tasks. #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eeae445
iseries returns date with two digit year, leave as string instead of …
bkulyk Jun 26, 2012
aba15d3
if guessing the date or time fails return the value
bkulyk Aug 15, 2012
41b4f63
Merge branch 'master' of github.com:bkulyk/activerecord-jdbc-adapter
bkulyk Aug 15, 2012
3257d82
I fixed the same problem twice, removed the second
bkulyk Aug 15, 2012
cd1dcb6
Merge branch 'master' of git://github.com/jruby/activerecord-jdbc-ada…
bkulyk Aug 15, 2012
1ee7fa8
an error in jdbc.rake was preventing me from running any rake tasks. …
bkulyk Aug 16, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/arjdbc/db2/adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ def self.cast_to_date_or_time(value)
return nil if value.blank?
return Time.now if value =~ /^CURRENT/
guess_date_or_time((value.is_a? Time) ? value : cast_to_time(value))
rescue
value
end

def self.cast_to_time(value)
Expand Down
2 changes: 1 addition & 1 deletion lib/arjdbc/jdbc/jdbc.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def redefine_task(*args, &block)
existing_task.instance_variable_set "@actions", []
end
redefined_task = task(*args, &block)
enhancements.each {|enhancement| redefined_task.actions << enhancement}
enhancements.each {|enhancement| redefined_task.actions << enhancement} unless enhancements.nil?
end

def rails_env
Expand Down