mysql2 0.2.18-x86-mingw32 → 0.3.9-x86-mingw32

data/CHANGELOG.md

@@ -1,17 +1,48 @@
 # Changelog
 
-## 0.2.18 (December 6th, 2011)
-* change mysql error detection strategy from using mysql_field_count to the more explicit mysql_errno
-* bugfix to avoid race condition with active connections that error out
-* revert back to using xmalloc/xfree for allocations
-* avoid potentially unsafe Ruby C API usage w/o GVL
-* reacquire GVL before retrying on EINTR on connect
+## 0.3.8 (November 9th, 2011)
+* remove fiber support from mysql2, the code has moved to the
+  em-synchrony gem.
+* use rb_wait_for_single_fd() if available
+* fixed a bug with inheriting query options
+* remove ext/ from the default loadpath
+* fix build issues on OSX with Xcode 4.2 (gcc-llvm compiler)
+
+## 0.3.7 (August 16th, 2011)
+* ensure symbolized column names support encodings in 1.9
+
+## 0.3.6 (June 17th, 2011)
+* fix bug in Time/DateTime range detection
+* (win32) fix bug where the Mysql2::Client object wasn't cleaned up properly if interrupted during a query
+* add Mysql2::Result#count (aliased as size) to get the row count for the dataset
+  this can be especially helpful if you want to get the number of rows without having to inflate
+  the entire dataset into ruby (since this happens lazily)
+
+## 0.3.5 (June 15th, 2011)
+* bug fix for Time/DateTime usage depending on 32/64bit Ruby
+
+## 0.3.4 (June 15th, 2011)
+* fix a long standing bug where a signal would interrupt rb_thread_select and put the connection in a permanently broken state
+* turn on casting in the ActiveRecord again, users can disable it if they need to for performance reasons
+
+## 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.2.17 (November 9th, 2011)
+## 0.3.2 (April 26th, 2011)
+* Fix typo in initialization for older ActiveRecord versions
 
-## 0.2.16 (November 9th, 2011)
+## 0.3.1 (April 26th, 2011)
+* Fix typo in initialization for older ActiveRecord versions
 
-## 0.2.15 (November 9th, 2011)
+## 0.3.0 (April 26th, 2011)
+* switch to MySQL Connector/C for win32 builds
+* win32 bugfixes
+* 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.14 (November 9th, 2011)
 * use rb_wait_for_single_fd() if available

data/README.md

@@ -6,7 +6,7 @@ This one is not.
 
 It also forces the use of UTF-8 [or binary] for the connection [and all strings in 1.9, unless Encoding.default_internal is set then it'll convert from UTF-8 to that encoding] and uses encoding-aware MySQL API calls where it can.
 
-The API consists of two clases:
+The API consists of two classes:
 
 Mysql2::Client - your connection to the database
 
@@ -214,7 +214,7 @@ This would be helpful if you wanted to iterate over the results in a streaming m
 
 ## ActiveRecord
 
-To use the ActiveRecord driver (with our without rails), all you should need to do is have this gem installed and set the adapter in your database.yml to "mysql2".
+To use the ActiveRecord driver (with or without rails), all you should need to do is have this gem installed and set the adapter in your database.yml to "mysql2".
 That was easy right? :)
 
 NOTE: as of 0.3.0, and ActiveRecord 3.1 - the ActiveRecord adapter has been pulled out of this gem and into ActiveRecord itself. If you need to use mysql2 with
@@ -222,8 +222,7 @@ Rails versions < 3.1 make sure and specify `gem "mysql2", "~> 0.2.7"` in your Ge
 
 ## Asynchronous ActiveRecord
 
