diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/vendor/db2.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 1bc3af1987..45480170e7 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed db2 connection with empty user_name and auth options #3622 [phurley@gmail.com] + * Fixed validates_length_of to work on UTF-8 strings by using characters instead of bytes #3699 [Masao Mutoh] * Fixed that reflections would bleed across class boundaries in single-table inheritance setups #3796 [lars@pind.com] diff --git a/activerecord/lib/active_record/vendor/db2.rb b/activerecord/lib/active_record/vendor/db2.rb index ec652f8706..812c8cc517 100644 --- a/activerecord/lib/active_record/vendor/db2.rb +++ b/activerecord/lib/active_record/vendor/db2.rb @@ -66,7 +66,7 @@ module DB2 end def connect(server_name, user_name = '', auth = '') - check_rc(SQLConnect(@handle, server_name, user_name, auth)) + check_rc(SQLConnect(@handle, server_name, user_name.to_s, auth.to_s)) end def set_connect_attr(attr, value) |