do_mysql 0.10.8-x86-mswin32-60 → 0.10.9-x86-mswin32-60

data/ChangeLog.markdown

@@ -1,3 +1,9 @@
+## 0.10.9 2012-08-13
+
+* Handle bigint insert id's
+* Add handling for invalid date and datetimes with value 0000-00-00
+* Handle empty database names for connecting to the default database
+
 ## 0.10.8 2012-02-10
 
 * Ruby 1.9.3 compatibility on Windows

data/Rakefile

@@ -15,7 +15,7 @@ JRUBY    = RUBY_PLATFORM =~ /java/
 IRONRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
 WINDOWS  = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i)
 SUDO     = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-BINARY_VERSION = '5.1.60'
+BINARY_VERSION = '5.1.65'
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_mysql/Makefile ext-java/target ])
 

data/ext/do_mysql/do_common.c

@@ -185,6 +185,10 @@ VALUE data_objects_parse_date(const char *date) {
       return Qnil;
   }
 
+  if(!year && !month && !day) {
+    return Qnil;
+  }
+
   return rb_funcall(rb_cDate, ID_NEW, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
 }
 
@@ -237,6 +241,10 @@ VALUE data_objects_parse_date_time(const char *date) {
   fmt_datetime = strchr(date, '.') ? _fmt_datetime_tz_subsec : _fmt_datetime_tz_normal;
   tokens_read  = sscanf(date, fmt_datetime, &year, &month, &day, &hour, &min, &sec, &hour_offset, &minute_offset);
 
+  if(!year && !month && !day && !hour && !min && !sec) {
+    return Qnil;
+  }
+
   switch (tokens_read) {
     case 8:
       minute_offset *= hour_offset < 0 ? -1 : 1;

data/ext/do_mysql/do_mysql.c

@@ -228,7 +228,7 @@ void do_mysql_full_connect(VALUE self, MYSQL *db) {
   }
 
   if (!database || !*database) {
-    rb_raise(eConnectionError, "Database must be specified");
+    database = NULL;
   }
 
   VALUE r_query = rb_iv_get(self, "@query");
@@ -489,7 +489,7 @@ VALUE do_mysql_cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
     return Qnil;
   }
 
-  return rb_funcall(cMysqlResult, ID_NEW, 3, self, INT2NUM(affected_rows), insert_id == 0 ? Qnil : INT2NUM(insert_id));
+  return rb_funcall(cMysqlResult, ID_NEW, 3, self, INT2NUM(affected_rows), insert_id == 0 ? Qnil : ULL2NUM(insert_id));
 }
 
 VALUE do_mysql_cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {

data/lib/do_mysql.rb

@@ -11,7 +11,7 @@ if RUBY_PLATFORM =~ /java/
 
   begin
     java.lang.Thread.currentThread.getContextClassLoader().loadClass(DataObjects::Mysql::JDBC_DRIVER, true)
-  rescue
+  rescue java.lang.ClassNotFoundException
     require 'jdbc/mysql' # the JDBC driver, packaged as a gem
   end
 

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = '0.10.8'
+    VERSION = '0.10.9'
   end
 end

data/spec/connection_spec.rb

@@ -18,6 +18,7 @@ describe DataObjects::Mysql::Connection do
 
   it_should_behave_like 'a Connection'
   it_should_behave_like 'a Connection with authentication support'
+  it_should_behave_like 'a Connection allowing default database'
   it_should_behave_like 'a Connection with JDBC URL support' if JRUBY
   it_should_behave_like 'a Connection with SSL support' unless JRUBY
   it_should_behave_like 'a Connection via JDNI' if JRUBY

data/spec/result_spec.rb

@@ -15,3 +15,29 @@ describe DataObjects::Mysql::Result do
   it_should_behave_like 'a Result which returns inserted key with sequences'
   it_should_behave_like 'a Result which returns nil without sequences'
 end
+
+describe DataObjects::Mysql::Result do
+
+  describe 'insert_id' do
+
+    before do
+      setup_test_environment
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+      # set the sequence to a value larger than SQL integer
+      command = @connection.create_command('INSERT INTO stuff (id, value) VALUES (?,?)')
+      command.execute_non_query(3_000_000_000, 'cow')
+      # use the sequence to generate an id
+      command = @connection.create_command('INSERT INTO stuff (value) VALUES (?)')
+      @result = command.execute_non_query('monkey')
+    end
+
+    after do
+      @connection.close
+    end
+
+    it 'should return the bigint id' do
+      @result.insert_id.should == 3_000_000_001
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -45,7 +45,7 @@ CONFIG.ssl      = SSLHelpers.query(:ca_cert, :client_cert, :client_key)
 
 CONFIG.driver       = 'mysql'
 CONFIG.jdbc_driver  = DataObjects::Mysql.const_get('JDBC_DRIVER') rescue nil
-CONFIG.uri          = ENV["DO_MYSQL_SPEC_URI"] || "#{CONFIG.scheme}://#{CONFIG.user_info}#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
+CONFIG.uri          = ENV["DO_MYSQL_SPEC_URI"] || "#{CONFIG.scheme}://#{CONFIG.user_info}#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}?zeroDateTimeBehavior=convertToNull"
 CONFIG.jdbc_uri     = "jdbc:#{CONFIG.uri}"
 CONFIG.sleep        = "SELECT sleep(1)"
 
@@ -62,6 +62,10 @@ module DataObjectsSpecHelpers
       DROP TABLE IF EXISTS `users`
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      DROP TABLE IF EXISTS `stuff`
+    EOF
+
     conn.create_command(<<-EOF).execute_non_query
       DROP TABLE IF EXISTS `widgets`
     EOF
@@ -82,6 +86,14 @@ module DataObjectsSpecHelpers
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      CREATE TABLE `stuff` (
+        `id` bigint NOT NULL auto_increment,
+        `value` varchar(50) NULL,
+        PRIMARY KEY  (`id`)
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+    EOF
+
     conn.create_command(<<-EOF).execute_non_query
       CREATE TABLE `widgets` (
         `id` int(11) NOT NULL auto_increment,

data/spec/typecast/date_spec.rb

@@ -6,4 +6,30 @@ require 'data_objects/spec/shared/typecast/date_spec'
 describe 'DataObjects::Mysql with Date' do
   it_should_behave_like 'supporting Date'
   it_should_behave_like 'supporting Date autocasting'
+
+  describe 'reading 0000-00-00' do
+
+    before do
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+
+      @connection.create_command("SET SESSION sql_mode = 'ALLOW_INVALID_DATES'").execute_non_query
+      @connection.create_command("INSERT INTO widgets (release_date) VALUES ('')").execute_non_query
+
+      @command = @connection.create_command("SELECT release_date FROM widgets WHERE release_date = '0000-00-00'")
+      @reader = @command.execute_reader
+      @reader.next!
+      @values = @reader.values
+    end
+
+    after do
+      @reader.close
+      @connection.close
+    end
+
+    it 'should return the number of created rows' do
+      @values.first.should be_nil
+    end
+
+  end
+
 end

data/spec/typecast/datetime_spec.rb

@@ -6,4 +6,30 @@ require 'data_objects/spec/shared/typecast/datetime_spec'
 describe 'DataObjects::Mysql with DateTime' do
   it_should_behave_like 'supporting DateTime'
   it_should_behave_like 'supporting DateTime autocasting'
+
+  describe 'reading 0000-00-00 00:00:00' do
+
+    before do
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+
+      @connection.create_command("SET SESSION sql_mode = 'ALLOW_INVALID_DATES'").execute_non_query
+      @connection.create_command("INSERT INTO widgets (release_datetime) VALUES ('')").execute_non_query
+
+      @command = @connection.create_command("SELECT release_datetime FROM widgets WHERE release_datetime = '0000-00-00 00:00:00'")
+      @reader = @command.execute_reader
+      @reader.next!
+      @values = @reader.values
+    end
+
+    after do
+      @reader.close
+      @connection.close
+    end
+
+    it 'should return the number of created rows' do
+      @values.first.should be_nil
+    end
+
+  end
+
 end

data/tasks/compile.rake

@@ -56,7 +56,7 @@ begin
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|
       gem.add_dependency 'jdbc-mysql', '>=5.0.4'
-      gem.add_dependency 'do_jdbc',    '0.10.8'
+      gem.add_dependency 'do_jdbc',    '0.10.9'
     end
   end
 rescue LoadError

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  hash: 39
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 10
-  - 8
-  version: 0.10.8
+  - 9
+  version: 0.10.9
 platform: x86-mswin32-60
 authors: 
 - Dirkjan Bussink
@@ -15,53 +14,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 Z
+date: 2011-03-29 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: data_objects
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
         segments: 
         - 0
         - 10
-        - 8
-        version: 0.10.8
-  name: data_objects
-  prerelease: false
-  type: :runtime
+        - 9
+        version: 0.10.9
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rspec
   version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 5
         version: "2.5"
-  name: rspec
-  prerelease: false
-  type: :development
   requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rake-compiler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 7
         version: "0.7"
-  name: rake-compiler
-  prerelease: false
-  type: :development
   requirement: *id003
 description: Implements the DataObjects API for MySQL
 email: d.bussink@gmail.com
@@ -117,6 +111,7 @@ files:
 - tasks/ssl.rake
 - lib/do_mysql/1.8/do_mysql.so
 - lib/do_mysql/1.9/do_mysql.so
+has_rdoc: true
 homepage: 
 licenses: []
 
@@ -125,13 +120,13 @@ post_install_message: |+
       ======================================================================================================
   
         You've installed the binary version of do_mysql.
-        It was built using MySQL version 5.1.60.
+        It was built using MySQL version 5.1.65.
         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/MySQL-5.0/mysql-noinstall-5.1.60-win32.zip/from/pick
+        http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-noinstall-5.1.65-win32.zip/from/pick
   
         You can put the lib\opt\libmysql.dll available in this package in your Ruby bin
         directory, for example C:\Ruby\bin
@@ -143,27 +138,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.8.14
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataObjects MySQL Driver