RubyGems - mysql - Versions diffs - 2.7.1-mswin32 → 2.7.3-mswin32 - Mend

mysql 2.7.1-mswin32 → 2.7.3-mswin32

Files changed (10) hide show

data/README CHANGED

@@ -8,7 +8,12 @@ A win32 native build of the MySQL API module for Ruby.
 = Dependencies
- none
+For this to work, you must have libmysql.dll in your PATH environmental variable. If you have MySQL installed locally,
+just make sure that <mysql_install_dir>\bin is in your path. If you don't have MySQL installed locally, you can
+install one or more of the MySQL tools, find the libmysql.dll included in their bin directory, and copy it to
+the %SystemRoot%\System32 folder.
+I can't include the dll here due to licensing conflicts.
 = Installation

data/Rakefile CHANGED

@@ -5,30 +5,24 @@ require 'fileutils'
 #require 'date'
 include FileUtils
-CLEAN.include ["ext/*.{log,c,so,obj,pdb,lib,def,exp,manifest}", "ext/Makefile", "*.gem"]
+CLEAN.include ["ext/*.{log,c,so,obj,pdb,lib,def,exp,manifest,orig}", "ext/Makefile", "*.gem"]
 name="mysql"
-version="2.7.1"
+version="2.7.3"
 desc "Do everything, baby!"
 task :default => [:package]
-#task :package => [:clobber,:compile,:test,:makegem]
 task :package => [:clean,:compile,:makegem]
 desc "Compiles all extensions"
 task :compile do
+  cp 'ext/mysql.c.in', 'ext/mysql.c.in.orig'
+  sh %{ patch -p0 ext/mysql.c.in < ext/mysql.c.in.patch }
   cd "ext" do
     sh %{ ruby extconf.rb --with-mysql-include=C:/Progra~1/MySQL/MySQLS~1.0/include --with-mysql-lib=C:/Progra~1/MySQL/MySQLS~1.0/lib/opt }
     sh %{ nmake }
