do_mysql 0.10.3-x86-mswin32-60 → 0.10.4.rc1-x86-mswin32-60

data/ext/do_mysql/extconf.rb

@@ -69,21 +69,19 @@ end
 have_func('localtime_r')
 have_func('gmtime_r')
 
-unless RUBY_PLATFORM =~ /mswin|mingw/
-  have_header 'mysql.h'
-  have_const 'MYSQL_TYPE_STRING', 'mysql.h'
-  have_const 'MYSQL_TYPE_BIT', 'mysql.h'
-  have_const 'MYSQL_TYPE_NEWDECIMAL', 'mysql.h'
-  have_func 'mysql_query', 'mysql.h'
-  have_func 'mysql_ssl_set', 'mysql.h'
-  have_func 'mysql_sqlstate', 'mysql.h'
-  have_func 'mysql_get_ssl_cipher', 'mysql.h'
-  have_func 'mysql_set_character_set', 'mysql.h'
-  have_func 'mysql_get_server_version', 'mysql.h'
-  have_struct_member 'MYSQL_FIELD', 'charsetnr', 'mysql.h'
-end
+have_header 'mysql.h'
+have_const 'MYSQL_TYPE_STRING', 'mysql.h'
+have_const 'MYSQL_TYPE_BIT', 'mysql.h'
+have_const 'MYSQL_TYPE_NEWDECIMAL', 'mysql.h'
+have_func 'mysql_query', 'mysql.h'
+have_func 'mysql_ssl_set', 'mysql.h'
+have_func 'mysql_sqlstate', 'mysql.h'
+have_func 'mysql_get_ssl_cipher', 'mysql.h'
+have_func 'mysql_set_character_set', 'mysql.h'
+have_func 'mysql_get_server_version', 'mysql.h'
+have_struct_member 'MYSQL_FIELD', 'charsetnr', 'mysql.h'
 
-$CFLAGS << ' -Wall ' unless RUBY_PLATFORM =~ /mswin/
+$CFLAGS << ' -Wall '
 
 if RUBY_VERSION < '1.8.6'
   $CFLAGS << ' -DRUBY_LESS_THAN_186'

data/lib/do_mysql.rb

@@ -3,9 +3,14 @@ if RUBY_PLATFORM =~ /java/
   require 'do_jdbc'
   require 'java'
 
-  driver = 'com.mysql.jdbc.Driver'
+  module DataObjects
+    module Mysql
+      JDBC_DRIVER = 'com.mysql.jdbc.Driver'
+    end
+  end
+
   begin
-    java.lang.Thread.currentThread.getContextClassLoader().loadClass(driver, true)
+    java.lang.Thread.currentThread.getContextClassLoader().loadClass(DataObjects::Mysql::JDBC_DRIVER, true)
   rescue
     require 'jdbc/mysql' # the JDBC driver, packaged as a gem
   end
@@ -15,7 +20,7 @@ if RUBY_PLATFORM =~ /java/
   # Thread.currentThread.getContextClassLoader().loadClass() within the
   # data_objects.Connection Java class, which is currently not working as
   # expected.
-  java_import driver
+  java_import DataObjects::Mysql::JDBC_DRIVER
 
 end
 

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = '0.10.3'
+    VERSION = '0.10.4.rc1'
   end
 end

data/spec/command_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/command_spec'
+require 'data_objects/spec/shared/command_spec'
 
 describe DataObjects::Mysql::Command do
-  behaves_like 'a Command'
-  behaves_like 'a Command with async'
+  it_should_behave_like 'a Command'
+  it_should_behave_like 'a Command with async'
 end

data/spec/connection_spec.rb

@@ -1,26 +1,26 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/connection_spec'
+require 'data_objects/spec/shared/connection_spec'
 require 'cgi'
 
 describe DataObjects::Mysql::Connection do
 
-  before do
-    @driver   = CONFIG.scheme
-    @user     = CONFIG.user
+  before :all do
+    @driver = CONFIG.scheme
+    @user   = CONFIG.user
     @password = CONFIG.pass
-    @host     = CONFIG.host
-    @port     = CONFIG.port
+    @host   = CONFIG.host
+    @port   = CONFIG.port
     @database = CONFIG.database
-    @ssl      = CONFIG.ssl
+    @ssl    = CONFIG.ssl
   end
 
-  behaves_like 'a Connection'
-  behaves_like 'a Connection with authentication support'
-  # FIXME: behaves_like 'a Connection with JDBC URL support' if JRUBY
-  behaves_like 'a Connection with SSL support' unless JRUBY
-  behaves_like 'a Connection via JDNI' if JRUBY
+  it_should_behave_like 'a Connection'
+  it_should_behave_like 'a Connection with authentication support'
+  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
 
   if DataObjectsSpecHelpers.test_environment_supports_ssl?
 
@@ -28,22 +28,22 @@ describe DataObjects::Mysql::Connection do
 
       it 'should raise an error when passed ssl=true' do
         lambda { DataObjects::Connection.new("#{CONFIG.uri}?ssl=true") }.
