do_mysql 0.9.10.1 → 0.9.11

data/History.txt

@@ -1,3 +1,9 @@
+== 0.9.11 2009-01-19
+* Improvements
+  * Ruby 1.9 support
+* Fixes
+  * Reconnecting now works properly
+
 == 0.9.9 2008-11-27
 * Improvements
   * Added initial support for Ruby 1.9 [John Harrison]

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Yehuda Katz
+Copyright (c) 2007, 2008, 2009 Yehuda Katz, Dirkjan Bussink
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -4,7 +4,6 @@ LICENSE
 Manifest.txt
 README.txt
 Rakefile
-TODO
 buildfile
 ext-java/src/main/java/DoMysqlExtService.java
 ext-java/src/main/java/do_mysql/MySqlDriverDefinition.java

data/Rakefile

@@ -9,8 +9,8 @@ JRUBY   = RUBY_PLATFORM =~ /java/
 WINDOWS = Gem.win_platform?
 SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-AUTHOR = "Scott Bauer"
-EMAIL  = "bauer.mail@gmail.com"
+AUTHOR = "Dirkjan Bussink"
+EMAIL  = "d.bussink@gmail.com"
 GEM_NAME = "do_mysql"
 GEM_VERSION = DataObjects::Mysql::VERSION
 GEM_DEPENDENCIES = if JRUBY
@@ -18,33 +18,54 @@ GEM_DEPENDENCIES = if JRUBY
 else
   [["data_objects", GEM_VERSION]]
 end
-GEM_CLEAN = ['**/*.{o,so,bundle,log,a,gem,dSYM,obj,pdb,lib,def,exp,DS_Store}', 'ext/Makefile']
-GEM_EXTRAS = { :has_rdoc => false, :extensions => 'ext/do_mysql_ext/extconf.rb' }
+GEM_CLEAN = ['**/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,lib,def,exp,DS_Store}',
+  'ext/Makefile', 'ext-java/target']
+GEM_EXTRAS = if JRUBY
+  {
+    :has_rdoc => false,
+    :platform => 'java'
+  }
+else
+  {
+    :has_rdoc => false,
+    :extensions => 'ext/do_mysql_ext/extconf.rb'
+  }
+end
 
 PROJECT_NAME = "dorb"
 PROJECT_URL  = "http://rubyforge.org/projects/dorb"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = "A DataObject.rb driver for MySQL"
 
-JAVA_DRIVER = true
-
 
 # RCov is run by default, except on the JRuby platform, or if NO_RCOV env is true
 RUN_RCOV = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
 
 if (tasks_dir = ROOT.parent + 'tasks').directory?
   require tasks_dir + 'hoe'
+  require tasks_dir + 'ext_helper_java'
+
+  setup_java_extension  "#{GEM_NAME}_ext", HOE.spec
+end
+
+if JRUBY
+  HOE.spec.files += ['lib/do_mysql_ext.jar']
+  HOE.spec.require_paths = Dir['lib']
 end
 
 # compile the extension
-begin
-  gem('rake-compiler')
-  require 'rake/extensiontask'
-  Rake::ExtensionTask.new('do_mysql_ext', HOE.spec)
-rescue LoadError
-  warn "To cross-compile, install rake-compiler (gem install rake-compiler)"
-  if tasks_dir.directory?
-    require tasks_dir + 'ext_helper'
-    setup_extension('do_mysql_ext', HOE.spec)
+if JRUBY
+  Rake::Task['compile:jruby'].invoke
+else
+  begin
+    gem('rake-compiler')
+    require 'rake/extensiontask'
+    Rake::ExtensionTask.new('do_mysql_ext', HOE.spec)
+  rescue LoadError
+    warn "To cross-compile, install rake-compiler (gem install rake-compiler)"
+    if tasks_dir.directory?
+      require tasks_dir + 'ext_helper'
+      setup_c_extension('do_mysql_ext', HOE.spec)
+    end
   end
 end
 
@@ -70,7 +91,7 @@ desc 'Run specifications'
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts << '--format' << 'specdoc' << '--colour'
   t.spec_opts << '--loadby' << 'random'
-  t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb')
+  t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb').map { |f| f.to_s }
 
   begin
     t.rcov = RUN_RCOV

data/buildfile

@@ -1,26 +1,27 @@
-# Apache Buildr buildfile for do_derby
+# Apache Buildr buildfile for do_mysql
 # see http://incubator.apache.org/buildr/ for more information on Apache Buildr
 require 'buildr'
 require 'pathname'
 
 VERSION_NUMBER = '1.0'
 JDBC_SUPPORT = ['data_objects:jdbc:jar:1.0']