-  end
-end
-desc "runs the given tests"
-task :test do
-  cd "ext" do
-    # TODO: improve test setup so that tests pass with authentication
-	ruby "test.rb", %{#{ENV["TESTOPTS"]}}
+	mv 'mysql.c.in.orig', 'mysql.c.in', :force => true
   end
 end
@@ -43,7 +37,7 @@ task :makegem do
     s.summary = "A win32-native build of the MySQL API module for Ruby."
     s.description = s.summary
     s.rubyforge_project = s.name
-    s.files += %w(docs ext/mysql.so ext/extconf.rb ext/extconf.rb.orig ext/mysql.c.in ext/test.rb README Rakefile)
+    s.files += %w(docs ext/mysql.so ext/extconf.rb ext/mysql.c.in ext/mysql.c.in.patch ext/test.rb README Rakefile)
 	s.rdoc_options << '--exclude' << 'ext' << '--main' << 'README'
 	s.extra_rdoc_files = ["README", "docs/README.html"]
 	s.has_rdoc = true

data/docs/README.html CHANGED

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- $Id: README.html,v 1.18 2006/06/04 14:39:53 tommy Exp $ -->
+<!-- $Id: README.html,v 1.20 2006-12-20 05:31:52 tommy Exp $ -->
 <html>
   <head>
     <meta http-equiv="content-style-type" content="text/css">
@@ -22,8 +22,8 @@
     <h2>Requirement</h2>
     <ul>
-      <li>MySQL 4.1.15/5.0.16
-      <li>Ruby 1.8.4
+      <li>MySQL 5.0.27
+      <li>Ruby 1.8.5
     </ul>
     <p>
       The module may work for other versions, but that has not been verified.
@@ -103,6 +103,9 @@
     <pre class="code">
 % env LD_RUN_PATH=<i>libmysqlclient.so directory</i> make
 </pre>
+    <p>
+      test.rb is tested on Linux only.
+    </p>
     <h2>Usage</h2>
     <p>
@@ -697,7 +700,7 @@ st.close
 	    <tr><td>FLOAT, DOUBLE<td>Float
 	    <tr><td>DECIMAL<td>String
 	    <tr><td>DATE, DATETIME, TIMESTAMP, TIME<td>Mysql::Time
-	    <tr><td>CHAR, VARCHAR, BINARY, VARBINARY, TINYBLOB, TINYTEXT, TINYBLOB, TINYTEXT, MEDIUMBLOB, MEDIUMTEXT, LONGBLOB, LONGTEXT, ENUM, SET<td>String
+	    <tr><td>CHAR, VARCHAR, BINARY, VARBINARY, TINYBLOB, TINYTEXT, TINYBLOB, TINYTEXT, MEDIUMBLOB, MEDIUMTEXT, LONGBLOB, LONGTEXT, ENUM, SET, BIT<td>String
 	    <tr><td>NULL<td>NilClass
 	</table>
@@ -811,6 +814,25 @@ st.close
     <h2>History</h2>
     <dl>
+      <dt>2006-12-20
+      <dd>
+        version 2.7.3
+        <ul>
+          <li>BUG: Mysql#query with block is stopped when last query failed.
+        </ul>
+      <dt>2006-10-28
+      <dd>
+        version 2.7.2
+        <ul>
+          <li>BUG: Mysql::Stmt#result_metadata don't return nil. (Thanks to Hidetoshi)
+          <li>BUG: Mysql#close check mysql_errno.
+          <li>BUG: multistatement Mysql#query with block ignore error.
+          <li>extconf.rb for Visual C++. (Thanks to Shugo Maeda)
+          <li>support MySQL BIT type.
+          <li>add Mysql::Field::TYPE_BIT, TYPE_NEWDECIMAL.
+        </ul>
       <dt>2006-06-04
       <dd>
         version  2.7.1
@@ -1011,7 +1033,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 Jun  4 23:39:34 JST 2006
+Last modified: Wed Dec 20 14:30:14 JST 2006
 <!-- hhmts end -->
   </body>
 </html>

data/ext/extconf.rb CHANGED

@@ -1,18 +1,73 @@
-require 'mkmf'
-dir_config('mysql')
-have_header('mysql.h')
-if not have_library('libmysql', 'mysql_query', 'mysql.h') then
-	puts "Could not locate the 'mysql_query' function."
-	exit 1
-end
-have_func('mysql_ssl_set', 'mysql.h')
-newf = File::open('mysql.c', 'w')
-IO::foreach('mysql.c.in') do |l|
-	newf.puts l
-end
-create_makefile('mysql')
+require 'mkmf'
+if /mswin32/ =~ RUBY_PLATFORM
+  inc, lib = dir_config('mysql')
+  exit 1 unless have_library("libmysql")
+elsif mc = with_config('mysql-config') then
+  mc = 'mysql_config' if mc == true
+  cflags = `#{mc} --cflags`.chomp
+  exit 1 if $? != 0
+  libs = `#{mc} --libs`.chomp
+  exit 1 if $? != 0
+  $CPPFLAGS += ' ' + cflags
+  $libs = libs + " " + $libs
+else
+  inc, lib = dir_config('mysql', '/usr/local')
+  libs = ['m', 'z', 'socket', 'nsl', 'mygcc']
+  while not find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql") do
+    exit 1 if libs.empty?
+    have_library(libs.shift)
+  end
+end
+have_func('mysql_ssl_set')
+if have_header('mysql.h') then
+  src = "#include <errmsg.h>\n#include <mysqld_error.h>\n"
+elsif have_header('mysql/mysql.h') then
+  src = "#include <mysql/errmsg.h>\n#include <mysql/mysqld_error.h>\n"
+else
+  exit 1
+end
+# make mysql constant
+File::open("conftest.c", "w") do |f|
+  f.puts src
+end
+if defined? cpp_command then
+  cpp = Config::expand(cpp_command(''))
+else
+  cpp = Config::expand sprintf(CPP, $CPPFLAGS, $CFLAGS, '')
+end
+if /mswin32/ =~ RUBY_PLATFORM && !/-E/.match(cpp)
+  cpp << " -E"
+end
+unless system "#{cpp} > confout" then
+  exit 1
+end
+File::unlink "conftest.c"
+error_syms = []
+IO::foreach('confout') do |l|
+  next unless l =~ /errmsg\.h|mysqld_error\.h/
+  fn = l.split(/\"/)[1]
+  IO::foreach(fn) do |m|
+    if m =~ /^#define\s+([CE]R_[0-9A-Z_]+)/ then
+      error_syms << $1
+    end
+  end
+end
+File::unlink 'confout'
+error_syms.uniq!
+newf = File::open('mysql.c', 'w')
+IO::foreach('mysql.c.in') do |l|
+  newf.puts l
+  if l =~ /\/\* Mysql::Error constant \*\// then
+    error_syms.each do |s|
+      newf.puts "    rb_define_const(eMysql, \"#{s}\", INT2NUM(#{s}));"
+    end
+  end
+end
+create_makefile("mysql")

data/ext/mysql.c.in CHANGED

@@ -1,5 +1,5 @@
 /*	ruby mysql module
- *	$Id: mysql.c.in,v 1.32 2006/06/04 14:29:28 tommy Exp $
+ *	$Id: mysql.c.in,v 1.38 2006-12-20 05:31:52 tommy Exp $
  */
 #include "ruby.h"
@@ -14,7 +14,7 @@
 #include <mysql/mysqld_error.h>
 #endif
-#define MYSQL_RUBY_VERSION 20701
+#define MYSQL_RUBY_VERSION 20703
 #define GC_STORE_RESULT_LIMIT 20
@@ -182,7 +182,6 @@ static VALUE mysqlres2obj(MYSQL_RES* res)
 static VALUE make_field_obj(MYSQL_FIELD* f)
 {
     VALUE obj;
-    VALUE hash;
     if (f == NULL)
 	return Qnil;
     obj = rb_obj_alloc(cMysqlField);
@@ -446,8 +445,6 @@ static VALUE my_close(VALUE obj)
 {
     MYSQL* m = GetHandler(obj);
     mysql_close(m);
-    if (mysql_errno(m))
-	mysql_raise(m);
     GetMysqlStruct(obj)->connection = Qfalse;
     return obj;
 }
@@ -700,6 +697,7 @@ static VALUE res_free(VALUE);
 /*	query(sql)	*/
 static VALUE query(VALUE obj, VALUE sql)
 {
+    int loop = 0;
     MYSQL* m = GetHandler(obj);
     Check_Type(sql, T_STRING);
     if (rb_block_given_p()) {
@@ -718,11 +716,12 @@ static VALUE query(VALUE obj, VALUE sql)
 		VALUE robj = mysqlres2obj(res);
 		rb_ensure(rb_yield, robj, res_free, robj);
 	    }
-	}
 #if MYSQL_VERSION_ID >= 40101
-	while (mysql_next_result(m) == 0);
+	    if ((loop = mysql_next_result(m)) > 0)
+        	mysql_raise(m);
+	} while (loop == 0);
 #else
-	while (0);
+	} while (0);
 #endif
 	return obj;
     }
