do_mysql 0.9.11 → 0.9.12

data/tasks/native.rake

@@ -0,0 +1,31 @@
+begin
+  gem('rake-compiler')
+  require 'rake/extensiontask'
+
+  Rake::ExtensionTask.new('do_mysql_ext', GEM_SPEC) do |ext|
+
+    mysql_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', "mysql-#{BINARY_VERSION}-win32"))
+
+    # automatically add build options to avoid need of manual input
+    if RUBY_PLATFORM =~ /mswin|mingw/ then
+      ext.config_options << "--with-mysql-include=#{mysql_lib}/include"
+      ext.config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
+    else
+      ext.cross_compile = true
+      ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+      ext.cross_config_options << "--with-mysql-include=#{mysql_lib}/include"
+      ext.cross_config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
+    end
+
+  end
+rescue LoadError
+  warn "To cross-compile, install rake-compiler (gem install rake-compiler)"
+
+  if (tasks_dir = ROOT.parent + 'tasks').directory?
+    require tasks_dir + 'ext_helper'
+    require tasks_dir + 'ext_helper_java'
+
+    setup_c_extension("#{GEM_SPEC.name}_ext", GEM_SPEC)
+    setup_java_extension("#{GEM_SPEC.name}_ext", GEM_SPEC)
+  end
+end

data/tasks/release.rake

@@ -0,0 +1,75 @@
+begin
+  gem 'rubyforge', '~> 1.0.1'
+  require 'rubyforge'
+rescue Exception
+  nil
+end
+
+if defined?(RubyForge) then
+  if defined?(GEM_SPEC) then
+    desc 'Package and upload to RubyForge'
+    task :release => [:package] do |t|
+      ver = ENV['VERSION'] or fail "Must supply VERSION (rake release VERSION=x.y.z)."
+
+      # compare versions to avoid mistakes
+      unless ver == GEM_SPEC.version.to_s then
+        fail "Version mismatch (supplied and specification versions differ)."
+      end
+
+      # no rubyforge project? no release for you!
+      if GEM_SPEC.rubyforge_project == 'TODO' or GEM_SPEC.rubyforge_project.nil? then
+        fail "Must define rubyforge_project in your gem specification."
+      end
+
+      # instantiate a RubyForge object
+      rf = RubyForge.new
+
+      # read project info and overview
+      notes = begin
+                r = File.read("README.rdoc")
+                r.split(/^(=+ .*)/)[1..4].join.strip
+              rescue
+                warn "Missing README.rdoc"
+                ''
+              end
+
+      # read changes
+      changes = begin
+                  h = File.read("History.txt")
+                  h.split(/^(==+ .*)/)[1..2].join.strip
+                rescue
+                  warn "Missing History.txt"
+                  ''
+                end
+
+      # build the configuration for the release
+      config = Hash.new
+      config["release_notes"] = notes
+      config["release_changes"] = changes
+      config["preformatted"] = true
+
+      # prepare configuration
+      rf.configure config
+
+      files = FileList["pkg/#{GEM_SPEC.name}-#{GEM_SPEC.version}*.*"].to_a
+      fail "No files found for the release." if files.empty?
+
+      puts "Logging in RubyForge..."
+      rf.login
+
+      puts "Files to upload:"
+      files.each do |f|
+        puts "  * #{f}"
+      end
+
+      puts "Releasing #{GEM_SPEC.name} version #{GEM_SPEC.version}..."
+      rf.add_release GEM_SPEC.rubyforge_project, GEM_SPEC.name, GEM_SPEC.version, *files
+      puts "Done."
+    end
+    #Rake::Task['release'].prerequisites.unshift('clean', 'cross', 'native')
+  else
+    warn "no GEM_SPEC is found or defined. 'release' task cannot work without it."
+  end
+else
+  warn "rubyforge gem is required to generate releases, please install it (gem install rubyforge)."
+end

data/tasks/retrieve.rake

