do_mysql 0.9.12-x86-mswin32-60 → 0.10.0-x86-mswin32-60

data/ext/do_mysql_ext/extconf.rb

@@ -1,9 +1,4 @@
-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'
 

data/lib/do_mysql.rb

@@ -1,21 +1,30 @@
-require 'rubygems'
 require 'data_objects'
 if RUBY_PLATFORM =~ /java/
   require 'do_jdbc'
   require 'java'
-  gem 'jdbc-mysql'
-  require 'jdbc/mysql' # the JDBC driver, packaged as a gem
+
+  driver = 'com.mysql.jdbc.Driver'
+  begin
+    java.lang.Thread.currentThread.getContextClassLoader().loadClass(driver, true)
+  rescue
+    require 'jdbc/mysql' # the JDBC driver, packaged as a gem
+  end
+
+  # Another way of loading the JDBC Class. This seems to be more reliable
+  # than Class.forName() or
+  # Thread.currentThread.getContextClassLoader().loadClass() within the
+  # data_objects.Connection Java class, which is currently not working as
+  # expected.
+  java_import driver
+
 end
 
 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'))
+require 'do_mysql/version'
+require 'do_mysql/transaction'
+require 'do_mysql/encoding'
 
 if RUBY_PLATFORM =~ /java/
-  # Another way of loading the JDBC Class. This seems to be more reliable
-  # than Class.forName() within the data_objects.Connection Java class,
-  # which is currently not working as expected.
-  import 'com.mysql.jdbc.Driver'
 
   module DataObjects
     module Mysql
@@ -28,15 +37,9 @@ if RUBY_PLATFORM =~ /java/
           @using_socket
         end
 
-        def character_set
-          # JDBC API does not provide an easy way to get the current character set
-          reader = self.create_command("SHOW VARIABLES LIKE 'character_set_client'").execute_reader
-          reader.next!
-          char_set = reader.values[1]
-          reader.close
-          char_set.downcase
+        def secure?
+          false
         end
-
       end
     end
   end

data/lib/do_mysql/encoding.rb

@@ -0,0 +1,38 @@
+module DataObjects
+  module Mysql
+    module Encoding
+      MAP = {
+        "Big5"         => "big5",
+        "CP850"        => "cp850",
+        "KOI8-R"       => "koi8r",
+        "ISO-8859-1"   => "latin1",
+        "ISO-8859-2"   => "latin2",
+        "US-ASCII"     => "ascii",
+        "EUC-JP"       => "ujis",
+        "SJIS"         => "sjis",
+        "ISO-8859-8"   => "hebrew",
+        "TIS-620"      => "tis620",
+        "EUC-KR"       => "euckr",
+        "KOI8-U"       => "koi8u",
+        "GB2312"       => "gb2312",
+        "ISO-8859-7"   => "greek",
+        "Windows-1250" => "cp1250",
+        "GBK"          => "gbk",
+        "ISO-8859-9"   => "latin5",
+        "UTF-8"        => "utf8",
+        "UTF-16BE"     => "ucs2",
+        "IBM866"       => "cp866",
+        "macCentEuro"  => "macce",
+        "macRoman"     => "macroman",
+        "CP852"        => "cp852",
+        "ISO-8859-13"  => "latin7",
+        "Windows-1251" => "cp1251",
+        "Windows-1256" => "cp1256",
+        "Windows-1257" => "cp1257",
+        "ASCII-8BIT"   => "binary",
+        "Windows-31J"  => "cp932",
+        "eucJP-ms"     => "eucjpms"
+      }
+    end
+  end
+end

data/lib/do_mysql/transaction.rb

@@ -5,27 +5,16 @@ module DataObjects
 
     class Transaction < DataObjects::Transaction
 
-      def finalize_transaction
-        cmd = "XA END '#{id}'"
-        connection.create_command(cmd).execute_non_query
-      end
-
-      def begin
+      def begin_prepared
         cmd = "XA START '#{id}'"
         connection.create_command(cmd).execute_non_query
       end
 
-      def commit
+      def commit_prepared
         cmd = "XA COMMIT '#{id}'"
         connection.create_command(cmd).execute_non_query
       end
 
-      def rollback
-        finalize_transaction
-        cmd = "XA ROLLBACK '#{id}'"
-        connection.create_command(cmd).execute_non_query
-      end
-
       def rollback_prepared
         cmd = "XA ROLLBACK '#{id}'"
         connection.create_command(cmd).execute_non_query
@@ -37,6 +26,13 @@ module DataObjects
         connection.create_command(cmd).execute_non_query
       end
 
+      private
+
+      def finalize_transaction
+        cmd = "XA END '#{id}'"
+        connection.create_command(cmd).execute_non_query
+      end
+
     end
 
   end

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = "0.9.12"
+    VERSION = "0.10.0"
   end
 end

data/spec/connection_spec.rb

@@ -2,6 +2,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/connection_spec'
+require 'cgi'
 
 describe DataObjects::Mysql::Connection do
 