@@ -1313,7 +1312,6 @@ static VALUE stmt_execute(int argc, VALUE *argv, VALUE obj)
     struct mysql_stmt *s = DATA_PTR(obj);
     MYSQL_STMT *stmt = s->stmt;
     my_bool true = 1;
-    my_bool false = 0;
     int i;
     check_stmt_closed(obj);
@@ -1334,7 +1332,7 @@ static VALUE stmt_execute(int argc, VALUE *argv, VALUE obj)
 	case T_BIGNUM:
 	    s->param.bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
 	    s->param.bind[i].buffer = &(s->param.buffer[i]);
-	    *(long long*)(s->param.bind[i].buffer) = rb_big2ll(argv[i]);
+	    *(LONG_LONG*)(s->param.bind[i].buffer) = rb_big2ll(argv[i]);
 	    break;
 	case T_FLOAT:
 	    s->param.bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
@@ -1435,7 +1433,7 @@ static VALUE stmt_fetch(VALUE obj)
 		v = INT2NUM(*(long*)s->result.bind[i].buffer);
 		break;
 	    case MYSQL_TYPE_LONGLONG:
-		v = rb_ll2inum(*(long long*)s->result.bind[i].buffer);
+		v = rb_ll2inum(*(LONG_LONG*)s->result.bind[i].buffer);
 		break;
 	    case MYSQL_TYPE_DOUBLE:
 		v = rb_float_new(*(double*)s->result.bind[i].buffer);
