rdbi 0.9.0

data/rdbi.gemspec

@@ -0,0 +1,94 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rdbi}
+  s.version = "0.9.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Erik Hollensbe"]
+  s.date = %q{2010-08-21}
+  s.description = %q{RDBI is a rearchitecture of the Ruby/DBI project by its maintainer and others. It intends to fully supplant Ruby/DBI in the future for similar database access needs.}
+  s.email = %q{erik@hollensbe.org}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "docs/external-api.pdf",
+     "docs/external-api.texi",
+     "lib/rdbi.rb",
+     "lib/rdbi/cursor.rb",
+     "lib/rdbi/database.rb",
+     "lib/rdbi/driver.rb",
+     "lib/rdbi/pool.rb",
+     "lib/rdbi/result.rb",
+     "lib/rdbi/schema.rb",
+     "lib/rdbi/statement.rb",
+     "lib/rdbi/types.rb",
+     "rdbi.gemspec",
+     "test/helper.rb",
+     "test/test_database.rb",
+     "test/test_pool.rb",
+     "test/test_rdbi.rb",
+     "test/test_result.rb",
+     "test/test_statement.rb",
+     "test/test_types.rb",
+     "test/test_util.rb"
+  ]
+  s.homepage = %q{http://github.com/RDBI/rdbi}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{RDBI provides sane query-level database access with low magic.}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_database.rb",
+     "test/test_pool.rb",
+     "test/test_rdbi.rb",
+     "test/test_result.rb",
+     "test/test_statement.rb",
+     "test/test_types.rb",
+     "test/test_util.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rdbi-driver-mock>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<fastercsv>, [">= 0"])
+      s.add_runtime_dependency(%q<methlab>, [">= 0.0.9"])
+      s.add_runtime_dependency(%q<epoxy>, [">= 0.3.1"])
+      s.add_runtime_dependency(%q<typelib>, [">= 0"])
+    else
+      s.add_dependency(%q<rdbi-driver-mock>, [">= 0"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<fastercsv>, [">= 0"])
+      s.add_dependency(%q<methlab>, [">= 0.0.9"])
+      s.add_dependency(%q<epoxy>, [">= 0.3.1"])
+      s.add_dependency(%q<typelib>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rdbi-driver-mock>, [">= 0"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<fastercsv>, [">= 0"])
+    s.add_dependency(%q<methlab>, [">= 0.0.9"])
+    s.add_dependency(%q<epoxy>, [">= 0.3.1"])
+    s.add_dependency(%q<typelib>, [">= 0"])
+  end
+end
+

data/test/helper.rb

@@ -0,0 +1,32 @@
+require 'rubygems'
+gem 'rdbi-driver-mock'
+gem 'test-unit'
+require 'test/unit'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rdbi'
+require 'rdbi/driver/mock'
+
+class Test::Unit::TestCase
+  def mock_connect
+    RDBI.connect(:Mock, :username => 'foo', :password => 'bar')
+  end
+
+  # type conversion column
+  def tcc(type)
+    col = RDBI::Column.new
+    col.ruby_type = type
+    col
+  end
+
+  def out_convert(*args)
+    RDBI::Type::Out.convert(*args)
+  end
+
+  def in_convert(*args)
+    RDBI::Type::In.convert(*args)
+  end
+end
+
+# vim: syntax=ruby ts=2 et sw=2 sts=2

data/test/test_database.rb

@@ -0,0 +1,246 @@
+require 'helper'
+
+class TestDatabase < Test::Unit::TestCase
+  def setup
+    @dbh = mock_connect
+  end
+
+  def assert_transaction(count)
+    in_transaction = @dbh.instance_variable_get("@in_transaction") ||
+      @dbh.instance_variable_get(:@in_transaction)
+    assert_equal(count, in_transaction)
+
+    if in_transaction > 0
+      assert(@dbh.in_transaction?)
+    end
+  end
+
+  def test_01_ping
+    assert_equal(10, @dbh.ping)
+  end
+
+  def test_02_transaction
+    # commit works
+
+    @dbh.next_action = proc do |*args|
+      return true
+    end
+
+    res = @dbh.transaction do |dbh|
+      assert_transaction(1)
+    end
+
+    assert_transaction(0)
+    assert_equal(true, res)
+
+    # rollback works when commit fails
+    @dbh.next_action = proc do |*args|
+      raise StandardError, "should call rollback"
+    end
+
+    assert_raises(StandardError.new("should call rollback")) do
+      @dbh.transaction do |dbh|
+        assert_transaction(1)
+        true
+      end
+    end
+
+    assert_transaction(0)
+    assert_equal(true, res)
+
+    # rollback works when transaction fails
+
+    @dbh.next_action = proc { |*args| true }
+
+    assert_raises(StandardError.new("should call rollback")) do
+      @dbh.transaction do |dbh|
+        assert_transaction(1)
+
+        raise StandardError, "should call rollback"
+        nil
+      end
+    end
+
+    assert_transaction(0)
+    assert_equal(true, res)
+
+    # commit called within transaction
+
+    @dbh.next_action = proc { |*args| @dbh.next_action = proc { raise "shit" }; "commit called" }
+
+    res = @dbh.transaction do |dbh|
+      assert_transaction(1)
+
+      dbh.commit
+
+      assert_transaction(0)
+      true
+    end
+
+    assert_not_equal("rollback called", res)
+    assert_not_equal("commit called", res)
+
+    # rollback called within transaction
+
+    @dbh.next_action = proc { |*args| @dbh.next_action = proc { raise "shit" }; "commit called" }
+
+    res = @dbh.transaction do |dbh|
+      assert_transaction(1)
+
+      dbh.rollback
+
+      assert_transaction(0)
+    end
+
+    assert_not_equal("rollback called", res)
+    assert_not_equal("commit called", res)
+  end
+
+  def test_03_last_query
+    @dbh.prepare("here's the last query #1").finish
+    assert_equal("here's the last query #1", @dbh.last_query)
+
+    @dbh.prepare("here's the last query #2").finish
+    assert_equal("here's the last query #2", @dbh.last_query)
+
+    @dbh.execute("here's the last query #3").finish
+    assert_equal("here's the last query #3", @dbh.last_query)
+
+    @dbh.execute("here's the last query #4").finish
+    assert_equal("here's the last query #4", @dbh.last_query)
+
+    @dbh.preprocess_query("here's the last query #5")
+    assert_equal("here's the last query #5", @dbh.last_query)
+
+    @dbh.preprocess_query("here's the last query #6")
+    assert_equal("here's the last query #6", @dbh.last_query)
+  end
+
+  def test_04_preprocess_query
+    query = @dbh.preprocess_query("select * from foo where bind=? and bind2=?", "foo", "bar")
+    assert_equal("select * from foo where bind='foo' and bind2='bar'", query)
+
+    query = @dbh.preprocess_query("select * from foo where bind=? and bind2=?", "fo'o", "ba''r")
+    assert_equal("select * from foo where bind='fo''o' and bind2='ba''''r'", query)
+    
+    query = @dbh.preprocess_query("select * from foo where bind=?foo and bind2=?bar", { :foo => "fo'o", :bar => "ba''r" })
+    assert_equal("select * from foo where bind='fo''o' and bind2='ba''''r'", query)
+    
+    query = @dbh.preprocess_query("select * from foo where bind=?foo and bind2=?bar", { :foo => "fo'o"}, { :bar => "ba''r" })
+    assert_equal("select * from foo where bind='fo''o' and bind2='ba''''r'", query)
+    
+    query = @dbh.preprocess_query("select * from foo where bind=?foo and bind2=?bar and bind3=?", { :foo => "fo'o"}, { :bar => "ba''r" }, "quux")
+    assert_equal("select * from foo where bind='fo''o' and bind2='ba''''r' and bind3='quux'", query)
+  end
+
+  def test_05_prepare_execute
+    sth = @dbh.prepare("some statement")
+    assert(sth)
+    assert_kind_of(RDBI::Statement, sth)
+
+    res = @dbh.execute("some other statement")
+    assert(res)
+    assert_kind_of(RDBI::Result, res)
+    sth.finish
+  end
+
+  def test_06_last_statement
+    sth = @dbh.prepare("some statement")
+    assert(sth)
+    assert_kind_of(RDBI::Statement, sth)
+
+    assert_equal(@dbh.last_statement.object_id, sth.object_id)
+
+    res = @dbh.execute("some other statement")
+    assert(res)
+    assert_kind_of(RDBI::Result, res)
+    assert_not_equal(@dbh.last_statement.object_id, sth.object_id)
+    sth.finish
+  end
+
+  def test_07_nested_transactions
+    @dbh.transaction do
+      @dbh.transaction do
+        assert_transaction(2)
+        @dbh.commit
+        assert_transaction(1)
+        # XXX should this be how it works?
+        @dbh.commit
+        assert_transaction(0)
+      end
+    end
+
+    @dbh.transaction do
+      @dbh.transaction do
+        assert_transaction(2)
+        @dbh.commit
+        assert_transaction(1)
+      end
+      @dbh.commit
+      assert_transaction(0)
+    end
+
+    @dbh.transaction do
+      @dbh.transaction do
+        assert_transaction(2)
+        @dbh.rollback
+        assert_transaction(1)
+        # XXX should this be how it works?
+        @dbh.rollback
+        assert_transaction(0)
+      end
+    end
+
+    @dbh.transaction do
+      @dbh.transaction do
+        assert_transaction(2)
+        @dbh.rollback
+        assert_transaction(1)
+      end
+      @dbh.rollback
+      assert_transaction(0)
+    end
+  end
+
+  def test_08_block_form
+    my_sth = nil
+    my_res = nil
+
+    @dbh.prepare("some statement") do |sth|
+      assert(sth)
+      assert_respond_to(sth, :execute)
+      res = sth.execute
+      assert(res)
+      my_sth = sth
+    end
+
+    assert(my_sth.finished?)
+
+    @dbh.execute("some statement") do |res|
+      assert(res)
+      assert_kind_of(RDBI::Result, res)
+    end
+  end
+
+  def test_09_statement_allocation
+    sth = @dbh.prepare("some statement")
+    assert(sth)
+
+    assert_equal(@dbh.open_statements.length, 1)
+
+    warn "The next message should appear *exactly once*"
+    @dbh.disconnect
+
+    @dbh = mock_connect
+    sth = @dbh.prepare("some statement")
+    sth.finish
+    assert_equal(@dbh.open_statements.length, 0)
+    @dbh.disconnect
+  end
+
+  def teardown
+    @dbh.disconnect
+  end
+end
+
+# vim: syntax=ruby ts=2 et sw=2 sts=2

data/test/test_pool.rb

@@ -0,0 +1,181 @@
+require 'helper'
+
+class TestPool < Test::Unit::TestCase
+  def create_pool(name=:default)
+    pool = RDBI::Pool.new(name, [:Mock, {:username => :foo}])
+  end
+
+  def test_01_construction
+    pool = create_pool(:test_01)
+    assert(pool)
+    assert_kind_of(RDBI::Pool, pool)
+  end
+
+  def test_02_class_accessors
+    assert(!RDBI::Pool[:test_02])
+    create_pool(:test_02)
+
+    assert(RDBI::Pool[:test_02])
+  end
+
+  def test_03_pooling!
+    pool = create_pool(:test_03)
+    assert_raise(ArgumentError.new("too many handles in this pool (max: 5)")) do
+      6.times do
+        RDBI::Pool[:test_03].add_connection
+      end
+    end
+
+    assert_equal(0, pool.last_index)
+    dbh = pool.get_dbh
+    assert(dbh)
+    assert_kind_of(RDBI::Database, dbh)
+    assert(dbh.connected?)
+
+    pool.disconnect
+
+    assert_equal(1, pool.last_index)
+    dbh = pool.get_dbh
+    assert(dbh)
+    assert_kind_of(RDBI::Database, dbh)
+    assert(dbh.connected?)
+
+    # XXX HACK for testing
+    pool.instance_variable_set(:@last_index, 5) 
+    dbh = pool.get_dbh
+    assert(dbh)
+    assert_kind_of(RDBI::Database, dbh)
+    assert(dbh.connected?)
+    assert_equal(1, pool.last_index)
+
+    pool = create_pool(:test_03_2)
+    5.times do
+      dbh = pool.get_dbh
+      assert(dbh.connected?)
+    end
+  end
+
+  def test_04_remove
+    pool = create_pool(:test_04).add_connection
+    dbh = pool.get_dbh
+
+    assert(pool.handles.map(&:object_id).include?(dbh.object_id))
+    pool.remove(dbh)
+    assert(!pool.handles.map(&:object_id).include?(dbh.object_id))
+  end
+
+  def test_05_dis_reconnect
+    pool = create_pool(:test_05)
+    4.times { pool.add_connection }
+
+    pool.disconnect
+
+    pool.handles.each do |dbh|
+      assert(!dbh.connected?)
+    end
+
+    pool.reconnect
+
+    pool.handles.each do |dbh|
+      assert(dbh.connected?)
+    end
+  end
+
+  def test_06_ping
+    pool = create_pool(:test_06)
+    4.times { pool.add_connection }
+    assert_equal(10, pool.ping)
+  end
+
+  def test_07_resize
+    pool = create_pool(:test_07).add_connection
+    4.times { pool.add_connection }
+
+    handles = pool.resize(2) 
+
+    assert_equal(2, pool.max)
+
+    handles.each do |dbh|
+      assert(!pool.handles(&:object_id).include?(dbh.object_id))
+    end
+
+    assert_equal(2, pool.handles.size)
+
+    assert_equal(0, pool.last_index)
+
+    3.times do
+      pool.get_dbh
+    end
+
+    assert_equal(1, pool.last_index)
+
+    pool = create_pool(:test_07_2)
+    pool.add_connection
+    handles = pool.resize(2)
+    assert_equal([], handles)
+
+    # check the ability to cull disconnected objects automatically while
+    # preferring connected ones.
+    pool = create_pool(:test_07_3)
+    5.times { pool.add_connection }
+    dbh = pool.get_dbh
+    pool.disconnect
+    dbh.reconnect
+    handles = pool.resize(2)
+    assert_equal(2, pool.handles.size)
+    assert_equal(3, handles.size)
+    assert(!handles.map(&:object_id).include?(dbh.object_id))
+  end
+
+  def test_08_enumerable
+    assert_equal(
+      [
+        :test_01,
+        :test_02,
+        :test_03,
+        :test_03_2,
+        :test_04,
+        :test_05,
+        :test_06,
+        :test_07,
+        :test_07_2,
+        :test_07_3
+      ], 
+      RDBI::Pool.keys.map(&:to_s).sort.map(&:to_sym)
+    )
+
+    assert_equal(10, RDBI::Pool.values.count)
+    assert_kind_of(RDBI::Pool, RDBI::Pool.values[0])
+
+    count = 0
+    RDBI::Pool.each do |name, pool|
+      count += 1
+      assert_kind_of(Symbol, name)
+      assert_kind_of(RDBI::Pool, pool)
+    end
+
+    assert(10, count)
+    assert_respond_to(RDBI::Pool, :map)
+
+    pool = create_pool(:test_08)
+
+    assert(pool)
+    assert_kind_of(RDBI::Pool, pool)
+    assert_respond_to(pool, :each)
+
+    count = 0
+
+    3.times { pool.add_connection }
+
+    pool.each do |dbh|
+      count += 1
+      assert_kind_of(RDBI::Database, dbh)
+    end
+
+    assert_equal(3, count)
+
+    assert_respond_to(pool, :map)
+  end
+end
+
+# vim: syntax=ruby ts=2 et sw=2 sts=2