@@ -12,8 +13,49 @@ describe DataObjects::Mysql::Connection do
     @host   = CONFIG.host
     @port   = CONFIG.port
     @database = CONFIG.database
+    @ssl    = CONFIG.ssl
   end
 
   it_should_behave_like 'a Connection'
-  #it_should_behave_like 'a Connection with authentication support'
+  it_should_behave_like 'a Connection with authentication support'
+  it_should_behave_like 'a Connection with SSL support' unless JRUBY
+
+  if DataObjectsSpecHelpers.test_environment_supports_ssl?
+
+    describe 'connecting with SSL' do
+
+      it 'should raise an error when passed ssl=true' do
+        lambda { DataObjects::Connection.new("#{CONFIG.uri}?ssl=true") }.
+          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_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_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_error(ArgumentError)
+      end
+
+      it 'should connect with a specified SSL cipher' do
+        DataObjects::Connection.new("#{CONFIG.uri}?#{CONFIG.ssl}&ssl[cipher]=#{SSLHelpers::CONFIG.cipher}").
+          ssl_cipher.should == SSLHelpers::CONFIG.cipher
+      end
+
+      it 'should raise an error with an invalid SSL cipher' do
+        lambda { DataObjects::Connection.new("#{CONFIG.uri}?#{CONFIG.ssl}&ssl[cipher]=invalid") }.
+          should raise_error
+      end
+
+    end
+
+  end
+
 end

data/spec/result_spec.rb

@@ -3,7 +3,14 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/result_spec'
 
+# splitting the descibe into two separate declaration avoids
+# concurrent execution of the "it_should_behave_like ....."
+# needed by some databases (sqlite3)
+
 describe DataObjects::Mysql::Result do
   it_should_behave_like 'a Result'
+end
+
+describe DataObjects::Mysql::Result do
   it_should_behave_like 'a Result which returns inserted keys'
 end

data/spec/spec_helper.rb

@@ -11,21 +11,25 @@ require 'ostruct'
 require 'pathname'
 require 'fileutils'
 
+dir = File.dirname(__FILE__)
+lib_path = File.expand_path("#{dir}/../lib")
+$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 # put data_objects from repository in the load path
 # DO NOT USE installed gem of data_objects!
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data_objects', 'lib'))
-require 'data_objects'
-
-DATAOBJECTS_SPEC_ROOT = Pathname(__FILE__).dirname.parent.parent + 'data_objects' + 'spec'
-Pathname.glob((DATAOBJECTS_SPEC_ROOT + 'lib/**/*.rb').to_s).each { |f| require f }
+do_lib_path = File.expand_path("#{dir}/../../data_objects/lib")
+$LOAD_PATH.unshift do_lib_path unless $LOAD_PATH.include?(do_lib_path)
 
 if JRUBY
-  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
+  jdbc_lib_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
+  $LOAD_PATH.unshift jdbc_lib_path unless $LOAD_PATH.include?(jdbc_lib_path)
   require 'do_jdbc'
 end
 
-# put the pre-compiled extension in the path to be found
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'data_objects'
+
+DATAOBJECTS_SPEC_ROOT = Pathname(__FILE__).dirname.parent.parent + 'data_objects' + 'spec'
+Pathname.glob((DATAOBJECTS_SPEC_ROOT + 'lib/**/*.rb').to_s).each { |f| require f }
+
 require 'do_mysql'
 
 log_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'do.log'))
@@ -46,6 +50,7 @@ CONFIG.pass     = ENV['DO_MYSQL_PASS'] || ''
 CONFIG.host     = ENV['DO_MYSQL_HOST'] || 'localhost'
 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}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
 CONFIG.sleep = "SELECT sleep(1)"
@@ -96,7 +101,7 @@ module DataObjectsSpecHelpers
         `ad_image` mediumblob NULL,
         `whitepaper_text` longtext NULL,
         `cad_drawing` longblob NULL,
-        `flags` tinyint(1) default 0,
+        `flags` boolean default false,
         `number_in_stock` smallint default 500,
         `number_sold` mediumint default 0,
         `super_number` bigint default 9223372036854775807,
@@ -105,7 +110,7 @@ module DataObjectsSpecHelpers
         `cost2` decimal(8,2) default 50.23,
         `release_date` date default '2008-02-14',
         `release_datetime` datetime default '2008-02-14 00:31:12',
-        `release_timestamp` timestamp default '2008-02-14 00:31:31',
+        `release_timestamp` timestamp NULL default '2008-02-14 00:31:31',
         `status` enum('active','out of stock') NOT NULL default 'active',
         PRIMARY KEY  (`id`)
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -118,15 +123,106 @@ module DataObjectsSpecHelpers
     end
 
     conn.create_command(<<-EOF).execute_non_query
-      update widgets set flags = 1 where id = 2
+      update widgets set flags = true where id = 2
     EOF
 
     conn.create_command(<<-EOF).execute_non_query
       update widgets set ad_description = NULL where id = 3
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set flags = NULL where id = 4
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set cost1 = NULL where id = 5
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set cost2 = NULL where id = 6
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_date = NULL where id = 7
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_datetime = NULL where id = 8
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_timestamp = NULL where id = 9
+    EOF
+
     conn.close
 
   end
 