@@ -0,0 +1,67 @@
+begin
+  gem('rake-compiler')
+  require 'rake/clean'
+  require 'rake/extensioncompiler'
+
+  # download mysql library and headers
+  directory "vendor"
+
+  # only on Windows or cross platform compilation
+  def dlltool(dllname, deffile, libfile)
+    # define if we are using GCC or not
+    if Rake::ExtensionCompiler.mingw_gcc_executable then
+      dir = File.dirname(Rake::ExtensionCompiler.mingw_gcc_executable)
+      tool = case RUBY_PLATFORM
+        when /mingw/
+          File.join(dir, 'dlltool.exe')
+        when /linux|darwin/
+          File.join(dir, "#{Rake::ExtensionCompiler.mingw_host}-dlltool")
+      end
+      return "#{tool} --dllname #{dllname} --def #{deffile} --output-lib #{libfile}"
+    else
+      if RUBY_PLATFORM =~ /mswin/ then
+        tool = 'lib.exe'
+      else
+        fail "Unsupported platform for cross-compilation (please, contribute some patches)."
+      end
+      return "#{tool} /DEF:#{deffile} /OUT:#{libfile}"
+    end
+  end
+
+  file "vendor/mysql-noinstall-#{BINARY_VERSION}-win32.zip" => ['vendor'] do |t|
+    base_version = BINARY_VERSION.gsub(/\.[0-9]+$/, '')
+    url = "http://mysql.proserve.nl/Downloads/MySQL-#{base_version}/#{File.basename(t.name)}"
+    when_writing "downloading #{t.name}" do
+      cd File.dirname(t.name) do
+        sh "wget -c #{url} || curl -C - -O #{url}"
+      end
+    end
+  end
+
+  file "vendor/mysql-#{BINARY_VERSION}-win32/include/mysql.h" => ["vendor/mysql-noinstall-#{BINARY_VERSION}-win32.zip"] do |t|
+    full_file = File.expand_path(t.prerequisites.last)
+    when_writing "creating #{t.name}" do
+      cd "vendor" do
+        sh "unzip #{full_file} mysql-#{BINARY_VERSION}-win32/bin/** mysql-#{BINARY_VERSION}-win32/include/** mysql-#{BINARY_VERSION}-win32/lib/**"
+      end
+      # update file timestamp to avoid Rake perform this extraction again.
+      touch t.name
+    end
+  end
+
+  # clobber vendored packages
+  CLOBBER.include('vendor')
+
+  # vendor:mysql
+  task 'vendor:mysql' => ["vendor/mysql-#{BINARY_VERSION}-win32/include/mysql.h"]
+
+  # hook into cross compilation vendored mysql dependency
+  if RUBY_PLATFORM =~ /mingw|mswin/ then
+    Rake::Task['compile'].prerequisites.unshift 'vendor:mysql'
+  else
+    if Rake::Task.tasks.map {|t| t.name }.include? 'cross'
+      Rake::Task['cross'].prerequisites.unshift 'vendor:mysql'
+    end
+  end
+rescue LoadError
+end

data/tasks/spec.rake

@@ -0,0 +1,18 @@
+# Specs
+require 'spec/rake/spectask'
+
+desc 'Run specifications'
+Spec::Rake::SpecTask.new(:spec => [ :clean, :compile ]) do |t|
+  t.spec_opts << '--options' << ROOT + 'spec/spec.opts'
+  t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb').map { |f| f.to_s }
+
+  begin
+    # RCov is run by default, except on the JRuby platform
+    t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+    t.rcov_opts << '--exclude' << 'spec'
+    t.rcov_opts << '--text-summary'
+    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+  rescue Exception
+    # rcov not installed
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -9,9 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 +01:00
+date: 2009-05-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: addressable
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: extlib
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.12
+    version: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
   type: :runtime
@@ -20,60 +40,72 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.11
+        version: 0.9.12
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.2.0
     version: 
