do_mysql 0.9.11 → 0.9.12

data/ext/do_mysql_ext/extconf.rb

@@ -32,6 +32,7 @@ end
 # ruby extconf.rb --with-mysql-config=/path/to/mysql_config
 if RUBY_PLATFORM =~ /mswin|mingw/
   dir_config('mysql')
+  have_header 'my_global.h'
   have_header 'mysql.h' || exit(1)
   have_library 'libmysql' || exit(1)
   have_func('mysql_query', 'mysql.h') || exit(1)

data/lib/do_mysql.rb

@@ -30,8 +30,11 @@ if RUBY_PLATFORM =~ /java/
 
         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
-          "utf8"
+          reader = self.create_command("SHOW VARIABLES LIKE 'character_set_client'").execute_reader
+          reader.next!
+          char_set = reader.values[1]
+          reader.close
+          char_set.downcase
         end
 
       end

data/lib/do_mysql/version.rb

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

data/spec/command_spec.rb

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

data/spec/connection_spec.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/connection_spec'
+
+describe DataObjects::Mysql::Connection do
+
+  before :all do
+    @driver = CONFIG.scheme
+    @user   = CONFIG.user
+    @password = CONFIG.pass
+    @host   = CONFIG.host
+    @port   = CONFIG.port
+    @database = CONFIG.database
+  end
+
+  it_should_behave_like 'a Connection'
+  #it_should_behave_like 'a Connection with authentication support'
+end

data/spec/encoding_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/encoding_spec'
+
+describe DataObjects::Mysql::Connection do
+  it_should_behave_like 'a driver supporting encodings'
+end

data/spec/lib/rspec_immediate_feedback_formatter.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'data_objects', 'spec', 'lib', 'rspec_immediate_feedback_formatter'))

data/spec/reader_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/reader_spec'
+
+describe DataObjects::Mysql::Reader do
+  it_should_behave_like 'a Reader'
+end

data/spec/result_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/result_spec'
+
+describe DataObjects::Mysql::Result do
+  it_should_behave_like 'a Result'
+  it_should_behave_like 'a Result which returns inserted keys'
+end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
 
-gem 'rspec', '>=1.1.3'
+gem 'rspec', '>1.1.12'
 require 'spec'
 
 require 'date'
@@ -16,6 +16,9 @@ require 'fileutils'
 $:.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 }
+
 if JRUBY
   $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
   require 'do_jdbc'
@@ -32,57 +35,39 @@ DataObjects::Mysql.logger = DataObjects::Logger.new(log_path, :debug)
 
 at_exit { DataObjects.logger.flush }
 
-MYSQL = OpenStruct.new
-MYSQL.user = ENV['DO_MYSQL_USER'] || 'root'
-MYSQL.pass = ENV['DO_MYSQL_PASS'] || ''
-MYSQL.host = ENV['DO_MYSQL_HOST'] || '127.0.0.1'
-MYSQL.hostname = ENV['DO_MYSQL_HOSTNAME'] || 'localhost'
-MYSQL.port     = ENV['DO_MYSQL_PORT'] || '3306'
-MYSQL.database = ENV['DO_MYSQL_DATABASE'] || 'do_mysql_test'
-MYSQL.socket   = ENV['DO_MYSQL_SOCKET'] || '/tmp/mysql.sock'
-
-DO_MYSQL_SPEC_URI = Addressable::URI::parse(ENV["DO_MYSQL_SPEC_URI"] ||
-                    "mysql://#{MYSQL.user}:#{MYSQL.pass}@#{MYSQL.host}:#{MYSQL.port}/#{MYSQL.database}")
-
-module MysqlSpecHelpers
-  def insert(query, *args)
-    result = @secondary_connection.create_command(query).execute_non_query(*args)
-    result.insert_id
-  end
+Spec::Runner.configure do |config|
+  config.include(DataObjects::Spec::PendingHelpers)
+end
 
-  def exec(query, *args)
-    @secondary_connection.create_command(query).execute_non_query(*args)
-  end
+CONFIG = OpenStruct.new
+CONFIG.scheme   = 'mysql'
+CONFIG.user     = ENV['DO_MYSQL_USER'] || 'root'
+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'
 