+  def self.test_environment_ssl_config
+    ssl_config = SSLHelpers::CONFIG
+
+    message =  "\nYou can configure MySQL via my.cnf with the following options in [mysqld]:\n"
+    message << "ssl_ca=#{ssl_config.ca_cert}\n"
+    message << "ssl_cert=#{ssl_config.server_cert}\n"
+    message << "ssl_key=#{ssl_config.server_key}\n"
+    message << "ssl_cipher=#{ssl_config.cipher}\n"
+
+    message << "\nOr you can use the following command line options:\n"
+    message << "--ssl-ca #{ssl_config.ca_cert} "
+    message << "--ssl-cert #{ssl_config.server_cert} "
+    message << "--ssl-key #{ssl_config.server_key} "
+    message << "--ssl-cipher #{ssl_config.cipher} "
+    message
+  end
+
+  def self.test_environment_ssl_config_errors
+    conn = DataObjects::Connection.new(CONFIG.uri)
+
+    ssl_variables = conn.create_command(<<-EOF).execute_reader
+      SHOW VARIABLES LIKE '%ssl%'
+    EOF
+
+    ssl_config = SSLHelpers::CONFIG
+    current_config = { }
+
+    while ssl_variables.next!
+      variable, value = ssl_variables.values
+      current_config[variable.intern] = value
+    end
+
+    errors = []
+
+    if current_config[:have_ssl] == 'NO'
+      errors << "SSL was not compiled"
+    end
+
+    if current_config[:have_ssl] == 'DISABLED'
+      errors << "SSL was not enabled"
+    end
+
+    if current_config[:ssl_ca] != ssl_config.ca_cert
+      errors << "The CA certificate is not configured (it was set to '#{current_config[:ssl_ca]}')"
+    end
+
+    if current_config[:ssl_cert] != ssl_config.server_cert
+      errors << "The server certificate is not configured (it was set to '#{current_config[:ssl_cert]}')"
+    end
+
+    if current_config[:ssl_key] != ssl_config.server_key
+      errors << "The server key is not configured, (it was set to '#{current_config[:ssl_key]}')"
+    end
+
+    if current_config[:ssl_cipher] != ssl_config.cipher
+      errors << "The cipher is not configured, (it was set to '#{current_config[:ssl_cipher]}')"
+    end
+
+    errors
+  ensure
+    conn.close if conn
+  end
+
+  def self.test_environment_supports_ssl?
+    test_environment_ssl_config_errors.empty?
+  end
+
 end

data/tasks/gem.rake

@@ -1,60 +1,8 @@
 require 'rubygems/package_task'
 
-GEM_SPEC = Gem::Specification.new do |s|
-  # basic information
-  s.name        = "do_mysql"
-  s.version     = DataObjects::Mysql::VERSION
-
-  # description and details
-  s.summary     = 'DataObjects MySQL Driver'
-  s.description = "Implements the DataObjects API for MySQL"
-
-  # dependencies
-  s.add_dependency "addressable", "~>2.0.0"
-  s.add_dependency "extlib", "~>0.9.12"
-  s.add_dependency "data_objects", DataObjects::Mysql::VERSION
-
-  if JRUBY
-    s.add_dependency "jdbc-mysql", ">=5.0.4"
-    s.add_dependency "do_jdbc", DataObjects::Mysql::VERSION
-    s.platform = "java"
-    # components, files and paths
-    s.files = FileList["lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake",
-                        "LICENSE", "Rakefile", "*.{rdoc,txt,yml}", "lib/*.jar"]
-  else
-    s.platform    = Gem::Platform::RUBY
-    s.extensions << 'ext/do_mysql_ext/extconf.rb'
-    s.files = FileList["lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake", "ext/**/*.{rb,c}",
-                        "LICENSE", "Rakefile", "*.{rdoc,txt,yml}"]
-  end
-
-
-  # development dependencies
-  s.add_development_dependency 'rspec', '~>1.2.0'
-
-  s.require_path = 'lib'
-
-  # documentation
-  s.has_rdoc = false
-
-  # project information
-  s.homepage          = 'http://github.com/datamapper/do'
-  s.rubyforge_project = 'dorb'
-
-  # author and contributors
-  s.author      = 'Dirkjan Bussink'
-  s.email       = 'd.bussink@gmail.com'
-end
+GEM_SPEC = eval(File.read('do_mysql.gemspec'))
 
 gem_package = Gem::PackageTask.new(GEM_SPEC) do |pkg|
   pkg.need_tar = false
   pkg.need_zip = false
 end
-
-file "#{GEM_SPEC.name}.gemspec" => ['Rakefile', 'tasks/gem.rake'] do |t|
-  puts "Generating #{t.name}"
-  File.open(t.name, 'w') { |f| f.puts GEM_SPEC.to_yaml }
-end
-
-desc "Generate or update the standalone gemspec file for the project"
-task :gemspec => ["#{GEM_SPEC.name}.gemspec"]