mysql2 0.2.6 → 0.2.7

data/ext/mysql2/client.h

@@ -33,8 +33,8 @@ void init_mysql2_client();
 
 typedef struct {
   VALUE encoding;
-  short int active;
-  short int closed;
+  char active;
+  char closed;
   MYSQL *client;
 } mysql_client_wrapper;
 

data/ext/mysql2/extconf.rb

@@ -31,7 +31,10 @@ elsif mc = (with_config('mysql-config') || Dir[GLOB].first) then
   mc = Dir[GLOB].first if mc == true
   cflags = `#{mc} --cflags`.chomp
   exit 1 if $? != 0
-  libs = `#{mc} --libs`.chomp
+  libs = `#{mc} --libs_r`.chomp
+  if libs.empty?
+    libs = `#{mc} --libs`.chomp
+  end
   exit 1 if $? != 0
   $CPPFLAGS += ' ' + cflags
   $libs = libs + " " + $libs
@@ -62,4 +65,8 @@ unless RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /sparc/
 end
 # $CFLAGS << ' -O0 -ggdb3 -Wextra'
 
+if hard_mysql_path = $libs[%r{-L(/[^ ]+)}, 1]
+	$LDFLAGS << " -Wl,-rpath,#{hard_mysql_path}"
+end
+
 create_makefile('mysql2/mysql2')

data/ext/mysql2/mysql2_ext.h

@@ -1,9 +1,19 @@
 #ifndef MYSQL2_EXT
 #define MYSQL2_EXT
 
+// tell rbx not to use it's caching compat layer
+// by doing this we're making a promize to RBX that
+// we'll never modify the pointers we get back from RSTRING_PTR
+#define RSTRING_NOT_MODIFIED
 #include <ruby.h>
 #include <fcntl.h>
 
+#ifndef HAVE_UINT
+#define HAVE_UINT
+typedef unsigned short    ushort;
+typedef unsigned int    uint;
+#endif
+
 #ifdef HAVE_MYSQL_H
 #include <mysql.h>
 #include <mysql_com.h>

data/ext/mysql2/result.c

@@ -1,17 +1,27 @@
 #include <mysql2_ext.h>
 
 #ifdef HAVE_RUBY_ENCODING_H
-rb_encoding *binaryEncoding;
+static rb_encoding *binaryEncoding;
 #endif
 
-VALUE cMysql2Result;
-VALUE cBigDecimal, cDate, cDateTime;
-VALUE opt_decimal_zero, opt_float_zero, opt_time_year, opt_time_month, opt_utc_offset;
+#define MYSQL2_MAX_YEAR 2058
+
+#ifdef NEGATIVE_TIME_T
+  /* 1901-12-13 20:45:52 UTC : The oldest time in 32-bit signed time_t. */
+#define MYSQL2_MIN_YEAR 1902
+#else
+ /* 1970-01-01 00:00:00 UTC : The Unix epoch - the oldest time in portable time_t. */
+#define MYSQL2_MIN_YEAR 1970
+#endif
+
+static VALUE cMysql2Result;
+static VALUE cBigDecimal, cDate, cDateTime;
+static VALUE opt_decimal_zero, opt_float_zero, opt_time_year, opt_time_month, opt_utc_offset;
 extern VALUE mMysql2, cMysql2Client, cMysql2Error;
 static VALUE intern_encoding_from_charset;
 static ID intern_new, intern_utc, intern_local, intern_encoding_from_charset_code,
           intern_localtime, intern_local_offset, intern_civil, intern_new_offset;
-static ID sym_symbolize_keys, sym_as, sym_array, sym_database_timezone, sym_application_timezone,
+static VALUE sym_symbolize_keys, sym_as, sym_array, sym_database_timezone, sym_application_timezone,
           sym_local, sym_utc, sym_cast_booleans, sym_cache_rows;
 static ID intern_merge;
 