-description: A DataObject.rb driver for MySQL
-email: 
-- d.bussink@gmail.com
+description: Implements the DataObjects API for MySQL
+email: d.bussink@gmail.com
 executables: []
 
 extensions: 
 - ext/do_mysql_ext/extconf.rb
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- History.txt
-- LICENSE
-- Manifest.txt
-- README.txt
-- Rakefile
-- buildfile
-- ext-java/src/main/java/DoMysqlExtService.java
-- ext-java/src/main/java/do_mysql/MySqlDriverDefinition.java
-- ext/.gitignore
-- ext/do_mysql_ext/do_mysql_ext.c
-- ext/do_mysql_ext/extconf.rb
-- lib/do_mysql.rb
 - lib/do_mysql/transaction.rb
 - lib/do_mysql/version.rb
-- spec/integration/do_mysql_spec.rb
-- spec/integration/logging_spec.rb
-- spec/integration/quoting_spec.rb
-- spec/spec.opts
+- lib/do_mysql.rb
+- spec/command_spec.rb
+- spec/connection_spec.rb
+- spec/encoding_spec.rb
+- spec/lib/rspec_immediate_feedback_formatter.rb
+- spec/reader_spec.rb
+- spec/result_spec.rb
 - spec/spec_helper.rb
-- spec/unit/transaction_spec.rb
-has_rdoc: false
-homepage: http://rubyforge.org/projects/dorb
-post_install_message: 
-rdoc_options: 
-- --main
+- spec/typecast/array_spec.rb
+- spec/typecast/bigdecimal_spec.rb
+- spec/typecast/boolean_spec.rb
+- spec/typecast/byte_array_spec.rb
+- spec/typecast/class_spec.rb
+- spec/typecast/date_spec.rb
+- spec/typecast/datetime_spec.rb
+- spec/typecast/float_spec.rb
+- spec/typecast/integer_spec.rb
+- spec/typecast/nil_spec.rb
+- spec/typecast/range_spec.rb
+- spec/typecast/string_spec.rb
+- spec/typecast/time_spec.rb
+- tasks/gem.rake
+- tasks/install.rake
+- tasks/native.rake
+- tasks/release.rake
+- tasks/retrieve.rake
+- tasks/spec.rake
+- ext/do_mysql_ext/extconf.rb
+- ext/do_mysql_ext/do_mysql_ext.c
+- LICENSE
+- Rakefile
+- History.txt
+- Manifest.txt
 - README.txt
+has_rdoc: true
+homepage: http://github.com/datamapper/do
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -89,9 +121,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
-summary: A DataObject.rb driver for MySQL
+specification_version: 3
+summary: DataObjects MySQL Driver
 test_files: []
 

data/buildfile

@@ -1,27 +0,0 @@
-# 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-2009'
-
-  compile.using :target => '1.5', :lint => 'all', :deprecation => 'true'
-
-  define 'ext-java' do
-    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.into(TARGET_DIR).with(JDBC_SUPPORT)
-  end
-end

data/ext-java/src/main/java/DoMysqlExtService.java

@@ -1,23 +0,0 @@
-import data_objects.drivers.DriverDefinition;
-import do_mysql.MySqlDriverDefinition;
-
-public class DoMysqlExtService extends AbstractDataObjectsExtService {
-
-    private final static DriverDefinition driver = new MySqlDriverDefinition();
-    public final static String RUBY_MODULE_NAME = "Mysql";
-    public final static String RUBY_ERROR_NAME = "MysqlError";
-
-    public String getModuleName() {
-        return RUBY_MODULE_NAME;
-    }
-
-    @Override
-    public String getErrorName() {
-        return RUBY_ERROR_NAME;
-    }
-
-    public DriverDefinition getDriverDefinition() {
-        return driver;
-    }
-
-}

data/ext-java/src/main/java/do_mysql/MySqlDriverDefinition.java

@@ -1,22 +0,0 @@
-package do_mysql;
-
-import data_objects.drivers.AbstractDriverDefinition;
-
-public class MySqlDriverDefinition extends AbstractDriverDefinition {
-
-    public boolean supportsJdbcGeneratedKeys()
-    {
-        return true;
-    }
-
-    //@Override
-    public String quoteString(String str) {
-        StringBuffer quotedValue = new StringBuffer(str.length() + 2);
-        quotedValue.append("\'");
-        quotedValue.append(str.replaceAll("'", "\\\\'"));
-        // TODO: handle backslashes
-        quotedValue.append("\'");
-        return quotedValue.toString();
-    }
-
-}