@@ -1560,6 +1558,7 @@ static enum enum_field_types buffer_type(MYSQL_FIELD *field)
     case FIELD_TYPE_DECIMAL:
 #if MYSQL_VERSION_ID >= 50003
     case FIELD_TYPE_NEWDECIMAL:
+    case FIELD_TYPE_BIT:
 #endif
 	return MYSQL_TYPE_STRING;
     case FIELD_TYPE_BLOB:
@@ -1630,8 +1629,11 @@ static VALUE stmt_result_metadata(VALUE obj)
     MYSQL_RES *res;
     check_stmt_closed(obj);
     res = mysql_stmt_result_metadata(s->stmt);
-    if (res == NULL && mysql_stmt_errno(s->stmt) != 0)
+    if (res == NULL) {
+      if (mysql_stmt_errno(s->stmt) != 0)
 	mysql_stmt_raise(s->stmt);
+      return Qnil;
+    }
     return mysqlres2obj(res);
 }
@@ -1700,6 +1702,7 @@ static VALUE time_initialize(int argc, VALUE* argv, VALUE obj)
     rb_iv_set(obj, "second", NILorFIXvalue(second));
     rb_iv_set(obj, "neg", (neg == Qnil || neg == Qfalse) ? Qfalse : Qtrue);
     rb_iv_set(obj, "second_part", NILorFIXvalue(second_part));
+    return obj;
 }
 static VALUE time_inspect(VALUE obj)
@@ -2080,6 +2083,10 @@ void Init_mysql(void)
     rb_define_const(cMysqlField, "TYPE_DATETIME", INT2NUM(FIELD_TYPE_DATETIME));
 #if MYSQL_VERSION_ID >= 32130
     rb_define_const(cMysqlField, "TYPE_YEAR", INT2NUM(FIELD_TYPE_YEAR));
+#endif
+#if MYSQL_VERSION_ID >= 50003
+    rb_define_const(cMysqlField, "TYPE_BIT", INT2NUM(FIELD_TYPE_BIT));
+    rb_define_const(cMysqlField, "TYPE_NEWDECIMAL", INT2NUM(FIELD_TYPE_NEWDECIMAL));
 #endif
     rb_define_const(cMysqlField, "TYPE_SET", INT2NUM(FIELD_TYPE_SET));
     rb_define_const(cMysqlField, "TYPE_BLOB", INT2NUM(FIELD_TYPE_BLOB));

data/ext/mysql.c.in.patch ADDED

@@ -0,0 +1,13 @@
+--- mysql.c.in	Tue Dec 19 22:31:52 2006
++++ mysql.c.in.new	Thu Dec 28 09:33:30 2006
+@@ -14,6 +14,10 @@
+ #include <mysql/mysqld_error.h>
+ #endif
++#if !defined(HAVE_ULONG) && !defined(TARGET_OS_LINUX) && !defined(__USE_MISC)
++typedef unsigned long	ulong;		  /* Short for unsigned long */
++#endif
++
+ #define MYSQL_RUBY_VERSION 20703
+ #define GC_STORE_RESULT_LIMIT 20

data/ext/mysql.so CHANGED

Binary file

data/ext/test.rb CHANGED

@@ -1,5 +1,5 @@
 #!/usr/local/bin/ruby
-# $Id: test.rb,v 1.18 2006/06/04 14:39:53 tommy Exp $
+# $Id: test.rb,v 1.23 2006-12-20 05:31:52 tommy Exp $
 require "test/unit"
 require "./mysql.o"
@@ -16,7 +16,7 @@ class TC_Mysql < Test::Unit::TestCase
   end
   def test_version()
-    assert_equal(20701, Mysql::VERSION)
+    assert_equal(20703, Mysql::VERSION)
   end
   def test_init()