-          should.raise(ArgumentError)
+          should raise_error(ArgumentError)
       end
 
       it 'should raise an error when passed a nonexistent client certificate' do
         lambda { DataObjects::Connection.new("#{CONFIG.uri}?ssl[client_cert]=nonexistent") }.
-          should.raise(ArgumentError)
+          should raise_error(ArgumentError)
       end
 
       it 'should raise an error when passed a nonexistent client key' do
         lambda { DataObjects::Connection.new("#{CONFIG.uri}?ssl[client_key]=nonexistent") }.
-          should.raise(ArgumentError)
+          should raise_error(ArgumentError)
       end
 
       it 'should raise an error when passed a nonexistent ca certificate' do
         lambda { DataObjects::Connection.new("#{CONFIG.uri}?ssl[ca_cert]=nonexistent") }.
-          should.raise(ArgumentError)
+          should raise_error(ArgumentError)
       end
 
       it 'should connect with a specified SSL cipher' do
@@ -53,7 +53,7 @@ describe DataObjects::Mysql::Connection do
 
       it 'should raise an error with an invalid SSL cipher' do
         lambda { DataObjects::Connection.new("#{CONFIG.uri}?#{CONFIG.ssl}&ssl[cipher]=invalid") }.
-          should.raise
+          should raise_error
       end
 
     end

data/spec/encoding_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/encoding_spec'
+require 'data_objects/spec/shared/encoding_spec'
 
 describe DataObjects::Mysql::Connection do
-  behaves_like 'a driver supporting different encodings'
-  behaves_like 'returning correctly encoded strings for the default database encoding'
-  behaves_like 'returning correctly encoded strings for the default internal encoding'
+  it_should_behave_like 'a driver supporting different encodings'
+  it_should_behave_like 'returning correctly encoded strings for the default database encoding'
+  it_should_behave_like 'returning correctly encoded strings for the default internal encoding'
 end

data/spec/error/sql_error_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/error/sql_error_spec'
+require 'data_objects/spec/shared/error/sql_error_spec'
 
 describe 'DataObjects::Mysql raising SQLError' do
-  behaves_like 'raising a SQLError'
+  it_should_behave_like 'raising a SQLError'
 end

data/spec/reader_spec.rb

@@ -1,8 +1,34 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/reader_spec'
+require 'data_objects/spec/shared/reader_spec'
 
 describe DataObjects::Mysql::Reader do
-  behaves_like 'a Reader'
+  it_should_behave_like 'a Reader'
+
+  describe 'reading database metadata' do
+
+    subject { reader }
+
+    let(:connection) { DataObjects::Connection.new(CONFIG.uri) }
+    let(:command)    { connection.create_command(sql) }
+    let(:reader)     { command.execute_reader }
+
+    after do
+      reader.close
+      connection.close
+    end
+
+    describe 'showing correct column field names for a table' do
+      let(:sql)     { 'SHOW COLUMNS FROM `widgets`' }
+      its(:fields)  { should == [ "Field", "Type", "Null", "Key", "Default", "Extra" ] }
+    end
+
+    describe 'showing correct column field names for variables' do
+      let(:sql)     { "SHOW VARIABLES LIKE 'character_set_connection'" }
+      its(:fields)  { should == [ 'Variable_name', 'Value' ] }
+    end
+
+  end
+
 end

data/spec/result_spec.rb

@@ -1,17 +1,17 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/result_spec'
+require 'data_objects/spec/shared/result_spec'
 
 # splitting the descibe into two separate declaration avoids
-# concurrent execution of the "behaves_like ....."
+# concurrent execution of the "it_should_behave_like ....."
 # needed by some databases (sqlite3)
 
 describe DataObjects::Mysql::Result do
-  behaves_like 'a Result'
+  it_should_behave_like 'a Result'
 end
 
 describe DataObjects::Mysql::Result do
-  behaves_like 'a Result which returns inserted key with sequences'
-  behaves_like 'a Result which returns nil without sequences'
+  it_should_behave_like 'a Result which returns inserted key with sequences'
+  it_should_behave_like 'a Result which returns nil without sequences'
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $TESTING=true
 JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
+require 'rspec'
 require 'date'
 require 'ostruct'
 require 'fileutils'
@@ -19,13 +20,15 @@ repo_root = File.expand_path('../../..', __FILE__)
 end
 
 require 'data_objects'
-require 'data_objects/spec/bacon'
-require 'data_objects/spec/helpers/ssl'
+require 'data_objects/spec/setup'
+require 'data_objects/spec/lib/ssl'
+require 'data_objects/spec/lib/pending_helpers'
 require 'do_mysql'
 
 DataObjects::Mysql.logger = DataObjects::Logger.new(STDOUT, :off)
 at_exit { DataObjects.logger.flush }
 
+
 CONFIG = OpenStruct.new
 CONFIG.scheme   = 'mysql'
 CONFIG.user     = ENV['DO_MYSQL_USER'] || 'root'
