Skip to content

Commit

Permalink
bring in latest from 0.2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
brianmario committed Jun 14, 2011
2 parents 9742299 + 1e909c9 commit 3510336
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Changelog

## In Git
* Avoid thread blocking on Ruby 1.9.x under Windows. Patch by Roger Pack.
## 0.3.3 (June 14th, 2011)
* disable async support, and access to the underlying file descriptor under Windows. It's never worked reliably and ruby-core has a lot of work to do in order to make it possible.
* added support for turning eager-casting off. This is especially useful in ORMs that will lazily cast values upon access.
* added a warning if a 0.2.x release is being used with ActiveRecord 3.1 since both the 0.2.x releases and AR 3.1 have mysql2 adapters, we want you to use the one in AR 3.1
* added Mysql2::Client.escape (class-level method)
* disabled eager-casting in the bundled ActiveRecord adapter (for Rails 3.0 or less)

## 0.3.2 (April 26th, 2011)
* Fix typo in initialization for older ActiveRecord versions
Expand All @@ -15,6 +19,13 @@
* BREAKING CHANGE: the ActiveRecord adapter has been pulled into Rails 3.1 and is no longer part of the gem
* added Mysql2::Client.escape (class-level) for raw one-off non-encoding-aware escaping

## 0.2.8 (June 14th, 2011)
* disable async support, and access to the underlying file descriptor under Windows. It's never worked reliably and ruby-core has a lot of work to do in order to make it possible.
* added support for turning eager-casting off. This is especially useful in ORMs that will lazily cast values upon access.
* added a warning if a 0.2.x release is being used with ActiveRecord 3.1 since both the 0.2.x releases and AR 3.1 have mysql2 adapters, we want you to use the one in AR 3.1
* added Mysql2::Client.escape (class-level method)
* disabled eager-casting in the bundled ActiveRecord adapter (for Rails 3.0 or less)

## 0.2.7 (March 28th, 2011)
* various fixes for em_mysql2 and fiber usage
* use our own Mysql2IndexDefinition class for better compatibility across ActiveRecord versions
Expand Down
3 changes: 2 additions & 1 deletion lib/mysql2/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ class Client
:database_timezone => :local, # timezone Mysql2 will assume datetime objects are stored in
:application_timezone => nil, # timezone Mysql2 will convert to before handing the object back to the caller
:cache_rows => true, # tells Mysql2 to use it's internal row cache for results
:connect_flags => REMEMBER_OPTIONS | LONG_PASSWORD | LONG_FLAG | TRANSACTIONS | PROTOCOL_41 | SECURE_CONNECTION
:connect_flags => REMEMBER_OPTIONS | LONG_PASSWORD | LONG_FLAG | TRANSACTIONS | PROTOCOL_41 | SECURE_CONNECTION,
:cast => true
}

def initialize(opts = {})
Expand Down
2 changes: 1 addition & 1 deletion lib/mysql2/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Mysql2
VERSION = "0.3.2"
VERSION = "0.3.3"
end

0 comments on commit 3510336

Please sign in to comment.