@@ -48,11 +48,11 @@ class TC_Mysql < Test::Unit::TestCase
   end
   def test_get_client_info()
-    assert_match(/^\d.\d+.\d+(-.*)?$/, Mysql.get_client_info())
+    assert_match(/^\d.\d+.\d+[a-z]?(-.*)?$/, Mysql.get_client_info())
   end
   def test_client_info()
-    assert_match(/^\d.\d+.\d+(-.*)?$/, Mysql.client_info())
+    assert_match(/^\d.\d+.\d+[a-z]?(-.*)?$/, Mysql.client_info())
   end
   def test_options()
@@ -103,7 +103,7 @@ class TC_Mysql2 < Test::Unit::TestCase
     @m = Mysql.new(@host, @user, @pass, @db, @port, @sock, @flag)
   end
   def teardown()
-    @m.close
+    @m.close if @m
   end
   def test_affected_rows()
@@ -142,6 +142,33 @@ class TC_Mysql2 < Test::Unit::TestCase
     end
   end if Mysql.client_version >= 40100
+  def test_query_with_block()
+    if @m.server_version >= 40100 then
+      expect = [["1","2","3"], ["4","5","6"]]
+      @m.query("select 1,2,3; select 4,5,6") {|res|
+        assert_equal(1, res.num_rows)
+        assert_equal(expect.shift, res.fetch_row)
+      }
+      assert(expect.empty?)
+      expect = [["1","2","3"], ["4","5","6"]]
+      assert_raises(Mysql::Error) {
+        @m.query("select 1,2,3; hoge; select 4,5,6") {|res|
+          assert_equal(1, res.num_rows)
+          assert_equal(expect.shift, res.fetch_row)
+        }
+      }
+      assert_equal(1, expect.size)
+      expect = [["1","2","3"], ["4","5","6"]]
+      assert_raises(Mysql::Error) {
+        @m.query("select 1,2,3; select 4,5,6; hoge") {|res|
+          assert_equal(1, res.num_rows)
+          assert_equal(expect.shift, res.fetch_row)
+        }
+      }
+      assert(expect.empty?)
+    end
+  end
   def test_set_server_option()
     if @m.server_version >= 40101 then
       assert_equal(@m, @m.set_server_option(Mysql::OPTION_MULTI_STATEMENTS_ON))
@@ -662,6 +689,31 @@ class TC_MysqlStmt2 < Test::Unit::TestCase
     end
   end
+  def test_fetch_bit()
+    if @m.client_version >= 50003 and @m.server_version >= 50003 then
+      @m.query("create temporary table t (i bit(8))")
+      @m.query("insert into t values (0),(-1),(127),(-128),(255),(-255),(256)")
+      @s.prepare("select i from t")
+      @s.execute
+      assert_equal(["\x00"], @s.fetch)
+      assert_equal(["\xff"], @s.fetch)
+      assert_equal(["\x7f"], @s.fetch)
+      assert_equal(["\xff"], @s.fetch)
+      assert_equal(["\xff"], @s.fetch)
+      assert_equal(["\xff"], @s.fetch)
+      assert_equal(["\xff"], @s.fetch)
+      @m.query("create temporary table t2 (i bit(64))")
+      @m.query("insert into t2 values (0),(-1),(4294967296),(18446744073709551615),(18446744073709551616)")
+      @s.prepare("select i from t2")
+      @s.execute
+      assert_equal(["\x00\x00\x00\x00\x00\x00\x00\x00"], @s.fetch)
+      assert_equal(["\xff\xff\xff\xff\xff\xff\xff\xff"], @s.fetch)
+      assert_equal(["\x00\x00\x00\x01\x00\x00\x00\x00"], @s.fetch)
+      assert_equal(["\xff\xff\xff\xff\xff\xff\xff\xff"], @s.fetch)
+      assert_equal(["\xff\xff\xff\xff\xff\xff\xff\xff"], @s.fetch)
+    end
+  end
   def test_fetch_tinyint()
     if @m.server_version >= 40100 then
       @m.query("create temporary table t (i tinyint)")