@@ -40,8 +43,11 @@ CONFIG.port     = ENV['DO_MYSQL_PORT'] || '3306'
 CONFIG.database = ENV['DO_MYSQL_DATABASE'] || '/do_test'
 CONFIG.ssl      = SSLHelpers.query(:ca_cert, :client_cert, :client_key)
 
-CONFIG.uri = ENV["DO_MYSQL_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user_info}#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
-CONFIG.sleep = "SELECT sleep(1)"
+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.jdbc_uri     = "jdbc:#{CONFIG.uri}"
+CONFIG.sleep        = "SELECT sleep(1)"
 
 module DataObjectsSpecHelpers
 
@@ -218,4 +224,7 @@ module DataObjectsSpecHelpers
 
 end
 
-include DataObjectsSpecHelpers
+RSpec.configure do |config|
+  config.include(DataObjectsSpecHelpers)
+  config.include(DataObjects::Spec::PendingHelpers)
+end

data/spec/typecast/array_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/array_spec'
+require 'data_objects/spec/shared/typecast/array_spec'
 
 describe 'DataObjects::Mysql with Array' do
-  behaves_like 'supporting Array'
+  it_should_behave_like 'supporting Array'
 end

data/spec/typecast/bigdecimal_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/bigdecimal_spec'
+require 'data_objects/spec/shared/typecast/bigdecimal_spec'
 
 describe 'DataObjects::Mysql with BigDecimal' do
-  behaves_like 'supporting BigDecimal'
-  behaves_like 'supporting BigDecimal autocasting'
+  it_should_behave_like 'supporting BigDecimal'
+  it_should_behave_like 'supporting BigDecimal autocasting'
 end

data/spec/typecast/boolean_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/boolean_spec'
+require 'data_objects/spec/shared/typecast/boolean_spec'
 
 describe 'DataObjects::Mysql with Boolean' do
-  behaves_like 'supporting Boolean'
-  behaves_like 'supporting Boolean autocasting'
+  it_should_behave_like 'supporting Boolean'
+  it_should_behave_like 'supporting Boolean autocasting'
 end

data/spec/typecast/byte_array_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/byte_array_spec'
+require 'data_objects/spec/shared/typecast/byte_array_spec'
 
 describe 'DataObjects::Mysql with ByteArray' do
-  behaves_like 'supporting ByteArray'
+  it_should_behave_like 'supporting ByteArray'
 end

data/spec/typecast/class_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/class_spec'
+require 'data_objects/spec/shared/typecast/class_spec'
 
 describe 'DataObjects::Mysql with Class' do
-  behaves_like 'supporting Class'
+  it_should_behave_like 'supporting Class'
 end

data/spec/typecast/date_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/date_spec'
+require 'data_objects/spec/shared/typecast/date_spec'
 
 describe 'DataObjects::Mysql with Date' do
-  behaves_like 'supporting Date'
-  behaves_like 'supporting Date autocasting'
+  it_should_behave_like 'supporting Date'
+  it_should_behave_like 'supporting Date autocasting'
 end

data/spec/typecast/datetime_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/datetime_spec'
+require 'data_objects/spec/shared/typecast/datetime_spec'
 
 describe 'DataObjects::Mysql with DateTime' do
-  behaves_like 'supporting DateTime'
-  behaves_like 'supporting DateTime autocasting'
+  it_should_behave_like 'supporting DateTime'
+  it_should_behave_like 'supporting DateTime autocasting'
 end

data/spec/typecast/float_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/float_spec'
+require 'data_objects/spec/shared/typecast/float_spec'
 
 describe 'DataObjects::Mysql with Float' do
-  behaves_like 'supporting Float'
-  behaves_like 'supporting Float autocasting'
+  it_should_behave_like 'supporting Float'
+  it_should_behave_like 'supporting Float autocasting'
 end

data/spec/typecast/integer_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/integer_spec'
+require 'data_objects/spec/shared/typecast/integer_spec'
 
 describe 'DataObjects::Mysql with Integer' do
-  behaves_like 'supporting Integer'
+  it_should_behave_like 'supporting Integer'
 end

data/spec/typecast/nil_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/nil_spec'
+require 'data_objects/spec/shared/typecast/nil_spec'
 
 describe 'DataObjects::Mysql with Nil' do
-  behaves_like 'supporting Nil'
-  behaves_like 'supporting writing an Nil'
-  behaves_like 'supporting Nil autocasting'
+  it_should_behave_like 'supporting Nil'
+  it_should_behave_like 'supporting writing an Nil'
+  it_should_behave_like 'supporting Nil autocasting'
 end

data/spec/typecast/other_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/other_spec'
+require 'data_objects/spec/shared/typecast/other_spec'
 
 describe 'DataObjects::H2 with other (unknown) type' do
-  behaves_like 'supporting other (unknown) type'
+  it_should_behave_like 'supporting other (unknown) type'
 end