mysql 2.8.1 → 2.9.1

data/History.txt

@@ -1,3 +1,29 @@
+=== 2.9.1 / 2013-02-16 / Vacation time!
+
+* Bugfixes:
+  * Use C89 comment style in source code. #13 [knu]
+  * Use ULL2NUM to return `affected_rows`. #11, #12 [cbandy]
+
+=== 2.9.0 / 2012-11-17
+
+DEPRECATION: Ruby 1.8.6 is no longer supported. Do not update your production
+application blindly without testing first any dependency change!
+
+* Incompatibility:
+  * Requires Ruby 1.8.7 or newer.
+
+* Enhancements:
+  * Detect MySQL version at load time and fail on mismatch [ghazel]
+  * Use MySQL Connector/C for Windows binary bindings instead
+
+* Bug fixes:
+  * Use RbConfig since Config is deprecated in Ruby 2.0 [tenderlove]
+
+=== 2.8.2 / 2012-11-06 / *yanked*
+
+* Yanked:
+  * Changes in requirements render this gem incompatible for some users.
+
 === 2.8.1 / 2009-08-21
 
 * New features:

data/Manifest.txt

@@ -10,6 +10,7 @@ extra/README.html
 extra/README_ja.html
 extra/tommy.css
 lib/mysql.rb
+lib/mysql/version.rb
 tasks/gem.rake
 tasks/native.rake
 tasks/vendor_mysql.rake

data/README.txt

@@ -1,17 +1,19 @@
 = MySQL/Ruby Interface
 
-* http://mysql-win.rubyforge.org
-* http://rubyforge.org/projects/mysql-win
-* http://github.com/luislaven/mysql-gem
+* http://github.com/luislavena/mysql-gem
 
 == DESCRIPTION
 
 This is the MySQL API module for Ruby. It provides the same functions for Ruby
 programs that the MySQL C API provides for C programs.
 
-This is a conversion of tmtm's original extension into a proper RubyGems.
+This package is offered as gem for easy installation using RubyGems. It wraps
+unmodified tmtm's mysql-ruby extension into a proper gem.
 
-=== Warning about incompatible MySQL versions
+Please note that tmtm (Tomita Mashahiro) has deprecated development of this
+extension and only update it for bug fixes.
+
+=== Warning about incompatible MySQL versions under Windows
 
 Mixing MySQL versions will generate segmentation faults.
 

data/ext/mysql_api/extconf.rb

@@ -1,11 +1,6 @@
 # Darwin (OSX) special cases for universal binaries
 # This is to avoid the lack of UB binaries for MySQL
-if RUBY_PLATFORM =~ /darwin/
-  ENV["RC_ARCHS"] = `uname -m`.chomp if `uname -sr` =~ /^Darwin/
- 
-  # On PowerPC the defaults are fine
-  ENV["RC_ARCHS"] = '' if `uname -m` =~ /^Power Macintosh/
-end
+ENV["RC_ARCHS"] = "" if RUBY_PLATFORM =~ /darwin/
 
 require 'mkmf'
 
@@ -64,9 +59,9 @@ File.open("conftest.c", "w") do |f|
   f.puts src
 end
 if defined? cpp_command then
-  cpp = Config.expand(cpp_command(''))
+  cpp = RbConfig.expand(cpp_command(''))
 else
-  cpp = Config.expand sprintf(CPP, $CPPFLAGS, $CFLAGS, '')
+  cpp = RbConfig.expand sprintf(CPP, $CPPFLAGS, $CFLAGS, '')
 end
 if RUBY_PLATFORM =~ /mswin/ && !/-E/.match(cpp)
   cpp << " -E"
@@ -95,4 +90,4 @@ File.open('error_const.h', 'w') do |f|
   end
 end
 
-create_makefile("mysql_api")
+create_makefile("mysql/mysql_api")

data/ext/mysql_api/mysql.c

@@ -1,5 +1,5 @@
 /*	ruby mysql module
- *	$Id: mysql.c 244 2009-02-01 08:43:39Z tommy $
+ *	$Id: mysql.c 250 2010-02-11 10:42:54Z tommy $
  */
 
 #include <ruby.h>
@@ -26,7 +26,7 @@
 #include <mysql/mysqld_error.h>
 #endif
 