@@ -53,7 +63,7 @@ static VALUE nogvl_fetch_row(void *ptr) {
 
 static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int symbolize_keys) {
   mysql2_result_wrapper * wrapper;
-
+  VALUE rb_field;
   GetMysql2Result(self, wrapper);
 
   if (wrapper->fields == Qnil) {
@@ -61,7 +71,7 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
     wrapper->fields = rb_ary_new2(wrapper->numberOfFields);
   }
 
-  VALUE rb_field = rb_ary_entry(wrapper->fields, idx);
+  rb_field = rb_ary_entry(wrapper->fields, idx);
   if (rb_field == Qnil) {
     MYSQL_FIELD *field = NULL;
 #ifdef HAVE_RUBY_ENCODING_H
@@ -98,12 +108,15 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
   unsigned int i = 0;
   unsigned long * fieldLengths;
   void * ptr;
-
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_encoding *default_internal_enc;
+  rb_encoding *conn_enc;
+#endif
   GetMysql2Result(self, wrapper);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc = rb_default_internal_encoding();
-  rb_encoding *conn_enc = rb_to_encoding(wrapper->encoding);
+  default_internal_enc = rb_default_internal_encoding();
+  conn_enc = rb_to_encoding(wrapper->encoding);
 #endif
 
   ptr = wrapper->result;
@@ -190,7 +203,7 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
               rb_raise(cMysql2Error, "Invalid date: %s", row[i]);
               val = Qnil;
             } else {
-              if (year < 1902 || year+month+day > 2058) { // use DateTime instead
+              if (year < MYSQL2_MIN_YEAR || year+month+day > MYSQL2_MAX_YEAR) { // use DateTime instead
                 VALUE offset = INT2NUM(0);
                 if (db_timezone == intern_local) {
                   offset = rb_funcall(cMysql2Client, intern_local_offset, 0);
@@ -248,7 +261,7 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
           val = rb_str_new(row[i], fieldLengths[i]);
 #ifdef HAVE_RUBY_ENCODING_H
           // if binary flag is set, respect it's wishes
-          if (fields[i].flags & BINARY_FLAG) {
+          if (fields[i].flags & BINARY_FLAG && fields[i].charsetnr == 63) {
             rb_enc_associate(val, binaryEncoding);
           } else {
             // lookup the encoding configured on this field

data/ext/mysql2/result.h

@@ -8,10 +8,10 @@ typedef struct {
   VALUE fields;
   VALUE rows;
   VALUE encoding;
-  long numberOfFields;
+  unsigned int numberOfFields;
   unsigned long numberOfRows;
   unsigned long lastRowProcessed;
-  short int resultFreed;
+  char resultFreed;
   MYSQL_RES *result;
 } mysql2_result_wrapper;
 

data/lib/active_record/connection_adapters/em_mysql2_adapter.rb

@@ -15,8 +15,8 @@ module ActiveRecord
 end
 
 require 'fiber'
-require 'eventmachine' unless defined? EventMachine
-require 'mysql2' unless defined? Mysql2
+require 'eventmachine'
+require 'mysql2'
 require 'active_record/connection_adapters/mysql2_adapter'
 require 'active_record/fiber_patches'
 
@@ -35,25 +35,26 @@ module Mysql2
             results = @client.async_result
             @deferable.succeed(results)
           rescue Exception => e
-            puts e.backtrace.join("\n\t")
             @deferable.fail(e)
           end
         end
       end
 
       def query(sql, opts={})
-        if EM.reactor_running?
+        if ::EM.reactor_running?
           super(sql, opts.merge(:async => true))
-          deferable = ::EM::DefaultDeferrable.new
-          ::EM.watch(self.socket, Watcher, self, deferable).notify_readable = true
+          deferrable = ::EM::DefaultDeferrable.new
+          ::EM.watch(self.socket, Watcher, self, deferrable).notify_readable = true
           fiber = Fiber.current
-          deferable.callback do |result|
+          deferrable.callback do |result|
             fiber.resume(result)
           end
-          deferable.errback do |err|
+          deferrable.errback do |err|
             fiber.resume(err)
           end
-          Fiber.yield
+          Fiber.yield.tap do |result|
+            raise result if result.is_a?(Exception)
+          end
         else
           super(sql, opts)
         end

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'mysql2' unless defined? Mysql2
+require 'mysql2'
 
 module ActiveRecord
   class Base
@@ -18,6 +18,9 @@ module ActiveRecord
   end
 
   module ConnectionAdapters
+    class Mysql2IndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths) #:nodoc:
+    end
+
     class Mysql2Column < Column
       BOOL = "tinyint(1)"
       def extract_default(default)
@@ -239,10 +242,7 @@ module ActiveRecord
 
       def active?
         return false unless @connection
-        @connection.query 'select 1'
-        true
-      rescue Mysql2::Error
-        false
+        @connection.ping
       end
 
       def reconnect!
@@ -447,7 +447,7 @@ module ActiveRecord
           if current_index != row[:Key_name]
             next if row[:Key_name] == PRIMARY # skip the primary key
             current_index = row[:Key_name]
-            indexes << IndexDefinition.new(row[:Table], row[:Key_name], row[:Non_unique] == 0, [], [])
+            indexes << Mysql2IndexDefinition.new(row[:Table], row[:Key_name], row[:Non_unique] == 0, [], [])
           end
 
           indexes.last.columns << row[:Column_name]
@@ -623,7 +623,7 @@ module ActiveRecord
 
           # increase timeout so mysql server doesn't disconnect us
           wait_timeout = @config[:wait_timeout]
-          wait_timeout = 2592000 unless wait_timeout.is_a?(Fixnum)
+          wait_timeout = 2147483 unless wait_timeout.is_a?(Fixnum)
           variable_assignments << "@@wait_timeout = #{wait_timeout}"
 
           execute("SET #{variable_assignments.join(', ')}", :skip_logging)

data/lib/active_record/fiber_patches.rb

@@ -24,7 +24,7 @@ module ActiveRecord
             fiber.resume(false)
           end
           @queue << fiber
-          returning Fiber.yield do
+          Fiber.yield.tap do
             x.cancel
           end
         end
@@ -69,14 +69,8 @@ module ActiveRecord
         @checked_out = []
       end
 
-      private
-
-      def current_connection_id #:nodoc:
-        Fiber.current.object_id
-      end
-
-      # Remove stale fibers from the cache.
-      def remove_stale_cached_threads!(cache, &block)
+      def clear_stale_cached_connections!
+        cache = @reserved_connections
         keys = Set.new(cache.keys)
 
         ActiveRecord::ConnectionAdapters.fiber_pools.each do |pool|
@@ -87,11 +81,17 @@ module ActiveRecord
 
         keys.each do |key|
           next unless cache.has_key?(key)
-          block.call(key, cache[key])
+          checkin cache[key]
           cache.delete(key)
         end
       end
 
+      private
+
+      def current_connection_id #:nodoc:
+        Fiber.current.object_id
+      end
+
       def checkout_and_verify(c)
         @checked_out << c
         c.run_callbacks :checkout

data/lib/mysql2.rb

@@ -3,6 +3,7 @@ require 'date'
 require 'bigdecimal'
 require 'rational' unless RUBY_VERSION >= '1.9.2'
 
+require 'mysql2/version' unless defined? Mysql2::VERSION
 require 'mysql2/error'
 require 'mysql2/mysql2'
 require 'mysql2/client'
@@ -12,5 +13,4 @@ require 'mysql2/result'
 #
 # A modern, simple and very fast Mysql library for Ruby - binding to libmysql
 module Mysql2
-  VERSION = "0.2.6"
 end

data/lib/mysql2/client.rb

@@ -24,6 +24,11 @@ module Mysql2
       # force the encoding to utf8
       self.charset_name = opts[:encoding] || 'utf8'
 
+      @read_timeout = opts[:read_timeout]
+      if @read_timeout and @read_timeout < 0
+        raise Mysql2::Error, "read_timeout must be a positive integer, you passed #{@read_timeout}"
+      end
+
       ssl_set(*opts.values_at(:sslkey, :sslcert, :sslca, :sslcapath, :sslciper))
 
       user     = opts[:username]

data/lib/mysql2/em.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-require 'eventmachine' unless defined? EventMachine
-require 'mysql2' unless defined? Mysql2
+require 'eventmachine'
+require 'mysql2'
 
 module Mysql2
   module EM
@@ -23,10 +23,14 @@ module Mysql2
       end
 
       def query(sql, opts={})
-        super(sql, opts.merge(:async => true))
-        deferable = ::EM::DefaultDeferrable.new
-        ::EM.watch(self.socket, Watcher, self, deferable).notify_readable = true
-        deferable
+        if ::EM.reactor_running?
+          super(sql, opts.merge(:async => true))
+          deferable = ::EM::DefaultDeferrable.new
+          ::EM.watch(self.socket, Watcher, self, deferable).notify_readable = true
+          deferable
+        else
+          super(sql, opts)
+        end
       end
     end
   end

data/lib/mysql2/em_fiber.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+require 'mysql2/em'
+require 'fiber'
+
+module Mysql2
+  module EM
+    module Fiber
+      class Client < ::Mysql2::EM::Client
+        def query(sql, opts={})
+          if ::EM.reactor_running?
+            deferable = super(sql, opts)
+
+            fiber = ::Fiber.current
+            deferable.callback do |result|
+              fiber.resume(result)
+            end
+            deferable.errback do |err|
+              fiber.resume(err)
+            end
+            ::Fiber.yield.tap do |result|
+              raise result if result.is_a?(::Exception)
+            end
+          else
+            super(sql, opts)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mysql2/version.rb

@@ -0,0 +1,3 @@
+module Mysql2
+  VERSION = "0.2.7"
+end

data/mysql2.gemspec

@@ -1,89 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/mysql2/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{mysql2}
-  s.version = "0.2.6"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = Mysql2::VERSION
   s.authors = ["Brian Lopez"]
-  s.date = %q{2010-10-19}
+  s.date = Time.now.utc.strftime("%Y-%m-%d")
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/mysql2/extconf.rb"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
-  s.files = [
-    ".gitignore",
-     ".rspec",
-     "CHANGELOG.md",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "benchmark/active_record.rb",
-     "benchmark/allocations.rb",
-     "benchmark/escape.rb",
-     "benchmark/query_with_mysql_casting.rb",
-     "benchmark/query_without_mysql_casting.rb",
-     "benchmark/sequel.rb",
-     "benchmark/setup_db.rb",
-     "examples/eventmachine.rb",
-     "examples/threaded.rb",
-     "ext/mysql2/client.c",
-     "ext/mysql2/client.h",
-     "ext/mysql2/extconf.rb",
-     "ext/mysql2/mysql2_ext.c",
-     "ext/mysql2/mysql2_ext.h",
-     "ext/mysql2/result.c",
-     "ext/mysql2/result.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/error.rb",
-     "lib/mysql2/result.rb",
-     "mysql2.gemspec",
-     "spec/em/em_spec.rb",
-     "spec/mysql2/client_spec.rb",
-     "spec/mysql2/error_spec.rb",
-     "spec/mysql2/result_spec.rb",
-     "spec/rcov.opts",
-     "spec/spec_helper.rb",
-     "tasks/benchmarks.rake",
-     "tasks/compile.rake",
-     "tasks/jeweler.rake",
-     "tasks/rspec.rake",
-     "tasks/vendor_mysql.rake"
-  ]
+  s.files = `git ls-files`.split("\n")
   s.homepage = %q{http://github.com/brianmario/mysql2}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib", "ext"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{A simple, fast Mysql library for Ruby, binding to libmysql}
-  s.test_files = [
-    "spec/em/em_spec.rb",
-     "spec/mysql2/client_spec.rb",
-     "spec/mysql2/error_spec.rb",
-     "spec/mysql2/result_spec.rb",
-     "spec/spec_helper.rb",
-     "examples/eventmachine.rb",
-     "examples/threaded.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.test_files = `git ls-files spec examples`.split("\n")
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  # tests
+  s.add_development_dependency 'eventmachine'
+  s.add_development_dependency 'rake-compiler', "~> 0.7.1"
+  s.add_development_dependency 'rspec'
+  # benchmarks
+  s.add_development_dependency 'activerecord'
+  s.add_development_dependency 'mysql'
+  s.add_development_dependency 'do_mysql'
+  s.add_development_dependency 'sequel'
+  s.add_development_dependency 'faker'
 end