+TARGET_DIR = 'pkg/classes'
 repositories.remote << 'http://www.ibiblio.org/maven2/'
 
 define 'do_mysql' do
   project.version = VERSION_NUMBER
   project.group = 'data_objects.rb'
 
-  manifest['Copyright'] = 'Alex Coles (C) 2008'
+  manifest['Copyright'] = 'Alex Coles (C) 2008-2009'
 
   compile.using :target => '1.5', :lint => 'all', :deprecation => 'true'
 
   define 'ext-java' do
-    package :jar
+    package(:jar).clean.include(TARGET_DIR)
         
     jdbc_support_jar = file('../../do_jdbc/lib/do_jdbc_internal.jar')
     jdbc_support = artifact('data_objects:jdbc:jar:1.0').from(jdbc_support_jar)
     
-    compile.with JDBC_SUPPORT
+    compile.into(TARGET_DIR).with(JDBC_SUPPORT)
   end
 end

data/ext/do_mysql_ext/do_mysql_ext.c

@@ -43,6 +43,7 @@ static ID ID_NEW;
 static ID ID_NEW_RATIONAL;
 static ID ID_NEW_DATE;
 static ID ID_CONST_GET;
+static ID ID_RATIONAL;
 static ID ID_UTC;
 static ID ID_ESCAPE_SQL;
 static ID ID_STRFTIME;
@@ -61,9 +62,6 @@ static VALUE cDO_Reader;
 // References to Ruby classes that we'll need
 static VALUE rb_cDate;
 static VALUE rb_cDateTime;
-#ifndef RUBY_19_COMPATIBILITY
-static VALUE rb_cRational;
-#endif
 static VALUE rb_cBigDecimal;
 
 // Classes that we'll build in Init