-#define MYSQL_RUBY_VERSION 20801
+#define MYSQL_RUBY_VERSION 20802
 
 #define GC_STORE_RESULT_LIMIT 20
 
@@ -445,7 +445,7 @@ static VALUE initialize(int argc, VALUE* argv, VALUE obj)
 /*	affected_rows()	*/
 static VALUE affected_rows(VALUE obj)
 {
-    return INT2NUM(mysql_affected_rows(GetHandler(obj)));
+    return ULL2NUM(mysql_affected_rows(GetHandler(obj)));
 }
 
 #if MYSQL_VERSION_ID >= 32303
@@ -559,7 +559,7 @@ static VALUE info(VALUE obj)
 /*	insert_id()	*/
 static VALUE insert_id(VALUE obj)
 {
-    return INT2NUM(mysql_insert_id(GetHandler(obj)));
+    return ULL2NUM(mysql_insert_id(GetHandler(obj)));
 }
 
 /*	kill(pid)	*/
@@ -1268,7 +1268,7 @@ static VALUE stmt_affected_rows(VALUE obj)
     my_ulonglong n;
     check_stmt_closed(obj);
     n = mysql_stmt_affected_rows(s->stmt);
-    return INT2NUM(n);
+    return ULL2NUM(n);
 }
 
 #if 0
@@ -1621,7 +1621,7 @@ static VALUE stmt_insert_id(VALUE obj)
     my_ulonglong n;
     check_stmt_closed(obj);
     n = mysql_stmt_insert_id(s->stmt);
-    return INT2NUM(n);
+    return ULL2NUM(n);
 }
 
 /*	num_rows()	*/
