do_mysql 0.9.2 → 0.9.3

data/lib/do_mysql/version.rb

@@ -0,0 +1,5 @@
+module DataObjects
+  module Mysql
+    VERSION = "0.9.3"
+  end
+end

data/spec/integration/do_mysql_spec.rb

@@ -4,10 +4,14 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 describe DataObjects::Mysql do
   include MysqlSpecHelpers
 
-  before :all do
+  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
@@ -17,8 +21,9 @@ describe DataObjects::Mysql do
 
   it "should connect successfully via TCP" do
     pending "Problems parsing regular connection URIs vs. JDBC URLs" if JRUBY
-    connection = DataObjects::Mysql::Connection.new("mysql://root@127.0.0.1:3306/do_mysql_test")
+    connection = DataObjects::Connection.new("mysql://root@127.0.0.1:3306/do_mysql_test")
     connection.should_not be_using_socket
+    connection.close
   end
 
 #
@@ -33,23 +38,26 @@ describe DataObjects::Mysql do
 
   it "should return the current character set" do
     pending "Problems parsing regular connection URIs vs. JDBC URLs" if JRUBY
-    connection = DataObjects::Mysql::Connection.new("mysql://root@localhost:3306/do_mysql_test")
+    connection = DataObjects::Connection.new("mysql://root@localhost:3306/do_mysql_test")
     connection.character_set.should == "utf8"
+    connection.close
   end
 
   it "should support changing the character set" do
     pending "Problems parsing regular connection URIs vs. JDBC URLs" if JRUBY
-    connection = DataObjects::Mysql::Connection.new("mysql://root@localhost:3306/do_mysql_test/?charset=latin1")
+    connection = DataObjects::Connection.new("mysql://root@localhost:3306/do_mysql_test/?charset=latin1")
     connection.character_set.should == "latin1"
+    connection.close
 
-    @connection = DataObjects::Mysql::Connection.new("mysql://root@localhost:3306/do_mysql_test/?charset=utf8")
-    @connection.character_set.should == "utf8"
+    connection = DataObjects::Connection.new("mysql://root@localhost:3306/do_mysql_test/?charset=utf8")
+    connection.character_set.should == "utf8"
+    connection.close
   end
 
   it "should raise an error when opened with an invalid server uri" do
     pending "Problems parsing regular connection URIs vs. JDBC URLs" if JRUBY
     def connecting_with(uri)
-      lambda { DataObjects::Mysql::Connection.new(uri) }
+      lambda { DataObjects::Connection.new(uri) }
     end
 
     # Missing database name
@@ -78,13 +86,48 @@ end
 describe DataObjects::Mysql::Connection do
   include MysqlSpecHelpers
 
-  before :all do
+  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)
-    lambda { @connection.create_command("SELECT * FROM non_existant table").execute_reader }.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 close the connection when executing a bad query" do
+    lambda { @connection.create_command("INSERT INTO non_exista (tester) VALUES (1)").execute_non_query }.should raise_error(MysqlError)
+    @connection.instance_variable_get(:@connection).should == nil
+  end
+
+  it "should flush the pool when executing a bad query" do
+    pool = @connection.instance_variable_get(:@__pool)
+    lambda { @connection.create_command("INSERT INTO non_exista (tester) VALUES (1)").execute_non_query }.should raise_error(MysqlError)
+    Extlib::Pooling.pools.detect { |p| p == pool }.instance_variable_get(:@available).size.should == 0
+  end
+
+  it "should delete itself from the pool" do
+    pool = @connection.instance_variable_get(:@__pool)
+    count = pool.reserved_count
+    lambda { @connection.create_command("INSERT INTO non_exista (tester) VALUES (1)").execute_non_query }.should raise_error(MysqlError)
+    Extlib::Pooling.pools.detect { |p| p == pool }.instance_variable_get(:@reserved_count).should == count-1
+  end
+
+  it "should not raise an error error executing a non query on a closed connection" 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 raise_error(MysqlError, "This connection has already been closed.")
+  end
+
+  it "should not raise an error executing a reader on a closed connection" 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 raise_error(MysqlError, "This connection has already been closed.")
   end
 
 end
@@ -92,10 +135,14 @@ end
 describe DataObjects::Mysql::Reader do
   include MysqlSpecHelpers
 
-  before :all do
+  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
@@ -159,6 +206,14 @@ describe DataObjects::Mysql::Reader do
 
   describe "Date, Time, and DateTime" do
 
+    it "should return nil when the time is 0" do
+      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
+
     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)
@@ -236,6 +291,11 @@ describe DataObjects::Mysql::Reader do
       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

data/spec/integration/logging_spec.rb

@@ -5,12 +5,16 @@ describe DataObjects::Mysql::Command do
 
   before(:each) do
     @connection = if JRUBY
-      DataObjects::Mysql::Connection.new(DO_MYSQL_SPEC_JDBC_URI)
+      DataObjects::Connection.new(DO_MYSQL_SPEC_JDBC_URI)
     else
-      DataObjects::Mysql::Connection.new(DO_MYSQL_SPEC_URI)
+      DataObjects::Connection.new(DO_MYSQL_SPEC_URI)
     end
   end
 