@@ -158,7 +156,7 @@ static int jd_from_date(int year, int month, int day) {
 static VALUE seconds_to_offset(long seconds_offset) {
   do_int64 num = seconds_offset, den = 86400;
   reduce(&num, &den);
-  return rb_funcall(rb_cRational, rb_intern("new!"), 2, rb_ll2inum(num), rb_ll2inum(den));
+  return rb_funcall(rb_mKernel, ID_RATIONAL, 2, rb_ll2inum(num), rb_ll2inum(den));
 }
 
 static VALUE timezone_to_offset(int hour_offset, int minute_offset) {
@@ -181,7 +179,7 @@ static VALUE parse_date(const char *date) {
 
   // Math from Date.jd_to_ajd
   ajd = jd * 2 - 1;
-  rational = rb_funcall(rb_cRational, ID_NEW_RATIONAL, 2, INT2NUM(ajd), INT2NUM(2));
+  rational = rb_funcall(rb_mKernel, ID_RATIONAL, 2, INT2NUM(ajd), INT2NUM(2));
   return rb_funcall(rb_cDate, ID_NEW_DATE, 3, rational, INT2NUM(0), INT2NUM(2299161));
 }
 
@@ -293,19 +291,19 @@ static VALUE parse_date_time(const char *date) {
 
   reduce(&num, &den);
 
-  ajd = rb_funcall(rb_cRational, rb_intern("new!"), 2, rb_ull2inum(num), rb_ull2inum(den));
+  ajd = rb_funcall(rb_mKernel, ID_RATIONAL, 2, rb_ull2inum(num), rb_ull2inum(den));
   offset = timezone_to_offset(hour_offset, minute_offset);
 
   return rb_funcall(rb_cDateTime, ID_NEW_DATE, 3, ajd, offset, INT2NUM(2299161));
 }
 
 // Convert C-string to a Ruby instance of Ruby type "type"
-static VALUE typecast(const char* value, unsigned long length, char* type) {
+static VALUE typecast(const char* value, unsigned long length, const char* type) {
   if (NULL == value)
     return Qnil;
 
   if ( strcmp(type, "Class") == 0) {
-    return rb_funcall(mDO, rb_intern("find_const"), 1, TAINTED_STRING(value, length));
+    return rb_funcall(rb_cObject, rb_intern("full_const_get"), 1, TAINTED_STRING(value, length));
   } else if ( strcmp(type, "Integer") == 0 || strcmp(type, "Fixnum") == 0 || strcmp(type, "Bignum") == 0 ) {
     return rb_cstr2inum(value, 10);
   } else if (0 == strcmp("String", type)) {
@@ -391,9 +389,8 @@ static MYSQL_RES* cCommand_execute_async(VALUE self, MYSQL* db, VALUE query) {
 
   VALUE connection = rb_iv_get(self, "@connection");
 
-  retval = mysql_ping(db);
-  if(retval == CR_SERVER_GONE_ERROR) {
-    CHECK_AND_RAISE(retval, "Mysql server has gone away. \
+  if(mysql_ping(db) && mysql_errno(db) == CR_SERVER_GONE_ERROR) {
+    CHECK_AND_RAISE(mysql_errno(db), "Mysql server has gone away. \
                              Please report this issue to the Datamapper project. \
                              Specify your at least your MySQL version when filing a ticket");
   }
@@ -496,9 +493,6 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
   //   mysql_ssl_set(db, key, cert, ca, capath, cipher)
   // }
 
-  my_bool reconnect = 1;
-  mysql_options(db, MYSQL_OPT_RECONNECT, &reconnect);
-
   result = (MYSQL *)mysql_real_connect(
     db,
     host,
@@ -514,6 +508,9 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
     raise_mysql_error(Qnil, db, -1, NULL);
   }
 
+  my_bool reconnect = 1;
+  mysql_options(db, MYSQL_OPT_RECONNECT, &reconnect);
+
   // Set the connections character set
   encoding_error = mysql_set_character_set(db, encoding);
   if (0 != encoding_error) {
@@ -763,7 +760,7 @@ static VALUE cReader_next(VALUE self) {
   unsigned long *lengths;
 
   int i;
-  char *field_type;
+  const char *field_type;
 
   if (Qnil == reader_container)
     return Qfalse;
@@ -806,6 +803,14 @@ static VALUE cReader_fields(VALUE self) {
   return rb_iv_get(self, "@fields");
 }
 
+static VALUE cReader_field_count(VALUE self) {
+  return rb_iv_get(self, "@field_count");
+}
+
+static VALUE cReader_row_count(VALUE self) {
+  return rb_iv_get(self, "@row_count");
+}
+
 void Init_do_mysql_ext() {
   rb_require("bigdecimal");
   rb_require("date");
@@ -817,13 +822,13 @@ void Init_do_mysql_ext() {
   ID_TO_S = rb_intern("to_s");
   ID_TO_TIME = rb_intern("to_time");
   ID_NEW = rb_intern("new");
-  ID_NEW_RATIONAL = rb_intern("new!");
 #ifdef RUBY_LESS_THAN_186
   ID_NEW_DATE = rb_intern("new0");
 #else
   ID_NEW_DATE = rb_intern("new!");
 #endif
   ID_CONST_GET = rb_intern("const_get");
+  ID_RATIONAL = rb_intern("Rational");
   ID_UTC = rb_intern("utc");
   ID_ESCAPE_SQL = rb_intern("escape_sql");
   ID_STRFTIME = rb_intern("strftime");
@@ -834,7 +839,6 @@ void Init_do_mysql_ext() {
   // Store references to a few helpful clases that aren't in Ruby Core
   rb_cDate = RUBY_CLASS("Date");
   rb_cDateTime = RUBY_CLASS("DateTime");
-  rb_cRational = RUBY_CLASS("Rational");
   rb_cBigDecimal = RUBY_CLASS("BigDecimal");
 
   // Get references to the DataObjects module and its classes
@@ -875,4 +879,6 @@ void Init_do_mysql_ext() {
   rb_define_method(cReader, "next!", cReader_next, 0);
   rb_define_method(cReader, "values", cReader_values, 0);
   rb_define_method(cReader, "fields", cReader_fields, 0);
+  rb_define_method(cReader, "field_count", cReader_field_count, 0);
+  rb_define_method(cReader, "row_count", cReader_row_count, 0);
 }

data/ext/do_mysql_ext/extconf.rb

@@ -66,8 +66,6 @@ $CFLAGS << ' -Wall ' unless RUBY_PLATFORM =~ /mswin/
 
 if RUBY_VERSION < '1.8.6'
   $CFLAGS << ' -DRUBY_LESS_THAN_186'
-elsif RUBY_VERSION >= '1.9.0'
-  $CFLAGS << ' -DRUBY_19_COMPATIBILITY'
 end
 
 create_makefile('do_mysql_ext')

data/lib/do_mysql.rb

@@ -7,7 +7,7 @@ if RUBY_PLATFORM =~ /java/
   require 'jdbc/mysql' # the JDBC driver, packaged as a gem
 end
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'do_mysql_ext'))
+require 'do_mysql_ext'
 require File.expand_path(File.join(File.dirname(__FILE__), 'do_mysql', 'version'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'do_mysql', 'transaction'))
 
@@ -27,7 +27,7 @@ if RUBY_PLATFORM =~ /java/
         def using_socket?
           @using_socket
         end
-        
+
         def character_set
           # JDBC API does not provide an easy way to get the current character set
           # For now, we code the character_set used as utf8

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = "0.9.10.1"
+    VERSION = "0.9.11"
   end
 end

data/spec/integration/do_mysql_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
@@ -157,11 +159,21 @@ describe DataObjects::Mysql::Reader do
 
   it "should return the proper number of fields" do
     id = insert("INSERT INTO users (name) VALUES ('Billy Bob')")
+
     select("SELECT id, name, fired_at FROM users WHERE id = ?", nil, id) do |reader|
       reader.fields.size.should == 3
     end
   end
 
+  it "should return proper number of rows and fields using row_count and field_count" do
+    pending "Neither do_jdbc nor C-extension return row_count correctly at the moment"
+    command = @connection.create_command("SELECT * FROM widgets WHERE id = (SELECT max(id) FROM widgets)")
+    reader = command.execute_reader
+    reader.field_count.should == 21
+    reader.row_count.should == 1
+    reader.close
+  end
+
   it "should raise an exception if .values is called after reading all available rows" do
 
     select("SELECT * FROM widgets LIMIT 2") do |reader|
@@ -180,6 +192,7 @@ describe DataObjects::Mysql::Reader do
     ]
                                             # do_jdbc rewrites "?" as "(?,?)"
                                             # to correspond to the JDBC API
+
     select("SELECT * FROM users WHERE id IN ?", nil, ids) do |reader|
       # select already calls next once for us
       reader.next!.should == true
@@ -210,10 +223,19 @@ describe DataObjects::Mysql::Reader do
     end
   end
 
+  it "should correctly work with default utf8 character set" do
+    name = "Билли Боб"
+    id = insert("INSERT INTO users (name) VALUES ('#{name}')")
+
+    select("SELECT name from users WHERE id = ?", [String], id) do |reader|
+      reader.values[0].should == name
+    end
+  end
+
   describe "Date, Time, and DateTime" do
 
     it "should return nil when the time is 0" do
-
+      pending "We need to introduce something like Proxy for typeasting where each SQL type will have _rules_ of casting" if JRUBY
       # skip the test if the strict dates/times setting is turned on
       strict_time = select("SHOW VARIABLES LIKE 'sql_mode'") do |reader|
         reader.values.last.split(',').any? do |mode|
@@ -233,9 +255,11 @@ describe DataObjects::Mysql::Reader do
     it "should return DateTimes using the current locale's Time Zone" do
       date = DateTime.now
       id = insert("INSERT INTO users (name, fired_at) VALUES (?, ?)", 'Sam', date)
+
       select("SELECT fired_at FROM users WHERE id = ?", [DateTime], id) do |reader|
         reader.values.last.to_s.should == date.to_s
       end
+
       exec("DELETE FROM users WHERE id = ?", id)
     end
 

data/spec/spec_helper.rb

@@ -28,7 +28,7 @@ require 'do_mysql'
 log_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'do.log'))
 FileUtils.mkdir_p(File.dirname(log_path))
 
-DataObjects::Mysql.logger = DataObjects::Logger.new(log_path, 0)
+DataObjects::Mysql.logger = DataObjects::Logger.new(log_path, :debug)
 
 at_exit { DataObjects.logger.flush }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  version: 0.9.10.1
+  version: 0.9.11
 platform: ruby
 authors: 
-- Scott Bauer
+- Dirkjan Bussink
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-05 00:00:00 +01:00
+date: 2009-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.10.1
+        version: 0.9.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -34,7 +34,7 @@ dependencies:
     version: 
 description: A DataObject.rb driver for MySQL
 email: 
-- bauer.mail@gmail.com
+- d.bussink@gmail.com
 executables: []
 
 extensions: 
@@ -50,7 +50,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- TODO
 - buildfile
 - ext-java/src/main/java/DoMysqlExtService.java
 - ext-java/src/main/java/do_mysql/MySqlDriverDefinition.java

data/TODO

@@ -1,4 +0,0 @@
-TODO
-====
-
-  * Add JDBC-based version of this driver.