-You can also use Mysql2 with asynchronous Rails (first introduced at http://www.mikeperham.com/2010/04/03/introducing-phat-an-asynchronous-rails-app/) by
-setting the adapter in your database.yml to "em_mysql2".  You must be running Ruby 1.9, thin and the rack-fiber_pool middleware for it to work.
+Please see the [em-synchrony](https://github.com/igrigorik/em-synchrony) project for details about using EventMachine with mysql2 and Rails.
 
 ## Sequel
 

data/ext/mysql2/client.c

@@ -46,8 +46,6 @@ struct nogvl_connect_args {
 struct nogvl_send_query_args {
   MYSQL *mysql;
   VALUE sql;
-  const char *sql_ptr;
-  long sql_len;
   mysql_client_wrapper *wrapper;
 };
 
@@ -114,10 +112,12 @@ static VALUE nogvl_connect(void *ptr) {
   struct nogvl_connect_args *args = ptr;
   MYSQL *client;
 
-  client = mysql_real_connect(args->mysql, args->host,
-                              args->user, args->passwd,
-                              args->db, args->port, args->unix_socket,
-                              args->client_flag);
+  do {
+    client = mysql_real_connect(args->mysql, args->host,
+                                args->user, args->passwd,
+                                args->db, args->port, args->unix_socket,
+                                args->client_flag);
+  } while (! client && errno == EINTR && (errno = 0) == 0);
 
   return client ? Qtrue : Qfalse;
 }
@@ -147,7 +147,7 @@ static VALUE nogvl_close(void *ptr) {
 #endif
 
     mysql_close(wrapper->client);
-    xfree(wrapper->client);
+    free(wrapper->client);
   }
 
   return Qnil;
@@ -158,7 +158,7 @@ static void rb_mysql_client_free(void * ptr) {
 
   nogvl_close(wrapper);
 
-  xfree(ptr);
+  free(ptr);
 }
 
 static VALUE allocate(VALUE klass) {
@@ -169,7 +169,7 @@ static VALUE allocate(VALUE klass) {
   wrapper->active = 0;
   wrapper->reconnect_enabled = 0;
   wrapper->closed = 1;
-  wrapper->client = (MYSQL*)xmalloc(sizeof(MYSQL));
+  wrapper->client = (MYSQL*)malloc(sizeof(MYSQL));
   return obj;
 }
 
@@ -181,26 +181,25 @@ static VALUE rb_mysql_client_escape(RB_MYSQL_UNUSED VALUE klass, VALUE str) {
   Check_Type(str, T_STRING);
 
   oldLen = RSTRING_LEN(str);
-  newStr = xmalloc(oldLen*2+1);
+  newStr = malloc(oldLen*2+1);
 
   newLen = mysql_escape_string((char *)newStr, StringValuePtr(str), oldLen);
   if (newLen == oldLen) {
     // no need to return a new ruby string if nothing changed
-    xfree(newStr);
+    free(newStr);
     return str;
   } else {
     rb_str = rb_str_new((const char*)newStr, newLen);
 #ifdef HAVE_RUBY_ENCODING_H
     rb_enc_copy(rb_str, str);
 #endif
-    xfree(newStr);
+    free(newStr);
     return rb_str;
   }
 }
 
 static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags) {
   struct nogvl_connect_args args;
-  VALUE rv;
   GET_CLIENT(self);
 
   args.host = NIL_P(host) ? "localhost" : StringValuePtr(host);
@@ -212,14 +211,9 @@ static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE po
   args.mysql = wrapper->client;
   args.client_flag = NUM2ULONG(flags);
 
-  rv = rb_thread_blocking_region(nogvl_connect, &args, RUBY_UBF_IO, 0);
-  if (rv == Qfalse) {
-    while (rv == Qfalse && errno == EINTR) {
-      errno = 0;
-      rv = rb_thread_blocking_region(nogvl_connect, &args, RUBY_UBF_IO, 0);
-    }
-    if (rv == Qfalse)
-      return rb_raise_mysql2_error(wrapper);
+  if (rb_thread_blocking_region(nogvl_connect, &args, RUBY_UBF_IO, 0) == Qfalse) {
+    // unable to connect
+    return rb_raise_mysql2_error(wrapper);
   }
 
   return self;
@@ -249,8 +243,10 @@ static VALUE rb_mysql_client_close(VALUE self) {
 static VALUE nogvl_send_query(void *ptr) {
   struct nogvl_send_query_args *args = ptr;
   int rv;
+  const char *sql = StringValuePtr(args->sql);
+  long sql_len = RSTRING_LEN(args->sql);
 
-  rv = mysql_send_query(args->mysql, args->sql_ptr, args->sql_len);
+  rv = mysql_send_query(args->mysql, sql, sql_len);
 
   return rv == 0 ? Qtrue : Qfalse;
 }
@@ -315,11 +311,9 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
   result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
 
   if (result == NULL) {
-    if (mysql_errno(wrapper->client) != 0) {
-      MARK_CONN_INACTIVE(self);
+    if (mysql_field_count(wrapper->client) != 0) {
       rb_raise_mysql2_error(wrapper);
     }
-    // no data and no error, so query was not a SELECT
     return Qnil;
   }
 
@@ -456,8 +450,6 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   // ensure the string is in the encoding the connection is expecting
   args.sql = rb_str_export_to_enc(args.sql, conn_enc);
 #endif
-  args.sql_ptr = StringValuePtr(args.sql);
-  args.sql_len = RSTRING_LEN(args.sql);
 
   // see if this connection is still waiting on a result from a previous query
   if (wrapper->active == 0) {
@@ -510,12 +502,12 @@ static VALUE rb_mysql_client_real_escape(VALUE self, VALUE str) {
 #endif
 
   oldLen = RSTRING_LEN(str);
-  newStr = xmalloc(oldLen*2+1);
+  newStr = malloc(oldLen*2+1);
 
   newLen = mysql_real_escape_string(wrapper->client, (char *)newStr, StringValuePtr(str), oldLen);
   if (newLen == oldLen) {
     // no need to return a new ruby string if nothing changed
-    xfree(newStr);
+    free(newStr);
     return str;
   } else {
     rb_str = rb_str_new((const char*)newStr, newLen);
@@ -525,7 +517,7 @@ static VALUE rb_mysql_client_real_escape(VALUE self, VALUE str) {
       rb_str = rb_str_export_to_enc(rb_str, default_internal_enc);
     }
 #endif
-    xfree(newStr);
+    free(newStr);
     return rb_str;
   }
 }

data/ext/mysql2/result.c

@@ -80,7 +80,7 @@ static void rb_mysql_result_free(void * wrapper) {
   mysql2_result_wrapper * w = wrapper;
   /* FIXME: this may call flush_use_result, which can hit the socket */
   rb_mysql_result_free_result(w);
-  xfree(wrapper);
+  free(wrapper);
 }
 
 /*

data/lib/mysql2.rb

@@ -15,7 +15,7 @@ require 'mysql2/client'
 module Mysql2
 end
 
-if defined?(ActiveRecord::VERSION::STRING) && ActiveRecord::VERSION::STRING >= "3.1"
-  puts "WARNING: This version of mysql2 (#{Mysql2::VERSION}) isn't compatible with Rails 3.1 as the ActiveRecord adapter was pulled into Rails itself."
-  puts "WARNING: Please use the 0.3.x (or greater) releases if you plan on using it in Rails >= 3.1.x"
-end
+if defined?(ActiveRecord::VERSION::STRING) && ActiveRecord::VERSION::STRING < "3.1"
+  puts "WARNING: This version of mysql2 (#{Mysql2::VERSION}) doesn't ship with the ActiveRecord adapter bundled anymore as it's now part of Rails 3.1"
+  puts "WARNING: Please use the 0.2.x releases if you plan on using it in Rails <= 3.0.x"
+end

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.2.18"
+  VERSION = "0.3.9"
 end

data/spec/em/em_spec.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
-if defined? EventMachine
-  require 'spec_helper'
+require 'spec_helper'
+begin
+  require 'eventmachine'
   require 'mysql2/em'
 
   describe Mysql2::EM::Client do
@@ -44,6 +45,6 @@ if defined? EventMachine
       results[1].keys.should include("second_query")
     end
   end
-else
+rescue LoadError
   puts "EventMachine not installed, skipping the specs that use it"
-end
+end

metadata

@@ -1,172 +1,121 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mysql2
-version: !ruby/object:Gem::Version 
-  hash: 51
+version: !ruby/object:Gem::Version
+  version: 0.3.9
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 18
-  segments_generated: true
-  version: 0.2.18
 platform: x86-mingw32
-authors: 
+authors:
 - Brian Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-06 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70366941834500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70366941834500
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70366941832980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 7
-        - 7
-        segments_generated: true
+      - !ruby/object:Gem::Version
         version: 0.7.7
-  prerelease: false
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70366941832980
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70366941831480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        segments_generated: true
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.8.7
-  prerelease: false
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70366941831480
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70366941830420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70366941830420
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70366941829400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70366941829400
+- !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70366941828800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70366941828800
+- !ruby/object:Gem::Dependency
   name: do_mysql
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70366941828320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70366941828320
+- !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70366941827760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70366941827760
+- !ruby/object:Gem::Dependency
   name: faker
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70366941827060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *70366941827060
 description: 
 email: seniorlopez@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -195,19 +144,13 @@ files:
 - ext/mysql2/result.c
 - ext/mysql2/result.h
 - ext/mysql2/wait_for_single_fd.h
-- lib/active_record/connection_adapters/em_mysql2_adapter.rb
-- lib/active_record/connection_adapters/mysql2_adapter.rb
-- lib/active_record/fiber_patches.rb
-- lib/arel/engines/sql/compilers/mysql2_compiler.rb
 - lib/mysql2.rb
 - lib/mysql2/client.rb
 - lib/mysql2/em.rb
-- lib/mysql2/em_fiber.rb
 - lib/mysql2/error.rb
 - lib/mysql2/result.rb
 - lib/mysql2/version.rb
 - mysql2.gemspec
-- spec/em/em_fiber_spec.rb
 - spec/em/em_spec.rb
 - spec/mysql2/client_spec.rb
 - spec/mysql2/error_spec.rb
@@ -221,62 +164,45 @@ files:
 - lib/mysql2/1.8/mysql2.so
 - lib/mysql2/1.9/mysql2.so
 - lib/mysql2/mysql2.rb
-has_rdoc: true
 homepage: http://github.com/brianmario/mysql2
 licenses: []
-
-post_install_message: |+
-  
-  ======================================================================================================
-  
-    You've installed the binary version of mysql2.
-    It was built using MySQL Connector/C version 6.0.2.
-    It's recommended to use the exact same version to avoid potential issues.
-  
-    At the time of building this gem, the necessary DLL files where available
-    in the following download:
-  
-    http://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.2-win32.zip/from/pick
-  
-    And put lib\libmysql.dll file in your Ruby bin directory, for example C:\Ruby\bin
-  
-  ======================================================================================================
-  
-rdoc_options: 
+post_install_message: ! "\n======================================================================================================\n\n
+  \ You've installed the binary version of mysql2.\n  It was built using MySQL Connector/C
+  version 6.0.2.\n  It's recommended to use the exact same version to avoid potential
+  issues.\n\n  At the time of building this gem, the necessary DLL files where available\n
+  \ in the following download:\n\n  http://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.2-win32.zip/from/pick\n\n
+  \ And put lib\\libmysql.dll file in your Ruby bin directory, for example C:\\Ruby\\bin\n\n======================================================================================================\n\n"
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4509010119636737419
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
+      hash: 4509010119636737419
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A simple, fast Mysql library for Ruby, binding to libmysql
-test_files: 
+test_files:
 - examples/eventmachine.rb
 - examples/threaded.rb
-- spec/em/em_fiber_spec.rb
 - spec/em/em_spec.rb
 - spec/mysql2/client_spec.rb
 - spec/mysql2/error_spec.rb