+  after(:each) do
+    @connection.close
+  end
+
   describe "Executing a Reader" do
 
     it "should log reader queries when the level is Debug (0)" do
@@ -18,7 +22,8 @@ describe DataObjects::Mysql::Command do
       @mock_logger = mock('MockLogger', :level => 0)
       DataObjects::Mysql.should_receive(:logger).and_return(@mock_logger)
       @mock_logger.should_receive(:debug).with("SELECT * FROM widgets WHERE name = 'Scott'")
-      command.execute_reader('Scott')
+
+      command.execute_reader('Scott').close # Readers must be closed!
     end
 
     it "shouldn't log reader queries when the level isn't Debug (0)" do
@@ -26,7 +31,7 @@ describe DataObjects::Mysql::Command do
       @mock_logger = mock('MockLogger', :level => 1)
       DataObjects::Mysql.should_receive(:logger).and_return(@mock_logger)
       @mock_logger.should_not_receive(:debug)
-      command.execute_reader('Scott')
+      command.execute_reader('Scott').close # Readers must be closed!
     end
   end
 

data/spec/integration/quoting_spec.rb

@@ -5,10 +5,14 @@ require 'date'
 describe DataObjects::Mysql::Command, "Quoting" do
   include MysqlSpecHelpers
 
-  before :all do
+  before :each do
     setup_test_environment
   end
 
+  after :each do
+    teardown_test_environment
+  end
+
   it "should escape strings properly" do
     command = @connection.create_command("SELECT * FROM widgets WHERE name = ?")
     command.quote_string("Willy O'Hare & Johnny O'Toole").should == "'Willy O\\'Hare & Johnny O\\'Toole'".dup

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -32,8 +32,8 @@ DataObjects::Mysql.logger = DataObjects::Logger.new(log_path, 0)
 at_exit { DataObjects.logger.flush }
 
 # use different, JDBC-style URLs for JRuby, for the time-being
-DO_MYSQL_SPEC_URI      = ENV["DO_MYSQL_SPEC_URI"]      || "mysql://root@127.0.0.1:3306/do_mysql_test"
-DO_MYSQL_SPEC_JDBC_URI = ENV["DO_MYSQL_SPEC_JDBC_URI"] || "jdbc:mysql://localhost:3306/do_mysql_test?user=root"
+DO_MYSQL_SPEC_URI      = Addressable::URI::parse(ENV["DO_MYSQL_SPEC_URI"]      || "mysql://root@127.0.0.1:3306/do_mysql_test")
+DO_MYSQL_SPEC_JDBC_URI = Addressable::URI::parse(ENV["DO_MYSQL_SPEC_JDBC_URI"] || "jdbc:mysql://localhost:3306/do_mysql_test?user=root")
 
 module MysqlSpecHelpers
   def insert(query, *args)
@@ -59,11 +59,11 @@ module MysqlSpecHelpers
 
   def setup_test_environment
     if JRUBY # use different, JDBC-style URLs for JRuby, for the time-being
-      @connection = DataObjects::Mysql::Connection.new(DO_MYSQL_SPEC_JDBC_URI)
-      @secondary_connection = DataObjects::Mysql::Connection.new(DO_MYSQL_SPEC_JDBC_URI)
+      @connection = DataObjects::Connection.new(DO_MYSQL_SPEC_JDBC_URI)
+      @secondary_connection = DataObjects::Connection.new(DO_MYSQL_SPEC_JDBC_URI)
     elsif
-      @connection = DataObjects::Mysql::Connection.new(DO_MYSQL_SPEC_URI)
-      @secondary_connection = DataObjects::Mysql::Connection.new(DO_MYSQL_SPEC_URI)
+      @connection = DataObjects::Connection.new(DO_MYSQL_SPEC_URI)
+      @secondary_connection = DataObjects::Connection.new(DO_MYSQL_SPEC_URI)
     end
 
     @connection.create_command(<<-EOF).execute_non_query
@@ -127,5 +127,11 @@ module MysqlSpecHelpers
         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);
       EOF
     end
+
+  end
+
+  def teardown_test_environment
+    @connection.close
+    @secondary_connection.close
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Scott Bauer
@@ -9,47 +9,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 -05:00
+date: 2008-07-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
     version: 
 description: A DataObject.rb driver for MySQL
-email: bauer.mail@gmail.com
+email: 
+- bauer.mail@gmail.com
 executables: []
 
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+files: 
+- History.txt
 - LICENSE
+- Manifest.txt
+- README.txt
+- Rakefile
 - TODO
-files: 
+- buildfile
+- ext-java/src/main/java/DoMysqlExtService.java
+- ext-java/src/main/java/do_mysql/MySqlDriverDefinition.java
 - ext/do_mysql_ext.c
 - ext/extconf.rb
-- lib/do_mysql/transaction.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
 - spec/spec_helper.rb
 - spec/unit/transaction_spec.rb
-- Rakefile
-- LICENSE
-- TODO
 has_rdoc: false
 homepage: http://rubyforge.org/projects/dorb
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -65,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A DataObject.rb driver for MySQL