-  def select(query, types = nil, *args)
-    begin
-      command = @connection.create_command(query)
-      command.set_types types unless types.nil?
-      reader = command.execute_reader(*args)
-      reader.next!
-      yield reader if block_given?
-    ensure
-      reader.close if reader
-    end
-  end
+CONFIG.uri = ENV["DO_MYSQL_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
+CONFIG.sleep = "SELECT sleep(1)"
+
+module DataObjectsSpecHelpers
 
   def setup_test_environment
-    @connection = DataObjects::Connection.new(DO_MYSQL_SPEC_URI)
-    @secondary_connection = DataObjects::Connection.new(DO_MYSQL_SPEC_URI)
+    conn = DataObjects::Connection.new(CONFIG.uri)
 
-    @connection.create_command(<<-EOF).execute_non_query
+    conn.create_command(<<-EOF).execute_non_query
       DROP TABLE IF EXISTS `invoices`
     EOF
 
-    @connection.create_command(<<-EOF).execute_non_query
+    conn.create_command(<<-EOF).execute_non_query
       DROP TABLE IF EXISTS `users`
     EOF
 
-    @connection.create_command(<<-EOF).execute_non_query
+    conn.create_command(<<-EOF).execute_non_query
       DROP TABLE IF EXISTS `widgets`
     EOF
 
-    @connection.create_command(<<-EOF).execute_non_query
+    conn.create_command(<<-EOF).execute_non_query
       CREATE TABLE `users` (
         `id` int(11) NOT NULL auto_increment,
         `name` varchar(200) default 'Billy' NULL,
@@ -91,7 +76,7 @@ module MysqlSpecHelpers
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
     EOF
 
-    @connection.create_command(<<-EOF).execute_non_query
+    conn.create_command(<<-EOF).execute_non_query
       CREATE TABLE `invoices` (
         `id` int(11) NOT NULL auto_increment,
         `invoice_number` varchar(50) NOT NULL,
@@ -99,7 +84,7 @@ module MysqlSpecHelpers
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
     EOF
 
-    @connection.create_command(<<-EOF).execute_non_query
+    conn.create_command(<<-EOF).execute_non_query
       CREATE TABLE `widgets` (
         `id` int(11) NOT NULL auto_increment,
         `code` char(8) default 'A14' NULL,
@@ -116,7 +101,7 @@ module MysqlSpecHelpers
         `number_sold` mediumint default 0,
         `super_number` bigint default 9223372036854775807,
         `weight` float default 1.23,
-        `cost1` double(8,2) default 10.23,
+        `cost1` double default 10.23,
         `cost2` decimal(8,2) default 50.23,
         `release_date` date default '2008-02-14',
         `release_datetime` datetime default '2008-02-14 00:31:12',
@@ -127,15 +112,21 @@ module MysqlSpecHelpers
     EOF
 
     1.upto(16) do |n|
-      @connection.create_command(<<-EOF).execute_non_query
-        insert into widgets(code, name, shelf_location, description, image_data, ad_description, ad_image, whitepaper_text, cad_drawing, super_number) VALUES ('W#{n.to_s.rjust(7,"0")}', 'Widget #{n}', 'A14', 'This is a description', 'IMAGE DATA', 'Buy this product now!', 'AD IMAGE DATA', 'Utilizing blah blah blah', 'CAD DRAWING', 1234);
+      conn.create_command(<<-EOF).execute_non_query
+        insert into widgets(code, name, shelf_location, description, image_data, ad_description, ad_image, whitepaper_text, cad_drawing, super_number, weight) VALUES ('W#{n.to_s.rjust(7,"0")}', 'Widget #{n}', 'A14', 'This is a description', 'IMAGE DATA', 'Buy this product now!', 'AD IMAGE DATA', 'String', 'CAD \001 \000 DRAWING', 1234, 13.4);
       EOF
     end
 
-  end
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set flags = 1 where id = 2
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set ad_description = NULL where id = 3
+    EOF
+
+    conn.close
 
-  def teardown_test_environment
-    @connection.close
-    @secondary_connection.close
   end
+
 end

data/spec/typecast/array_spec.rb

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

data/spec/typecast/bigdecimal_spec.rb

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

data/spec/typecast/boolean_spec.rb

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

data/spec/typecast/byte_array_spec.rb

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

data/spec/typecast/class_spec.rb

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

data/spec/typecast/date_spec.rb

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

data/spec/typecast/datetime_spec.rb

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

data/spec/typecast/float_spec.rb

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

data/spec/typecast/integer_spec.rb

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

data/spec/typecast/nil_spec.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/nil_spec'
+
+describe 'DataObjects::Mysql with Nil' do
+  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/range_spec.rb

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

data/spec/typecast/string_spec.rb

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

data/spec/typecast/time_spec.rb

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

data/tasks/gem.rake

@@ -0,0 +1,60 @@
+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_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"]

data/tasks/install.rake

@@ -0,0 +1,15 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+# Installation
+
+desc "Install #{GEM_SPEC.name} #{GEM_SPEC.version}"
+task :install => [ :package ] do
+  sudo_gem "install pkg/#{GEM_SPEC.name}-#{GEM_SPEC.version} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_SPEC.name} #{GEM_SPEC.version}"
+task :uninstall => [ :clean ] do
+  sudo_gem "uninstall #{GEM_SPEC.name} -v#{GEM_SPEC.version} -I -x"
+end