@@ -1254,6 +1306,14 @@ class TC_MysqlStmt2 < Test::Unit::TestCase
     end
   end
+  def test_result_metadata_nodata()
+    if @m.server_version >= 40100 then
+      @m.query("create temporary table t (i int)")
+      @s.prepare("insert into t values (1)")
+      assert_equal(nil, @s.result_metadata())
+    end
+  end
   def test_row_seek_tell()
     if @m.server_version >= 40100 then
       @m.query("create temporary table t (i int)")
@@ -1285,7 +1345,11 @@ class TC_MysqlStmt2 < Test::Unit::TestCase
   def test_sqlstate()
     if @m.server_version >= 40100 then
       @s.prepare("select 1")
-      assert_equal("", @s.sqlstate)
+      if @m.client_version >= 50000 then
+        assert_equal("00000", @s.sqlstate)
+      else
+        assert_equal("", @s.sqlstate)
+      end
       assert_raises(Mysql::Error){@s.prepare("hogehoge")}
       assert_equal("42000", @s.sqlstate)
     end

metadata CHANGED

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: mysql
 version: !ruby/object:Gem::Version
-  version: 2.7.1
-date: 2006-06-20 00:00:00 -06:00
+  version: 2.7.3
+date: 2006-12-28 00:00:00 -07:00
 summary: A win32-native build of the MySQL API module for Ruby.
 require_paths:
 - ext
@@ -25,14 +25,15 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: mswin32
 signing_key:
 cert_chain:
+post_install_message:
 authors:
 - Kevin Williams
 files:
 - docs
 - ext/mysql.so
 - ext/extconf.rb
-- ext/extconf.rb.orig
 - ext/mysql.c.in
+- ext/mysql.c.in.patch
 - ext/test.rb
 - README
 - Rakefile

data/ext/extconf.rb.orig DELETED

@@ -1,67 +0,0 @@
-require 'mkmf'
-if mc = with_config('mysql-config') then
-  mc = 'mysql_config' if mc == true
-  cflags = `#{mc} --cflags`.chomp
-  exit 1 if $? != 0
-  libs = `#{mc} --libs`.chomp
-  exit 1 if $? != 0
-  $CPPFLAGS += ' ' + cflags
-  $libs = libs + " " + $libs
-else
-  inc, lib = dir_config('mysql', '/usr/local')
-  libs = ['m', 'z', 'socket', 'nsl']
-  while not find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql") do
-    exit 1 if libs.empty?
-    have_library(libs.shift)
-  end
-end
-have_func('mysql_ssl_set')
-if have_header('mysql.h') then
-  src = "#include <errmsg.h>\n#include <mysqld_error.h>\n"
-elsif have_header('mysql/mysql.h') then
-  src = "#include <mysql/errmsg.h>\n#include <mysql/mysqld_error.h>\n"
-else
-  exit 1
-end
-# make mysql constant
-File::open("conftest.c", "w") do |f|
-  f.puts src
-end
-if defined? cpp_command then
-  cpp = Config::expand(cpp_command(''))
-else
-  cpp = Config::expand sprintf(CPP, $CPPFLAGS, $CFLAGS, '')
-end
-unless system "#{cpp} > confout" then
-  exit 1
-end
-File::unlink "conftest.c"
-error_syms = []
-IO::foreach('confout') do |l|
-  next unless l =~ /errmsg\.h|mysqld_error\.h/
-  fn = l.split(/\"/)[1]
-  IO::foreach(fn) do |m|
-    if m =~ /^#define\s+([CE]R_[0-9A-Z_]+)/ then
-      error_syms << $1
-    end
-  end
-end
-File::unlink 'confout'
-error_syms.uniq!
-newf = File::open('mysql.c', 'w')
-IO::foreach('mysql.c.in') do |l|
-  newf.puts l
-  if l =~ /\/\* Mysql::Error constant \*\// then
-    error_syms.each do |s|
-      newf.puts "    rb_define_const(eMysql, \"#{s}\", INT2NUM(#{s}));"
-    end
-  end
-end
-create_makefile("mysql")