@@ -1884,6 +1884,21 @@ static VALUE error_sqlstate(VALUE obj)
 
 void Init_mysql_api(void)
 {
+    int i;
+    int dots = 0;
+    const char *lib = mysql_get_client_info();
+    for (i = 0; lib[i] != 0 && MYSQL_SERVER_VERSION[i] != 0; i++) {
+        if (lib[i] == '.') {
+            dots++;
+            /* we only compare MAJOR and MINOR */
+            if (dots == 2) break;
+        }
+        if (lib[i] != MYSQL_SERVER_VERSION[i]) {
+            rb_raise(rb_eRuntimeError, "Incorrect MySQL client library version! This gem was compiled for %s but the client library is %s.", MYSQL_SERVER_VERSION, lib);
+            return;
+        }
+    }
+
     cMysql = rb_define_class("Mysql", rb_cObject);
     cMysqlRes = rb_define_class_under(cMysql, "Result", rb_cObject);
     cMysqlField = rb_define_class_under(cMysql, "Field", rb_cObject);

data/extra/README.html

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- $Id: README.html 244 2009-02-01 08:43:39Z tommy $ -->
+<!-- $Id: README.html 250 2010-02-11 10:42:54Z tommy $ -->
 <html>
   <head>
     <meta http-equiv="content-style-type" content="text/css">
@@ -18,7 +18,10 @@
     </p>
 
     <h2>Download</h2>
-    <a href="http://tmtm.org/downloads/mysql/ruby/">tmtm.org</a>
+    <ul>
+      <li><a href="http://rubyforge.org/frs/?group_id=4550">RubyForge</a>
+      <li><a href="http://tmtm.org/downloads/mysql/ruby/">tmtm.org</a>
+    </ul>
 
     <h2>Requirement</h2>
     <ul>
@@ -818,6 +821,13 @@ st.close
 
     <h2>History</h2>
     <dl>
+      <dt>2010-02-11</dt>
+      <dd>
+        version 2.8.2<br>
+        <ul>
+          <li>Fix: Mysql#insert_id returns invalid value when larger than 2**32.
+        </ul>
+
       <dt>2009-02-01
       <dd>
         version 2.8.1<br>
@@ -1092,7 +1102,7 @@ st.close
     <address><a href="mailto:tommy@tmtm.org">TOMITA Masahiro</a></address>
 <!-- Created: Sun Aug 29 11:52:09 JST 2004 -->
 <!-- hhmts start -->
-Last modified: Sun Feb  1 17:40:49 JST 2009
+Last modified: Sun Feb  1 17:48:41 JST 2009
 <!-- hhmts end -->
   </body>
 </html>

data/extra/README_ja.html

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- $Id: README_ja.html 244 2009-02-01 08:43:39Z tommy $ -->
+<!-- $Id: README_ja.html 250 2010-02-11 10:42:54Z tommy $ -->
 <html>
   <head>
     <meta http-equiv="content-style-type" content="text/css">
@@ -17,7 +17,10 @@
     </p>
 
     <h2>�����������</h2>
-    <a href="http://tmtm.org/downloads/mysql/ruby/">tmtm.org</a>
+    <ul>
+      <li><a href="http://rubyforge.org/frs/?group_id=4550">RubyForge</a>
+      <li><a href="http://tmtm.org/downloads/mysql/ruby/">tmtm.org</a>
+    </ul>
 
     <h2>ɬ�פʤ��</h2>
     <ul>
@@ -899,6 +902,13 @@ st.close
 
     <h2>����</h2>
     <dl>
+      <dt>2010-02-11</dt>
+      <dd>
+        version 2.8.2<br>
+        <ul>
+          <li>Fix: Mysql#insert_id �� 2**32 �ʾ�λ����������ͤ��֤���
+        </ul>
+
       <dt>2009-02-01
       <dd>
         version 2.8.1<br>
@@ -1317,7 +1327,7 @@ st.close
     <address><a href="mailto:tommy@tmtm.org">TOMITA Masahiro</a></address>
 <!-- Created: Sun Aug 29 11:52:09 JST 2004 -->
 <!-- hhmts start -->
-Last modified: Sun Feb  1 17:41:18 JST 2009
+Last modified: Sun Feb  1 17:48:26 JST 2009
 <!-- hhmts end -->
   </body>
 </html>

data/lib/mysql.rb

@@ -1,16 +1,9 @@
 # support multiple ruby version (fat binaries under windows)
 begin
-  require 'mysql_api'
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "mysql/#{$1}/mysql_api"
 rescue LoadError
-  if RUBY_PLATFORM =~ /mingw|mswin/ then
-    RUBY_VERSION =~ /(\d+.\d+)/
-    require "#{$1}/mysql_api"
-  end
+  require 'mysql/mysql_api'
 end
 
-# define version string to be used internally for the Gem by Hoe.
-class Mysql
-  module GemVersion
-    VERSION = '2.8.1'
-  end
-end
+require 'mysql/version'

data/lib/mysql/version.rb

@@ -0,0 +1,6 @@
+# define version string to be used internally for the Gem by Hoe.
+class Mysql
+  module GemVersion
+    VERSION = '2.9.1'
+  end
+end

data/tasks/gem.rake

@@ -8,11 +8,11 @@ HOE = Hoe.spec 'mysql' do
   self.need_tar       = false
   self.need_zip       = false
 
-  spec_extras[:required_ruby_version] = Gem::Requirement.new('>= 1.8.6')
+  spec_extras[:required_ruby_version] = Gem::Requirement.new('>= 1.8.7')
 
   spec_extras[:extensions] = ["ext/mysql_api/extconf.rb"]
 
-  extra_dev_deps << ['rake-compiler', "~> 0.5"]
+  extra_dev_deps << ['rake-compiler', "~> 0.8.1"]
 end
 
 file "#{HOE.spec.name}.gemspec" => ['Rakefile', 'tasks/gem.rake'] do |t|

data/tasks/native.rake

@@ -1,28 +1,50 @@
 # use rake-compiler for building the extension
 require 'rake/extensiontask'
 
-MYSQL_VERSION = "5.0.83"
-MYSQL_MIRROR  = ENV['MYSQL_MIRROR'] || "http://mysql.localhost.net.ar"
+CONNECTOR_VERSION = "6.0.2"
+CONNECTOR_MIRROR  = ENV['CONNECTOR_MIRROR'] || "http://mysql.localhost.net.ar"
 
 Rake::ExtensionTask.new('mysql_api', HOE.spec) do |ext|
   # reference where the vendored MySQL got extracted
-  mysql_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', "mysql-#{MYSQL_VERSION}-win32"))
+  mysql_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', "mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32"))
+
+  # where native extension will be copied (matches makefile)
+  ext.lib_dir = "lib/mysql"
 
   # define target for extension (supporting fat binaries)
-  if RUBY_PLATFORM =~ /mingw/ then
+  if RUBY_PLATFORM =~ /mswin|mingw/ then
     ruby_ver = RUBY_VERSION.match(/(\d+\.\d+)/)[1]
-    ext.lib_dir = "lib/#{ruby_ver}"
+    ext.lib_dir = "lib/mysql/#{ruby_ver}"
   end
 
   # automatically add build options to avoid need of manual input
   if RUBY_PLATFORM =~ /mswin|mingw/ then
-    ext.config_options << "--with-mysql-include=#{mysql_lib}/include"
-    ext.config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
+    ext.config_options << "--with-mysql-dir=#{mysql_lib}"
   else
     ext.cross_compile = true
-    ext.cross_platform = ['i386-mingw32', 'i386-mswin32']
-    ext.cross_config_options << "--with-mysql-include=#{mysql_lib}/include"
-    ext.cross_config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
+    ext.cross_platform = ['i386-mingw32', 'i386-mswin32-60']
+    ext.cross_config_options << "--with-mysql-dir=#{mysql_lib}"
+    ext.cross_compiling do |gemspec|
+      gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
+
+======================================================================================================
+
+  You've installed the binary version of #{gemspec.name}.
+  It was built using MySQL Connector/C version #{CONNECTOR_VERSION}.
+  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 URL:
+
+  http://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32.zip/from/pick
+
+  You can put the lib\\libmysql.dll available in this package to your Ruby bin directory.
+  E.g. C:\\Ruby\\bin
+
+======================================================================================================
+
+      POST_INSTALL_MESSAGE
+    end
   end
 end
 

data/tasks/vendor_mysql.rake

@@ -4,21 +4,21 @@ require 'rake/extensioncompiler'
 # download mysql library and headers
 directory "vendor"
 
-file "vendor/mysql-noinstall-#{MYSQL_VERSION}-win32.zip" => ['vendor'] do |t|
-  base_version = MYSQL_VERSION.gsub(/\.[0-9]+$/, '')
-  url = "http://dev.mysql.com/get/Downloads/MySQL-#{base_version}/#{File.basename(t.name)}/from/#{MYSQL_MIRROR}/"
+CONNECTOR_DIR = "mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32"
+CONNECTOR_ZIP = "#{CONNECTOR_DIR}.zip"
+
+file "vendor/#{CONNECTOR_ZIP}" => ['vendor'] do |t|
+  url = "http://dev.mysql.com/get/Downloads/Connector-C/#{File.basename(t.name)}/from/#{CONNECTOR_MIRROR}/"
   when_writing "downloading #{t.name}" do
-    cd File.dirname(t.name) do
-      sh "wget -c #{url} || curl -C - -O #{url}"
-    end
+    sh "curl -L #{url} -o #{t.name}"
   end
 end
 
-file "vendor/mysql-#{MYSQL_VERSION}-win32/include/mysql.h" => ["vendor/mysql-noinstall-#{MYSQL_VERSION}-win32.zip"] do |t|
+file "vendor/#{CONNECTOR_DIR}/include/mysql.h" => ["vendor/#{CONNECTOR_ZIP}"] do |t|
   full_file = File.expand_path(t.prerequisites.last)
   when_writing "creating #{t.name}" do
     cd "vendor" do
-      sh "unzip #{full_file} mysql-#{MYSQL_VERSION}-win32/bin/** mysql-#{MYSQL_VERSION}-win32/include/** mysql-#{MYSQL_VERSION}-win32/lib/**"
+      sh "unzip #{full_file} #{CONNECTOR_DIR}/bin/** #{CONNECTOR_DIR}/include/** #{CONNECTOR_DIR}/lib/**"
     end
     # update file timestamp to avoid Rake perform this extraction again.
     touch t.name
@@ -26,10 +26,11 @@ file "vendor/mysql-#{MYSQL_VERSION}-win32/include/mysql.h" => ["vendor/mysql-noi
 end
 
 # clobber expanded packages
-CLOBBER.include("vendor/mysql-#{MYSQL_VERSION}-win32")
+CLOBBER.include("vendor/#{CONNECTOR_ZIP}")
+CLOBBER.include("vendor/#{CONNECTOR_DIR}")
 
 # vendor:mysql
-task 'vendor:mysql' => ["vendor/mysql-#{MYSQL_VERSION}-win32/include/mysql.h"]
+task 'vendor:mysql' => ["vendor/#{CONNECTOR_DIR}/include/mysql.h"]
 
 # hook into cross compilation vendored mysql dependency
 if RUBY_PLATFORM =~ /mingw|mswin/ then

data/test/test_mysql.rb

@@ -30,7 +30,7 @@ class TC_Mysql < Test::Unit::TestCase
   end
 
   def test_version()
-    assert_equal(20801, Mysql::VERSION)
+    assert_equal(20802, Mysql::VERSION)
   end
 
   def test_init()
@@ -342,7 +342,7 @@ class TC_MysqlRes < Test::Unit::TestCase
     assert_equal("t", f.table)
     assert_equal(nil, f.def)
     assert_equal(Mysql::Field::TYPE_STRING, f.type)
-    assert_equal(10, f.length)
+    assert_equal(30, f.length)
     assert_equal(4, f.max_length)
     assert_equal(0, f.flags)
     assert_equal(0, f.decimals)
@@ -399,7 +399,7 @@ class TC_MysqlRes < Test::Unit::TestCase
       "table" => "t",
       "def" => nil,
       "type" => Mysql::Field::TYPE_STRING,
-      "length" => 10,
+      "length" => 30,
       "max_length" => 4,
       "flags" => 0,
       "decimals" => 0,
@@ -1305,12 +1305,16 @@ class TC_MysqlStmt2 < Test::Unit::TestCase
 
   def test_insert_id()
     if @m.server_version >= 40100 then
-      @m.query("create temporary table t (i int auto_increment, unique(i))")
-      @s.prepare("insert into t values (0)")
-      @s.execute()
+      @m.query("create temporary table t (i bigint auto_increment, unique(i))")
+      @s.prepare("insert into t values (?)")
+      @s.execute(0)
       assert_equal(1, @s.insert_id())
-      @s.execute()
+      @s.execute(0)
       assert_equal(2, @s.insert_id())
+      @s.execute(2**32)
+      assert_equal(2**32, @s.insert_id())
+      @s.execute(0)
+      assert_equal(2**32+1, @s.insert_id())
     end
   end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mysql
 version: !ruby/object:Gem::Version 
-  version: 2.8.1
+  hash: 41
+  prerelease: 
+  segments: 
+  - 2
+  - 9
+  - 1
+  version: 2.9.1
 platform: ruby
 authors: 
 - TOMITA Masahiro
@@ -9,34 +15,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-21 00:00:00 -03:00
-default_executable: 
+date: 2013-02-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
+  name: rdoc
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.5"
-    version: 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 13
+        segments: 
+        - 3
+        - 5
+        version: "3.5"
+  type: :development
+  version_requirements: *id003
 description: |-
   This is the MySQL API module for Ruby. It provides the same functions for Ruby
   programs that the MySQL C API provides for C programs.
   
-  This is a conversion of tmtm's original extension into a proper RubyGems.
+  This package is offered as gem for easy installation using RubyGems. It wraps
+  unmodified tmtm's mysql-ruby extension into a proper gem.
+  
+  Please note that tmtm (Tomita Mashahiro) has deprecated development of this
+  extension and only update it for bug fixes.
 email: 
 - tommy@tmtm.org
 executables: []
@@ -60,12 +95,13 @@ files:
 - extra/README_ja.html
 - extra/tommy.css
 - lib/mysql.rb
+- lib/mysql/version.rb
 - tasks/gem.rake
 - tasks/native.rake
 - tasks/vendor_mysql.rake
 - test/test_mysql.rb
-has_rdoc: true
-homepage: http://mysql-win.rubyforge.org
+- .gemtest
+homepage: http://github.com/luislavena/mysql-gem
 licenses: []
 
 post_install_message: 
@@ -74,23 +110,30 @@ rdoc_options:
 - README.txt
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.6
-  version: 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: mysql-win
-rubygems_version: 1.3.4
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This is the MySQL API module for Ruby