data/ext/.gitignore

@@ -1,2 +0,0 @@
-Makefile
-mkmf.log

data/spec/integration/do_mysql_spec.rb

@@ -1,341 +0,0 @@
-# encoding: utf-8
-
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
-
-describe DataObjects::Mysql do
-  include MysqlSpecHelpers
-
-  before :each do
-    setup_test_environment
-  end
-
-  after :each do
-    teardown_test_environment
-  end
-
-  it "should expose the proper DataObjects classes" do
-    DataObjects::Mysql.const_get('Connection').should_not be_nil
-    DataObjects::Mysql.const_get('Command').should_not be_nil
-    DataObjects::Mysql.const_get('Result').should_not be_nil
-    DataObjects::Mysql.const_get('Reader').should_not be_nil
-  end
-
-  it "should connect successfully via TCP" do
-    connection = DataObjects::Connection.new("mysql://#{MYSQL.user}:#{MYSQL.pass}@#{MYSQL.host}:#{MYSQL.port}/#{MYSQL.database}")
-    connection.should_not be_using_socket
-    connection.close
-  end
-
-  it "should be able to send queries asynchronously in parallel" do
-    threads = []
-
-    start = Time.now
-    4.times do |i|
-      threads << Thread.new do
-        connection = DataObjects::Connection.new("mysql://#{MYSQL.user}:#{MYSQL.pass}@#{MYSQL.host}:#{MYSQL.port}/#{MYSQL.database}")
-        command = connection.create_command("SELECT sleep(1)")
-        result = command.execute_non_query
-      end
-    end
-
-    threads.each{|t| t.join }
-    finish = Time.now
-    (finish - start).should < 2
-  end
-
-#
-#  I comment this out partly to raise the issue for discussion. Socket files are afaik not supported under windows. Does this
-#  mean that we should test for it on unix boxes but not on windows boxes? Or does it mean that it should not be speced at all?
-#  It's not really a requirement, since all architectures that support MySQL also supports TCP connectsion, ne?
-#
-#  it "should connect successfully via the socket file" do
-#    @connection = DataObjects::Mysql::Connection.new("mysql://#{MYSQL.user}@#{MYSQL.hostname}:#{MYSQL.port}/#{MYSQL.database}/?socket=#{SOCKET_PATH}")
-#    @connection.should be_using_socket
-#  end
-
-  it "should return the current character set" do
-    connection = DataObjects::Connection.new("mysql://#{MYSQL.user}:#{MYSQL.pass}@#{MYSQL.hostname}:#{MYSQL.port}/#{MYSQL.database}")
-    connection.character_set.should == "utf8"
-    connection.close
-  end
-
-  it "should support changing the character set" do
-    pending "JDBC API does not provide an easy way to get the current character set" if JRUBY
-    # current character set can be retrieved with the following query:
-    # "SHOW VARIABLES LIKE character_set_database"
-
-    connection = DataObjects::Connection.new("mysql://#{MYSQL.user}:#{MYSQL.pass}@#{MYSQL.hostname}:#{MYSQL.port}/#{MYSQL.database}?charset=latin1")
-                 # N.B. query parameter after forward slash causes problems with JDBC
-    connection.character_set.should == "latin1"
-    connection.close
-
-    connection = DataObjects::Connection.new("mysql://#{MYSQL.user}:#{MYSQL.pass}@#{MYSQL.hostname}:#{MYSQL.port}/#{MYSQL.database}?charset=utf8")
-    connection.character_set.should == "utf8"
-    connection.close
-  end
-
-  it "should raise an error when opened with an invalid server uri" do
-    def connecting_with(uri)
-      lambda { DataObjects::Connection.new(uri) }
-    end
-
-    unless JRUBY  ## FIXME in JRuby
-      # Missing database name
-      connecting_with("mysql://#{MYSQL.user}:#{MYSQL.pass}@#{MYSQL.hostname}:#{MYSQL.port}/").should raise_error(MysqlError)
-    end
-
-    # Wrong port
-    connecting_with("mysql://#{MYSQL.user}:#{MYSQL.pass}@#{MYSQL.hostname}:666/").should raise_error(MysqlError)
-
-    unless JRUBY  ## FIXME in JRuby
-      # Bad Username
-      connecting_with("mysql://baduser@#{MYSQL.hostname}:#{MYSQL.port}/").should raise_error(MysqlError)
-    end
-
-    # Bad Password
-    connecting_with("mysql://#{MYSQL.user}:wrongpassword@#{MYSQL.hostname}:#{MYSQL.port}/").should raise_error(MysqlError)
-
-    # Bad Database Name
-    connecting_with("mysql://#{MYSQL.user}:#{MYSQL.pass}@#{MYSQL.hostname}:#{MYSQL.port}/bad_database").should raise_error(MysqlError)
-
-    #
-    # Again, should socket even be speced if we don't support it across all platforms?
-    #
-    # Invalid Socket Path
-    #connecting_with("mysql://#{MYSQL.user}@#{MYSQL.hostname}:#{MYSQL.port}/MYSQL.database/?socket=/invalid/path/mysql.sock").should raise_error(MysqlError)
-  end
-end
-
-describe DataObjects::Mysql::Connection do
-  include MysqlSpecHelpers
-
-  before :each do
-    setup_test_environment
-  end
-
-  after :each do
-    teardown_test_environment
-  end
-
-  it "should raise an error when attempting to execute a bad query" do
-    lambda { @connection.create_command("INSERT INTO non_existant_table (tester) VALUES (1)").execute_non_query }.should raise_error(MysqlError)
-  end
-
-  it "should raise an error when executing a bad reader" do
-    lambda { @connection.create_command("SELECT * FROM non_existant_table").execute_reader }.should raise_error(MysqlError)
-  end
-
-  it "should not raise a connection closed error after an incorrect query" do
-    lambda { @connection.create_command("INSERT INTO non_existant_table (tester) VALUES (1)").execute_non_query }.should raise_error(MysqlError)
-    lambda { @connection.create_command("INSERT INTO non_existant_table (tester) VALUES (1)").execute_non_query }.should_not raise_error(MysqlError, "This connection has already been closed.")
-  end
-
-  it "should not raise a connection closed error after an incorrect reader" do
-    lambda { @connection.create_command("SELECT * FROM non_existant_table").execute_reader }.should raise_error(MysqlError)
-    lambda { @connection.create_command("SELECT * FROM non_existant_table").execute_reader }.should_not raise_error(MysqlError, "This connection has already been closed.")
-  end
-
-end
-
-describe DataObjects::Mysql::Reader do
-  include MysqlSpecHelpers
-
-  before :each do
-    setup_test_environment
-  end
-
-  after :each do
-    teardown_test_environment
-  end
-
-  it "should raise an error when you pass too many or too few types for the expected result set" do
-    lambda { select("SELECT name, fired_at FROM users", [String, DateTime, Integer]) }.should raise_error(MysqlError)
-  end
-
-  it "shouldn't raise an error when you pass NO types for the expected result set" do
-    lambda { select("SELECT name, fired_at FROM users", nil) }.should_not raise_error(MysqlError)
-  end
-
-  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|
-      # select already calls next once for us
-      reader.next!
-      reader.next!
-
-      lambda { reader.values }.should raise_error(MysqlError)
-    end
-  end
-
-  it "should fetch the proper number of rows" do
-    ids = [
-      insert("INSERT INTO users (name) VALUES ('Slappy Wilson')"),
-      insert("INSERT INTO users (name) VALUES ('Jumpy Jones')")
-    ]
-                                            # 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
-      reader.next!.should be_nil
-    end
-  end
-
-  it "should contain tainted strings" do
-    id = insert("INSERT INTO users (name) VALUES ('Cuppy Canes')")
-
-    select("SELECT name FROM users WHERE id = ?", nil, id) do |reader|
-      reader.values.first.should be_tainted
-    end
-
-  end
-
-  it "should return DB nulls as nil" do
-    id = insert("INSERT INTO users (name) VALUES (NULL)")
-    select("SELECT name from users WHERE name is null") do |reader|
-      reader.values[0].should == nil
-    end
-  end
-
-  it "should not convert empty strings to null" do
-    id = insert("INSERT INTO users (name) VALUES ('')")
-    select("SELECT name FROM users WHERE id = ?", [String], id) do |reader|
-      reader.values.first.should == ''
-    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|
-          %w[ NO_ZERO_IN_DATE NO_ZERO_DATE ].include?(mode.strip.upcase)
-        end
-      end
-
-      unless strict_time
-        id = insert("INSERT INTO users (name, fired_at) VALUES ('James', 0);")
-        select("SELECT fired_at FROM users WHERE id = ?", [Time], id) do |reader|
-          reader.values.last.should be_nil
-        end
-        exec("DELETE FROM users WHERE id = ?", id)
-      end
-    end
-
-    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
-
-    now = DateTime.now
-
-    dates = [
-      now.new_offset( (-11 * 3600).to_r / 86400), # GMT -11:00
-      now.new_offset( (-9 * 3600 + 10 * 60).to_r / 86400), # GMT -9:10, contrived
-      now.new_offset( (-8 * 3600).to_r / 86400), # GMT -08:00
-      now.new_offset( (+3 * 3600).to_r / 86400), # GMT +03:00
-      now.new_offset( (+5 * 3600 + 30 * 60).to_r / 86400)  # GMT +05:30 (New Delhi)
-    ]
-
-    dates.each do |date|
-      it "should return #{date.to_s} offset to the current locale's Time Zone if they were inserted using a different timezone" do
-        pending "We don't support non-local date input yet"
-
-        dates.each do |date|
-          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 == now.to_s
-          end
-
-          exec("DELETE FROM users WHERE id = ?", id)
-        end
-      end
-    end
-
-  end
-
-  describe "executing a non-query" do
-    it "should return a Result" do
-      command = @connection.create_command("INSERT INTO invoices (invoice_number) VALUES ('1234')")
-      result = command.execute_non_query
-      result.should be_kind_of(DataObjects::Mysql::Result)
-    end
-
-    it "should be able to determine the affected_rows" do
-      command = @connection.create_command("INSERT INTO invoices (invoice_number) VALUES ('1234')")
-      result = command.execute_non_query
-      result.to_i.should == 1
-    end
-
-    it "should yield the last inserted id" do
-      @connection.create_command("TRUNCATE TABLE invoices").execute_non_query
-
-      result = @connection.create_command("INSERT INTO invoices (invoice_number) VALUES ('1234')").execute_non_query
-      result.insert_id.should == 1
-
-      result = @connection.create_command("INSERT INTO invoices (invoice_number) VALUES ('3456')").execute_non_query
-      result.insert_id.should == 2
-    end
-
-    it "should be able to determine the affected_rows" do
-      [
-        "TRUNCATE TABLE invoices",
-        "INSERT INTO invoices (invoice_number) VALUES ('1234')",
-        "INSERT INTO invoices (invoice_number) VALUES ('1234')"
-      ].each { |q| @connection.create_command(q).execute_non_query }
-
-      result = @connection.create_command("UPDATE invoices SET invoice_number = '3456'").execute_non_query
-      result.to_i.should == 2
-    end
-
-    it "should raise an error when executing an invalid query" do
-      command = @connection.create_command("UPDwhoopsATE invoices SET invoice_number = '3456'")
-
-      lambda { command.execute_non_query }.should raise_error(Exception)
-    end
-
-    # it "should raise an error when inserting the wrong typed data" do
-    #   command = @connection.create_command("UPDATE invoices SET invoice_number = ?")
-    #   command.execute_non_query(1)
-    # end
-
-  end
-
-end